Merge remote-tracking branch 'origin/dev'

Author: Amerlander

app/src/main/java/cc/calliope/mini/ProgressCollector.java

@@ -28,28 +28,6 @@ public class ProgressCollector extends ContextWrapper implements DefaultLifecycl
     private final Context context;
     private ProgressListener listener;
 
-    private final BroadcastReceiver bondStateReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            if (device == null) {
-                return;
-            }
-
-            final String action = intent.getAction();
-            if (action == null) {
-                return;
-            }
-
-            // Take action depending on new bond state
-            if (action.equals(ACTION_BOND_STATE_CHANGED)) {
-                final int bondState = intent.getIntExtra(EXTRA_BOND_STATE, ERROR);
-                final int previousBondState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE, ERROR);
-                listener.onBluetoothBondingStateChanged(device, bondState, previousBondState);
-            }
-        }
-    };
-
     private final BroadcastReceiver dfuServiceReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -119,10 +97,6 @@ public void registerReceivers() {
         if (listener == null) {
             return;
         }
-        //BondStateReceiver
-        IntentFilter bondStateFilter = new IntentFilter();
-        bondStateFilter.addAction(ACTION_BOND_STATE_CHANGED);
-        registerReceiver(bondStateReceiver, bondStateFilter);
 
         //DfuService
         IntentFilter dfuServiceFilter = new IntentFilter();
@@ -137,7 +111,6 @@ public void registerReceivers() {
     }
 
     public void unregisterReceivers() {
-        unregisterReceiver(bondStateReceiver);
         LocalBroadcastManager.getInstance(context).unregisterReceiver(dfuServiceReceiver);
         LocalBroadcastManager.getInstance(context).unregisterReceiver(dfuControlServiceReceiver);
     }

app/src/main/java/cc/calliope/mini/ProgressListener.java

@@ -21,7 +21,6 @@ public interface ProgressListener {
     void onDfuAttempt();
     void onDfuControlComplete();
     void onProgressUpdate(int progress);
-    void onBluetoothBondingStateChanged(@NonNull BluetoothDevice device, @BondState int bondState, @BondState int previousBondState);
     void onConnectionFailed();
     void onError(int code, String message);
 }

app/src/main/java/cc/calliope/mini/activity/FlashingActivity.java

@@ -167,11 +167,6 @@ public void onProgressUpdate(int progress) {
 //        title.setText(String.format(getString(R.string.flashing_percent), progress));
     }
 
-    @Override
-    public void onBluetoothBondingStateChanged(@NonNull BluetoothDevice device, int bondState, int previousBondState) {
-
-    }
-
     @Override
     public void onConnectionFailed() {
 

app/src/main/java/cc/calliope/mini/core/service/FlashingService.java

@@ -58,7 +58,7 @@ public class FlashingService extends LifecycleService implements ProgressListene
     private String currentPath;
     private int progress = -10;
 
-    private static final int CONNECTION_TIMEOUT = 10000; // 10 seconds
+    private static final int CONNECTION_TIMEOUT = 3000; // 3 seconds
     private Handler handler;
     private Runnable timeoutRunnable;
 
@@ -74,10 +74,8 @@ public void onChanged(State state) {
 
             int type = state.getType();
 
-            if (type == State.STATE_READY ||
-                type == State.STATE_FLASHING ||
-                type == State.STATE_ERROR ||
-                type == State.STATE_IDLE) {
+            if (type == State.STATE_FLASHING ||
+                type == State.STATE_ERROR) {
                 handler.removeCallbacks(timeoutRunnable); // Remove the timeout callback
             }
         }
@@ -147,14 +145,6 @@ public void onDfuAttempt() {
         startDfuControlService();
     }
 
-    @Override
-    public void onBluetoothBondingStateChanged(BluetoothDevice device, int bondState, int previousBondState) {
-        if (!currentAddress.equals(device.getAddress())) {
-            return;
-        }
-        Utils.log(Log.ASSERT, TAG, "Bond state: " + bondState + " previous: " + previousBondState);
-    }
-
 
     @SuppressWarnings("MissingPermission")
     @Override