Floating calculator permissions

2016-02-17 13:49:39 +01:00
parent 95b22cd253
commit 14f76fb47b
46 changed files with 195 additions and 39 deletions
--- a/app/src/main/java/org/solovyev/android/calculator/App.java
+++ b/app/src/main/java/org/solovyev/android/calculator/App.java
@@ -22,11 +22,15 @@

 package org.solovyev.android.calculator;

+import android.app.Activity;
 import android.app.Application;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
+import android.net.Uri;
 import android.os.Build;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
@@ -37,27 +41,34 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
+import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+
 import com.squareup.otto.Bus;
+
 import org.solovyev.android.Check;
 import org.solovyev.android.Views;
+import org.solovyev.android.calculator.floating.FloatingCalculatorService;
 import org.solovyev.android.calculator.ga.Ga;
 import org.solovyev.android.calculator.language.Languages;
-import org.solovyev.android.calculator.floating.FloatingCalculatorService;
 import org.solovyev.android.calculator.view.ScreenMetrics;
 import org.solovyev.android.calculator.wizard.CalculatorWizards;
 import org.solovyev.android.wizard.Wizards;
 import org.solovyev.common.JPredicate;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.Collection;
+import java.util.Formatter;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
 * This class aggregates several useful in any Android application interfaces and provides access to {@link android.app.Application} object from a static context.
 * NOTE: use this class only if you don't use and dependency injection library (if you use any you can directly set interfaces through it). <br/>
@@ -335,4 +346,16 @@ public final class App {
            imm.hideSoftInputFromWindow(token, 0);
        }
    }
+
+    public static void showSystemPermissionSettings(@NonNull Activity activity,
+            @NonNull String action) {
+        try {
+            final Intent intent = new Intent(action);
+            intent.setData(Uri.parse("package:" + activity.getPackageName()));
+            activity.startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG,
+                    "Failed to show permission settings for " + action, e);
+        }
+    }
 }
--- a/app/src/main/java/org/solovyev/android/calculator/BaseDialogFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/BaseDialogFragment.java
@@ -79,10 +79,13 @@ public abstract class BaseDialogFragment extends DialogFragment implements View.
        return button;
    }

-    protected abstract void onPrepareDialog(@NonNull AlertDialog.Builder builder);
+    protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
+    }

    @Nullable
-    protected abstract View onCreateDialogView(@NonNull Context context, @NonNull LayoutInflater inflater, @Nullable Bundle savedInstanceState);
+    protected View onCreateDialogView(@NonNull Context context, @NonNull LayoutInflater inflater, @Nullable Bundle savedInstanceState) {
+        return null;
+    }

    protected void setError(@NonNull TextInputLayout textInput, @StringRes int error, Object... errorArgs) {
        setError(textInput, getString(error, errorArgs));
--- a/app/src/main/java/org/solovyev/android/calculator/errors/FixableErrorFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/errors/FixableErrorFragment.java
@@ -1,17 +1,20 @@
 package org.solovyev.android.calculator.errors;

 import android.app.Activity;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.View;
+
 import org.solovyev.android.Check;
-import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.App;
+import org.solovyev.android.calculator.AppComponent;
+import org.solovyev.android.calculator.BaseDialogFragment;
+import org.solovyev.android.calculator.Preferences;
+import org.solovyev.android.calculator.PreferredPreferences;
+import org.solovyev.android.calculator.R;

 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -89,10 +92,4 @@ public class FixableErrorFragment extends BaseDialogFragment {
            activity = null;
        }
    }
-
-    @Nullable
-    @Override
-    protected View onCreateDialogView(@NonNull Context context, @NonNull LayoutInflater inflater, @Nullable Bundle savedInstanceState) {
-        return null;
-    }
 }
--- a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorActivity.java
@@ -22,17 +22,75 @@

 package org.solovyev.android.calculator.floating;

-import android.app.Activity;
+import android.annotation.TargetApi;
+import android.content.DialogInterface;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+
+import org.solovyev.android.Check;
+import org.solovyev.android.calculator.App;
+import org.solovyev.android.calculator.BaseDialogFragment;
+import org.solovyev.android.calculator.R;
+
+public class FloatingCalculatorActivity extends AppCompatActivity {
+
+    @TargetApi(Build.VERSION_CODES.M)
+    public static final class MyFragment extends BaseDialogFragment {
+
+        @Override
+        protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
+            final String permission = getString(R.string.cpp_permission_overlay);
+            builder.setMessage(getString(R.string.cpp_missing_permission_msg, permission));
+            builder.setTitle(R.string.cpp_missing_permission_title);
+            builder.setPositiveButton(R.string.ok, this);
+        }
+
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            switch (which) {
+                case DialogInterface.BUTTON_POSITIVE:
+                    final FragmentActivity activity = getActivity();
+                    App.showSystemPermissionSettings(activity,
+                            Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+                    dismiss();
+                    break;
+                default:
+                    super.onClick(dialog, which);
+                    break;
+            }
+        }
+
+        @Override
+        public void onDismiss(DialogInterface dialog) {
+            super.onDismiss(dialog);
+            final FragmentActivity activity = getActivity();
+            if (activity != null) {
+                activity.finish();
+            }
+        }
+    }

-public class FloatingCalculatorActivity extends Activity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        FloatingCalculatorService.show(this);
+        if (FloatingCalculatorView.isOverlayPermissionGranted(this)) {
+            FloatingCalculatorService.show(this);
+            finish();
+            return;
+        }

-        this.finish();
+        Check.isTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
+        if (savedInstanceState == null) {
+            App.showDialog(new MyFragment(), "no-overlay-permission-dialog",
+                    getSupportFragmentManager());
+        }
    }
+
 }
--- a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorView.java
+++ b/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorView.java
@@ -26,6 +26,10 @@ import static android.view.HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING;
 import static android.view.HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING;
 import static android.view.HapticFeedbackConstants.KEYBOARD_TAP;
 import static android.view.HapticFeedbackConstants.LONG_PRESS;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
+import static android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
 import static org.solovyev.android.calculator.App.cast;

 import android.content.Context;
@@ -281,6 +285,23 @@ public class FloatingCalculatorView {
        }
    }

+    static boolean isOverlayPermissionGranted(@NonNull Context context) {
+        try {
+            final Context application = context.getApplicationContext();
+            final WindowManager wm =
+                    (WindowManager) application.getSystemService(Context.WINDOW_SERVICE);
+            if (wm == null) {
+                return false;
+            }
+            final View view = new View(application);
+            wm.addView(view, makeLayoutParams());
+            wm.removeView(view);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
    public void updateDisplayState(@Nonnull DisplayState displayState) {
        checkInit();
        displayView.setState(displayState);
@@ -406,24 +427,25 @@ public class FloatingCalculatorView {

        final WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
        if (!attached) {
-            final WindowManager.LayoutParams params = new WindowManager.LayoutParams(
-                    state.width,
-                    state.height,
-                    state.x,
-                    state.y,
-                    WindowManager.LayoutParams.TYPE_SYSTEM_ALERT,
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-                            | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-                            | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,
-                    PixelFormat.TRANSLUCENT);
-
+            final WindowManager.LayoutParams params = makeLayoutParams();
+            params.width = state.width;
+            params.height = state.height;
+            params.x = state.x;
+            params.y = state.y;
            params.gravity = Gravity.TOP | Gravity.LEFT;
-
            wm.addView(root, params);
            attached = true;
        }
    }

+    @Nonnull
+    private static WindowManager.LayoutParams makeLayoutParams() {
+        return new WindowManager.LayoutParams(
+                TYPE_SYSTEM_ALERT,
+                FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL | FLAG_WATCH_OUTSIDE_TOUCH,
+                PixelFormat.TRANSLUCENT);
+    }
+
    private void fold() {
        if (!folded) {
            headerTitle.setImageDrawable(headerTitleDrawable);