Fix a crash if failed opening settings activity

nkming2 · Oct 15, 2017 · fb6cc40 · fb6cc40
1 parent bf1aecd
commit fb6cc40
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/main/kotlin/com/nkming/powermenu/PermissionUtils.kt b/src/main/kotlin/com/nkming/powermenu/PermissionUtils.kt
@@ -2,6 +2,7 @@ package com.nkming.powermenu
 
 import android.Manifest
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -45,13 +46,24 @@ object PermissionUtils
 			Log.w("$LOG_TAG.requestSystemAlertWindow", "Invoking method on M-")
 			return
 		}
-		Toast.makeText(context, R.string.overlay_permission_required,
-				Toast.LENGTH_LONG).show()
 		Log.d("$LOG_TAG.requestSystemAlertWindow",
 				"Requesting overlay permission")
-		val i = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION)
-		i.data = Uri.parse("package:${BuildConfig.APPLICATION_ID}")
-		context.startActivity(i)
+		try
+		{
+			val i = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION)
+			i.data = Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+			context.startActivity(i)
+			Toast.makeText(context, R.string.overlay_permission_required,
+					Toast.LENGTH_LONG).show()
+		}
+		catch (e: ActivityNotFoundException)
+		{
+			Log.e("$LOG_TAG.requestSystemAlertWindow",
+					"Activity ACTION_MANAGE_OVERLAY_PERMISSION not found", e)
+			Toast.makeText(context,
+					R.string.overlay_permission_settings_open_failed,
+					Toast.LENGTH_LONG).show()
+		}
 
 		pref.hasRequestOverlayPermission = true
 		pref.apply()

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
@@ -84,4 +84,5 @@
 	<string name="pref_native_screenshot_title">Native screenshot</string>
 	<string name="pref_native_screenshot_summary_on">Using native</string>
 	<string name="pref_native_screenshot_summary_off">Using legacy</string>
+	<string name="overlay_permission_settings_open_failed">Failed opening Android Settings, please grant us permission to draw over other apps manually</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
 	<string name="su_failed">Failed running su command, not rooted?</string>
 	<string name="screenshot_succeed_fallback">Screenshot captured</string>
 	<string name="overlay_permission_required">Please grant us permission to draw over other apps</string>
+	<string name="overlay_permission_settings_open_failed">Failed opening Android Settings, please grant us permission to draw over other apps manually</string>
 	<string name="write_storage_required">Please grant us permission in order to take screenshots</string>
 
 	<string name="restart_mode_normal">Reboot</string>