Flashing - get permissions before checking still paired

Author: martinwork

app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java

@@ -893,7 +893,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             if(resultCode == Activity.RESULT_OK) {
                 if(mActivityState == FlashActivityState.STATE_ENABLE_BT_INTERNAL_FLASH_REQUEST ||
                         mActivityState == FlashActivityState.STATE_ENABLE_BT_EXTERNAL_FLASH_REQUEST) {
-                    flashingChecks();
+                    proceedAfterBlePermissionGrantedAndBleEnabled();
                 } else if(mActivityState == FlashActivityState.STATE_ENABLE_BT_FOR_CONNECT) {
                     setActivityState(FlashActivityState.STATE_IDLE);
                     toggleConnection();
@@ -921,12 +921,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     private boolean startBluetoothForFlashing() {
         Log.v(TAG, "startBluetoothForFlashing");
 
-        if ( launchPairingIfNoCurrentMicrobit())
-            return false;
-
         if ( havePermissionsFlashing()) {
             if( BluetoothChecker.getInstance().isBluetoothON()) {
-                flashingChecks();
+                proceedAfterBlePermissionGrantedAndBleEnabled();
                 return true;
             }
             enableBluetooth();
@@ -946,6 +943,18 @@ private void proceedAfterBlePermissionGranted() {
             enableBluetooth();
             return;
         }
+        proceedAfterBlePermissionGrantedAndBleEnabled();
+    }
+
+    /**
+     * Provides actions after BLE permission has been granted:
+     * check if bluetooth is disabled then enable it and
+     * start the flashing steps.
+     */
+    private void proceedAfterBlePermissionGrantedAndBleEnabled() {
+        if (launchPairingIfNoCurrentMicrobit())
+            return;
+
         flashingChecks();
     }