kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 14:50:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1346 from Bnyro/master

Browse Source 
fix abnormal search behavior
This commit is contained in:
Bnyro 2022-09-22 18:54:52 +02:00 committed by GitHub
commit 764ea27b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
app/release/output-metadata.json
View File

@ -11,49 +11,10 @@
"type": "UNIVERSAL", "type": "UNIVERSAL",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 18, "versionCode": 19,
"versionName": "0.5.1", "versionName": "0.6.0",
"outputFile": "app-universal-release.apk" "outputFile": "app-universal-release.apk"
}, },
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "armeabi-v7a"
}
],
"attributes": [],
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-armeabi-v7a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-arm64-v8a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-x86_64-release.apk"
},
{ {
"type": "ONE_OF_MANY", "type": "ONE_OF_MANY",
"filters": [ "filters": [
@ -63,9 +24,48 @@
} }
], ],
"attributes": [], "attributes": [],
"versionCode": 18, "versionCode": 19,
"versionName": "0.5.1", "versionName": "0.6.0",
"outputFile": "app-x86-release.apk" "outputFile": "app-x86-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 19,
"versionName": "0.6.0",
"outputFile": "app-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 19,
"versionName": "0.6.0",
"outputFile": "app-arm64-v8a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "armeabi-v7a"
}
],
"attributes": [],
"versionCode": 19,
"versionName": "0.6.0",
"outputFile": "app-armeabi-v7a-release.apk"
} }
], ],
"elementType": "File" "elementType": "File"

7
app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
View File

@ -7,6 +7,7 @@ import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.Log
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
@ -262,7 +263,11 @@ class MainActivity : BaseActivity() {
override fun onQueryTextChange(newText: String?): Boolean { override fun onQueryTextChange(newText: String?): Boolean {
// prevent malicious navigation when the search view is getting collapsed // prevent malicious navigation when the search view is getting collapsed
if (navController.currentDestination?.id == R.id.searchResultFragment && if (navController.currentDestination?.id in listOf(
R.id.searchResultFragment,
R.id.channelFragment,
R.id.playlistFragment
) &&
(newText == null || newText == "") (newText == null || newText == "")
) { ) {
return false return false