added more checking points ( if bluetooth is enabled before doing an…

… action )
georkost4 · Jul 2, 2016 · 203ad89 · 203ad89
1 parent e1e628c
commit 203ad89
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 50 deletions.
diff --git a/BTproject/.idea/inspectionProfiles/Project_Default.xml b/BTproject/.idea/inspectionProfiles/Project_Default.xml
diff --git a/BTproject/.idea/inspectionProfiles/profiles_settings.xml b/BTproject/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/BTproject/.idea/misc.xml b/BTproject/.idea/misc.xml
diff --git a/BTproject/app/src/main/java/com/house/sora/btproject/View/FindDevice.java b/BTproject/app/src/main/java/com/house/sora/btproject/View/FindDevice.java
@@ -47,8 +47,6 @@ protected void onCreate(Bundle savedInstanceState) {
         init();
         registerReceivers();
         fillPairedDevicesListView();
-
-
     }
 
     private void fillPairedDevicesListView() {
@@ -98,7 +96,19 @@ private void init()
 
     }
 
-    private void btnSearchDevicesClicked(View v) {  btAdapter.startDiscovery();   } // Start discovering servicce to find new device
+    private void btnSearchDevicesClicked(View v)
+    {
+        // Check if bluetooth is enabled
+        if (btAdapter.isEnabled()) {
+            // Start discovering servicce to find new device
+            btAdapter.startDiscovery();
+        }
+        else
+        {
+            // Display error message
+            Toast.makeText(getApplicationContext(),"Enable bluetooth to start searching",Toast.LENGTH_SHORT).show();
+        }
+    }
 
 
     private void registerReceivers()
@@ -168,7 +178,6 @@ public void onReceive(Context context, Intent intent) {
 
 
 
-
     private void devicesArrayAdapterClicked(AdapterView<?> parent, View view, int position, long id)
     {
         Log.d(TAG,"deviceClicked");

diff --git a/BTproject/app/src/main/java/com/house/sora/btproject/View/MainActivity.java b/BTproject/app/src/main/java/com/house/sora/btproject/View/MainActivity.java
@@ -52,11 +52,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         initialize();
-        setUpBluetooth();
-
-
-
 
+        setUpBluetooth();
         Log.e(TAG,"----On  Create------");
     }
 
@@ -65,9 +62,8 @@ private void startListeningForConnectionsAsServer() {
         bluetoothAsServer.start();
     }
 
-    private void setUpBluetooth()
+    public void setUpBluetooth()
     {
-        btAdapter = BluetoothAdapter.getDefaultAdapter();
 
         if(btAdapter != null)
         {
@@ -83,10 +79,11 @@ private void setUpBluetooth()
 
     private void initialize() {
         setTitle("Main Panel");
+        btAdapter = BluetoothAdapter.getDefaultAdapter();
         btnFindDevices = (Button) findViewById(R.id.btnFind);
         btnFindDevices.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) { startActivityForResult(new Intent(MainActivity.this, FindDevice.class),Constants.FIND_DEVICE_REQUEST);      }
+            public void onClick(View v) { btnFindDevicesClicked(new Intent(MainActivity.this, FindDevice.class), Constants.FIND_DEVICE_REQUEST);}
         });
         btnSendData = (Button) findViewById(R.id.btnSend);
         btnSendData.setOnClickListener(new View.OnClickListener() {
@@ -114,6 +111,18 @@ public void onClick(View v) {
         myHandler =  new chatMessageHandler(MainActivity.this);
     }
 
+    private void btnFindDevicesClicked(Intent intent, int findDeviceRequest)
+    {
+        // Check for bluetooth if enabled before continuing
+        if (btAdapter.isEnabled()) startActivityForResult(intent, findDeviceRequest);
+        // Else display error until bluetooth is enabled
+        else
+        {
+            Toast.makeText(getApplicationContext(), "Enable Bluetooth to continue", Toast.LENGTH_SHORT).show();
+            setUpBluetooth();
+        }
+    }
+
     public synchronized void doUpdateChatListView(Message msg)
     {
         // Get the bundle with
@@ -149,7 +158,6 @@ private void btnCheckConnectivityClicked()
                 }
                 case Constants.CONNECTION_ESTABLISHED_AS_SERVER:
                 {
-
                     String str = String.valueOf(BluetoothAsServer.getSocket().isConnected());
                     Toast.makeText(this, str, Toast.LENGTH_LONG).show();
                     break;
@@ -199,6 +207,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     Log.d(TAG,"Bluetooth enabled");
                     startListeningForConnectionsAsServer();
                 }
+                else
+                {
+                    //Show error message and exit the application
+                    Toast.makeText(getApplicationContext(),"You must enable bluetooth to continue",Toast.LENGTH_SHORT).show();
+                }
                 break;
             case Constants.REQUEST_DISCOVERABILITY_BT:
                 if(resultCode == RESULT_OK)  Log.d(TAG,"Bluetooth discoverable");