Move permission request deeper; hotcorner setting may change while connected

3 files changed, 18 insertions, 18 deletions

diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index 1042da5..c5dcac9 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -29,8 +29,6 @@ import android.content.res.Configuration;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
@@ -549,19 +547,6 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
             return;
         }
 
-        if (mSettings.isHotCornerEnabled()) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (!android.provider.Settings.canDrawOverlays(this)) {
-                    Intent showSetting = new Intent(android.provider.Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                            Uri.parse("package:" + getPackageName()));
-                    showSetting.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(showSetting);
-                    Toast.makeText(this, R.string.grant_perm_draw_over_apps, Toast.LENGTH_LONG).show();
-                    return;
-                }
-            }
-        }
-
         // Check if we're already connected to a server; if so, inform user.
         if(mService != null && mService.isConnected()) {
             AlertDialog.Builder adb = new AlertDialog.Builder(this);
diff --git a/app/src/main/java/se/lublin/mumla/service/MumlaHotCorner.java b/app/src/main/java/se/lublin/mumla/service/MumlaHotCorner.java
index a9ec190..a969cbf 100644
--- a/app/src/main/java/se/lublin/mumla/service/MumlaHotCorner.java
+++ b/app/src/main/java/se/lublin/mumla/service/MumlaHotCorner.java
@@ -18,12 +18,15 @@
 package se.lublin.mumla.service;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.PixelFormat;
+import android.net.Uri;
 import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Toast;
 
 import se.lublin.mumla.R;
 
@@ -87,8 +90,20 @@ public class MumlaHotCorner implements View.OnTouchListener {
     }
 
     public void setShown(boolean shown) {
-        if(shown == mShown) return;
-        if(shown) {
+        if (shown == mShown) {
+            return;
+        }
+        if (shown) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (!android.provider.Settings.canDrawOverlays(mContext)) {
+                    Intent showSetting = new Intent(android.provider.Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                            Uri.parse("package:" + mContext.getPackageName()));
+                    showSetting.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    mContext.startActivity(showSetting);
+                    Toast.makeText(mContext, R.string.grant_perm_draw_over_apps, Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
             mWindowManager.addView(mView, mParams);
         } else {
             mWindowManager.removeView(mView);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01e60aa..2390d55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -270,7 +270,7 @@
     <string name="shout_configure">Configure Voice Target</string>
     <string name="grant_perm_microphone">Please grant permission to the microphone.</string>
     <string name="grant_perm_storage">Please grant permission to external storage.</string>
-    <string name="grant_perm_draw_over_apps">Please try again after granting permission to draw over other apps.</string>
+    <string name="grant_perm_draw_over_apps">Please grant permission to display over other apps.</string>
     <string name="orbot_not_installed">Orbot app is not installed. Disabling Tor!</string>
     <string name="orbot_tor_failed">Failed to connect to local Tor proxy on port %d (SOCKS).\n\nPlease ensure that Orbot app is running properly.</string>
     <string name="default_">Default</string>