Fix shadowsocks#2234

bannedbook · Jun 10, 2019 · 76b4e02 · 76b4e02
1 parent afe6874
commit 76b4e02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
@@ -45,7 +45,6 @@
         <activity
             android:name=".UdpFallbackProfileActivity"
             android:label="@string/udp_fallback"
-            android:parentActivityName=".ProfileConfigActivity"
             android:excludeFromRecents="true"/>
 
         <activity

diff --git a/mobile/src/main/java/com/github/shadowsocks/AppManager.kt b/mobile/src/main/java/com/github/shadowsocks/AppManager.kt
@@ -27,6 +27,7 @@ import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
@@ -250,8 +251,8 @@ class AppManager : AppCompatActivity() {
         menuInflater.inflate(R.menu.app_manager_menu, menu)
         return true
     }
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             R.id.action_apply_all -> {
                 val profiles = ProfileManager.getAllProfiles()
                 if (profiles != null) {
@@ -290,9 +291,12 @@ class AppManager : AppCompatActivity() {
                 Snackbar.make(list, R.string.action_import_err, Snackbar.LENGTH_LONG).show()
             }
         }
-        return false
+        return super.onOptionsItemSelected(item)
     }
 
+    override fun supportNavigateUpTo(upIntent: Intent) =
+            super.supportNavigateUpTo(upIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
+
     override fun onKeyUp(keyCode: Int, event: KeyEvent?) = if (keyCode == KeyEvent.KEYCODE_MENU)
         if (toolbar.isOverflowMenuShowing) toolbar.hideOverflowMenu() else toolbar.showOverflowMenu()
     else super.onKeyUp(keyCode, event)