bluetooth no device duplication (fixes #139) (#140)

treehouses · Jan 10, 2019 · c909d4c · c909d4c
1 parent 4cf2f28
commit c909d4c
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/app/src/main/java/io/treehouses/remote/Fragments/RPIDialogFragment.java b/app/src/main/java/io/treehouses/remote/Fragments/RPIDialogFragment.java
@@ -88,12 +88,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             }
         });
 
-        IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-        filter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
-        getActivity().registerReceiver(mReceiver, filter);
-
         if(mChatService == null){
             setupBluetoothService();
         }
@@ -110,6 +104,13 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 //                listView.setAdapter(new ArrayAdapter<String>(getContext(), android.R.layout.simple_list_item_1, s));
             }
         }
+
+        IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+        filter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
+        getActivity().registerReceiver(mReceiver, filter);
+
         return mDialog;
     }
 
@@ -194,7 +195,7 @@ public void onReceive(Context context, Intent intent) {
                 String deviceHardwareAddress = device.getAddress(); // MAC address
                 boolean alreadyExist = false;
                 for(BluetoothDevice checkDevices : devices){
-                    if(checkDevices == device){
+                    if(checkDevices.equals(device)){
                         alreadyExist = true;
                     }
                 }
@@ -203,9 +204,6 @@ public void onReceive(Context context, Intent intent) {
                     s.add(deviceName+ "\n" + deviceHardwareAddress);
                     listView.setAdapter(new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1, s));
                 }
-//                if(deviceName!=null){
-//                }
-
                 Log.e("Broadcast BT", device.getName() + "\n" + device.getAddress());
             }
             else if(BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)){