Commit 24cfe393 authored by Mygod's avatar Mygod

Fix #2234

parent 685f8408
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
<activity <activity
android:name=".UdpFallbackProfileActivity" android:name=".UdpFallbackProfileActivity"
android:label="@string/udp_fallback" android:label="@string/udp_fallback"
android:parentActivityName=".ProfileConfigActivity"
android:excludeFromRecents="true"/> android:excludeFromRecents="true"/>
<activity <activity
......
...@@ -27,6 +27,7 @@ import android.annotation.SuppressLint ...@@ -27,6 +27,7 @@ import android.annotation.SuppressLint
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.ClipData import android.content.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
import android.content.Intent
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import android.content.pm.PackageInfo import android.content.pm.PackageInfo
import android.content.pm.PackageManager import android.content.pm.PackageManager
...@@ -250,8 +251,8 @@ class AppManager : AppCompatActivity() { ...@@ -250,8 +251,8 @@ class AppManager : AppCompatActivity() {
menuInflater.inflate(R.menu.app_manager_menu, menu) menuInflater.inflate(R.menu.app_manager_menu, menu)
return true return true
} }
override fun onOptionsItemSelected(item: MenuItem?): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item?.itemId) { when (item.itemId) {
R.id.action_apply_all -> { R.id.action_apply_all -> {
val profiles = ProfileManager.getAllProfiles() val profiles = ProfileManager.getAllProfiles()
if (profiles != null) { if (profiles != null) {
...@@ -290,9 +291,12 @@ class AppManager : AppCompatActivity() { ...@@ -290,9 +291,12 @@ class AppManager : AppCompatActivity() {
Snackbar.make(list, R.string.action_import_err, Snackbar.LENGTH_LONG).show() 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) override fun onKeyUp(keyCode: Int, event: KeyEvent?) = if (keyCode == KeyEvent.KEYCODE_MENU)
if (toolbar.isOverflowMenuShowing) toolbar.hideOverflowMenu() else toolbar.showOverflowMenu() if (toolbar.isOverflowMenuShowing) toolbar.hideOverflowMenu() else toolbar.showOverflowMenu()
else super.onKeyUp(keyCode, event) else super.onKeyUp(keyCode, event)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment