From 0300cf55c1792064ceba1e8209972f16844be844 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Wed, 18 Feb 2015 16:51:42 +0100
Subject: [PATCH] Changed Bluetooth to insecure mode

---
 .../com/ericsson/uecontrol/core/util/BluetoothClient.java | 6 +++---
 .../com/ericsson/uecontrol/core/util/BluetoothServer.java | 3 ++-
 .../com/ericsson/uecontrol/core/util/BluetoothUtil.java   | 8 ++++++--
 .../java/com/ericsson/uecontrol/gui/MainActivity.java     | 5 +++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothClient.java b/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothClient.java
index 8fa8516..ea2c4e6 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothClient.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothClient.java
@@ -21,12 +21,12 @@ public class BluetoothClient extends Thread {
         this.msgHandler = msgHandler;
 
         // Get a BluetoothSocket to connect with the given BluetoothDevice
-        socket = device.createRfcommSocketToServiceRecord(UUID.fromString(service_uuid));
+        socket = device.createInsecureRfcommSocketToServiceRecord(UUID.fromString(service_uuid));
+        //socket = device.createRfcommSocketToServiceRecord(UUID.fromString(service_uuid));
         // Fallback
         //socket = (BluetoothSocket)device.getClass().getMethod("createRfcommSocket", new Class[] {int.class}).invoke(device,1);
 
-        // Connect the device through the socket. This will block
-        // until it succeeds or throws an exception
+        // Connect the device through the socket. This will block until it succeeds
         try {
             socket.connect();
         } catch (IOException e){
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothServer.java b/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothServer.java
index 32fc6d8..037e92c 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothServer.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothServer.java
@@ -25,7 +25,8 @@ public class BluetoothServer extends Thread {
 
         // MY_UUID is the app's UUID string, also used by the client code
         BluetoothAdapter adapter = BluetoothUtil.getAdapter();
-        serverSocket = adapter.listenUsingRfcommWithServiceRecord(service, UUID.fromString(service_uuid));
+        serverSocket = adapter.listenUsingInsecureRfcommWithServiceRecord(service, UUID.fromString(service_uuid));
+        //serverSocket = adapter.listenUsingRfcommWithServiceRecord(service, UUID.fromString(service_uuid));
     }
 
     public void run() {
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothUtil.java b/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothUtil.java
index d64c2b1..2ffa673 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothUtil.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/util/BluetoothUtil.java
@@ -9,6 +9,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import com.ericsson.uecontrol.gui.MainActivity;
 import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.Main;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,13 +18,16 @@ import java.util.UUID;
 
 public class BluetoothUtil {
     private static final Logger log = Logger.getLogger(BluetoothUtil.class);
+    public static final int BT_ENABLE_REQUEST_CODE = 1501;
+    public static final int BT_DISCOVERABLE_REQUEST_CODE = 1502;
 
     public static BluetoothAdapter getAdapter() {
         BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         if (mBluetoothAdapter != null) {
             if (!mBluetoothAdapter.isEnabled()) {
+                // Send Enable Bluetooth intent
                 Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-                ((Activity) MainActivity.getContext()).startActivityForResult(enableBtIntent, 1515);
+                MainActivity.getContext().startActivityForResult(enableBtIntent, BT_ENABLE_REQUEST_CODE);
             }
         }
         else
@@ -117,6 +121,6 @@ public class BluetoothUtil {
         Intent discoverableIntent = new
                 Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
         discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 120);
-        MainActivity.getContext().startActivity(discoverableIntent);
+        MainActivity.getContext().startActivityForResult(discoverableIntent, BT_DISCOVERABLE_REQUEST_CODE);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
index 60b464c..ba6bd1a 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
@@ -1,6 +1,7 @@
 package com.ericsson.uecontrol.gui;
 
 import android.app.ActionBar;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -51,7 +52,7 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
     /* Static Data */
     private static UeControlExecutor executor;
     private static int uid;
-    private static Context context;
+    private static Activity context;
 
 
     @Override
@@ -318,5 +319,5 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
     public static int getUID(){
         return uid;
     }
-    public static Context getContext(){return context;}
+    public static Activity getContext(){return context;}
 }