Merge branch 'master' of github.com:htw-happening/AndroidApp

htw-happening · Feb 9, 2017 · 7f3a014 · 7f3a014
2 parents 5ca4fb7 + dc69fa5
commit 7f3a014
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/app/src/main/java/com/happening/poc_happening/fragment/ChatFragment.java b/app/src/main/java/com/happening/poc_happening/fragment/ChatFragment.java
@@ -13,6 +13,8 @@
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.happening.poc_happening.MainActivity;
+import com.happening.poc_happening.MyApp;
 import com.happening.poc_happening.R;
 import com.happening.poc_happening.adapter.ChatEntriesAdapter;
 import com.happening.poc_happening.datastore.DBHelper;
@@ -42,10 +44,15 @@ public static ChatFragment getInstance() {
 
     public ChatFragment() {
         bluetoothLayer = Layer.getInstance();
-        bluetoothLayer.setAutoConnect(true);
-        bluetoothLayer.createGattServer();
-        bluetoothLayer.startAdvertising();
-        bluetoothLayer.startScan();
+        if (!bluetoothLayer.isAdvertisingSupported()) {
+            //ay caramba - this isnt good
+            Toast.makeText(MyApp.getAppContext(), "Advertising not supported!", Toast.LENGTH_LONG).show();
+        } else {
+            bluetoothLayer.setAutoConnect(true);
+            bluetoothLayer.createGattServer();
+            bluetoothLayer.startAdvertising();
+            bluetoothLayer.startScan();
+        }
     }
 
     @Override