- preserve location not enabled dialog on orientation change

Author: antonio-openroad

app/src/main/java/com/adafruit/bluefruit/le/connect/app/MainActivity.java

@@ -40,6 +40,7 @@
 import com.adafruit.bluefruit.le.connect.ble.BleDevicesScanner;
 import com.adafruit.bluefruit.le.connect.ble.BleManager;
 import com.adafruit.bluefruit.le.connect.ble.BleUtils;
+import com.adafruit.bluefruit.le.connect.ui.utils.DialogUtils;
 import com.adafruit.bluefruit.le.connect.ui.utils.ExpandableHeightExpandableListView;
 
 import java.util.ArrayList;
@@ -164,7 +165,7 @@ public void run() {
 
             // Check if bluetooth adapter is available
             final boolean wasBluetoothEnabled = manageBluetoothAvailability();
-            final boolean areLocationServicesReadyForScanning = manageLocationServiceAvailabiltyForScanning();
+            final boolean areLocationServicesReadyForScanning = manageLocationServiceAvailabilityForScanning();
 
             // Reset bluetooth
             if (autoResetBluetoothOnStart && wasBluetoothEnabled && areLocationServicesReadyForScanning) {
@@ -372,15 +373,16 @@ private boolean manageBluetoothAvailability() {
         }
         if (errorMessageId > 0) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setMessage(errorMessageId)
+            AlertDialog dialog = builder.setMessage(errorMessageId)
                     .setPositiveButton(R.string.dialog_ok, null)
                     .show();
+            DialogUtils.keepDialogOnOrientationChanges(dialog);
         }
 
         return isEnabled;
     }
 
-    private boolean manageLocationServiceAvailabiltyForScanning() {
+    private boolean manageLocationServiceAvailabilityForScanning() {
 
         boolean areLocationServiceReady = true;
 
@@ -397,9 +399,10 @@ private boolean manageLocationServiceAvailabiltyForScanning() {
             if (!areLocationServiceReady) {
 
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setMessage(R.string.dialog_error_nolocationservices_requiredforscan_marshmallow)
+                AlertDialog dialog = builder.setMessage(R.string.dialog_error_nolocationservices_requiredforscan_marshmallow)
                         .setPositiveButton(R.string.dialog_ok, null)
                         .show();
+                DialogUtils.keepDialogOnOrientationChanges(dialog);
             }
         }
 
@@ -433,9 +436,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 resumeScanning();
             } else if (resultCode == Activity.RESULT_CANCELED) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setMessage(R.string.dialog_error_no_bluetooth)
+                AlertDialog dialog = builder.setMessage(R.string.dialog_error_no_bluetooth)
                         .setPositiveButton(R.string.dialog_ok, null)
                         .show();
+                DialogUtils.keepDialogOnOrientationChanges(dialog);
+
             }
         } else if (requestCode == kActivityRequestCode_Settings) {
             // Return from activity settings. Update app behaviour if needed

app/src/main/java/com/adafruit/bluefruit/le/connect/ui/utils/DialogUtils.java

@@ -0,0 +1,17 @@
+package com.adafruit.bluefruit.le.connect.ui.utils;
+
+import android.app.Dialog;
+import android.view.WindowManager;
+
+public class DialogUtils {
+
+    // Prevent dialog dismiss when orientation changes
+    // http://stackoverflow.com/questions/7557265/prevent-dialog-dismissal-on-screen-rotation-in-android
+    public static void keepDialogOnOrientationChanges(Dialog dialog){
+        WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
+        lp.copyFrom(dialog.getWindow().getAttributes());
+        lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        dialog.getWindow().setAttributes(lp);
+    }
+}