Working

brigadinhos · May 19, 2017 · d326db4 · d326db4
1 parent 611fa49
commit d326db4
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 642 deletions.
diff --git a/...ommunication/app/src/main/java/com/example/user/bluetooth_communication/MainActivity.java b/...ommunication/app/src/main/java/com/example/user/bluetooth_communication/MainActivity.java
@@ -79,44 +79,6 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
-    /**
-     * Broadcast Receiver for changes made to bluetooth states such as:
-     * 1) Discoverability mode on/off or expire.
-     */
-    private final BroadcastReceiver mBroadcastReceiver2 = new BroadcastReceiver() {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-
-            if (action.equals(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED)) {
-
-                int mode = intent.getIntExtra(BluetoothAdapter.EXTRA_SCAN_MODE, BluetoothAdapter.ERROR);
-
-                switch (mode) {
-                    //Device is in Discoverable Mode
-                    case BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE:
-                        Log.d(TAG, "mBroadcastReceiver2: Discoverability Enabled.");
-                        break;
-                    //Device not in discoverable mode
-                    case BluetoothAdapter.SCAN_MODE_CONNECTABLE:
-                        Log.d(TAG, "mBroadcastReceiver2: Discoverability Disabled. Able to receive connections.");
-                        break;
-                    case BluetoothAdapter.SCAN_MODE_NONE:
-                        Log.d(TAG, "mBroadcastReceiver2: Discoverability Disabled. Not able to receive connections.");
-                        break;
-                    case BluetoothAdapter.STATE_CONNECTING:
-                        Log.d(TAG, "mBroadcastReceiver2: Connecting....");
-                        break;
-                    case BluetoothAdapter.STATE_CONNECTED:
-                        Log.d(TAG, "mBroadcastReceiver2: Connected.");
-                        break;
-                }
-
-            }
-        }
-    };
-
 
 
 

diff --git a/LocMessClient/app/src/main/AndroidManifest.xml b/LocMessClient/app/src/main/AndroidManifest.xml
@@ -78,7 +78,6 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name=".BluetoothPairingActivity"></activity>
     </application>
 
 </manifest>
diff --git a/...app/src/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/BluetoothPairingActivity.java b/...app/src/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/BluetoothPairingActivity.java
diff --git a/...c/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/DataObjects/ServicesDataHolder.java b/...c/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/DataObjects/ServicesDataHolder.java
@@ -2,6 +2,7 @@
 
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.widget.ArrayAdapter;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ public class ServicesDataHolder {
     private boolean killThread = false;
 
     private static final ServicesDataHolder ourInstance = new ServicesDataHolder();
+    private ArrayAdapter bleAdapter;
 
     public static ServicesDataHolder getInstance() {
         return ourInstance;
@@ -55,6 +57,10 @@ private ServicesDataHolder() {
 
     }
 
+    public void setBleAdapter(ArrayAdapter bleAdapter) {
+        this.bleAdapter = bleAdapter;
+    }
+
     public ArrayList<String> getRemovedLocations() {
         return removedLocations;
     }
@@ -180,4 +186,7 @@ public void setKillThread(boolean killThread) {
         this.killThread = killThread;
     }
 
+    public ArrayAdapter getBleAdapter() {
+        return bleAdapter;
+    }
 }
diff --git a/LocMessClient/app/src/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/MainActivity.java b/LocMessClient/app/src/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/MainActivity.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.bluetooth.BluetoothDevice;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
@@ -26,16 +25,13 @@
 import android.widget.TextView;
 
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.DataObjects.ServicesDataHolder;
-import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Exceptions.PublisherNotFoundException;
-import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Services.BluetoothOperations;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Services.BluetoothService;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Services.DBService;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Services.GPSService;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Services.MasterService;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Services.WifiService;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Utils.FeedReaderDbHelper;
 
-import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Utils.Network.ServerActions;
 import pt.ulisboa.tecnico.cmu.tg14.locmessclient.Utils.ServiceManager;
 
 
@@ -132,8 +128,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_connect_mule) {
-            Intent intent =  new Intent(this,BluetoothPairingActivity.class);
-            startActivity(intent);
 
 
 

diff --git a/.../src/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/Receivers/BluetoothReceiver.java b/.../src/main/java/pt/ulisboa/tecnico/cmu/tg14/locmessclient/Receivers/BluetoothReceiver.java
@@ -32,7 +32,7 @@ public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         if(BluetoothDevice.ACTION_FOUND.equals(action)){
             BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            //Log.d(TAG, "onReceive: addr:"+device.getAddress());
+            Log.d(TAG, "onReceive: addr:"+device.getAddress());
             mService.onBleReceived(device);
         }else if(BluetoothAdapter.ACTION_DISCOVERY_STARTED.equals(action)){
             mService.clearBluetoothList();