From daf5af63ba72137b8a99c014c5a922a4f05529c1 Mon Sep 17 00:00:00 2001
From: wildchild <cobwild_child@hotmail.com>
Date: Mon, 12 Aug 2019 15:34:39 +0100
Subject: [PATCH 1/5] fixed typos

---
 .idea/gradle.xml                              |  2 +-
 .idea/modules.xml                             |  3 +++
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/aqua30/blewrapper/BLEActivity.java   | 26 ++++++++++---------
 .../aqua/blewrapper/helper/BLESession.java    |  4 ++-
 .../java/aqua/blewrapper/model/Device.java    |  2 +-
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1480ad2..e9dddd9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../Downloads/Gradle/gradle-4.4.1-all/gradle-4.4.1" />
+        <option name="gradleHome" value="$USER_HOME$/Downloads/Gradle/gradle-4.4.1-all/gradle-4.4.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e7f9784..09166b6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/Android-Bluetooth-Low-Energy-Wrapper-BLE.iml" filepath="$PROJECT_DIR$/Android-Bluetooth-Low-Energy-Wrapper-BLE.iml" />
       <module fileurl="file://$PROJECT_DIR$/BLEWrapper.iml" filepath="$PROJECT_DIR$/BLEWrapper.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/blewrapper/blewrapper.iml" filepath="$PROJECT_DIR$/blewrapper/blewrapper.iml" />
       <module fileurl="file://$PROJECT_DIR$/blewrapper/blewrapper.iml" filepath="$PROJECT_DIR$/blewrapper/blewrapper.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index b3c518e..9a9295c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,5 +24,5 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:10.0.1'
     implementation 'android.arch.lifecycle:extensions:1.0.0'
     implementation project(':blewrapper')
-    implementation files('libs/d2xx.jar')
+   // implementation files('libs/d2xx.jar')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8716731..3d50111 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".FragmentLayout"
+            android:name=".BLEActivity"
             android:label="@string/title_activity_main"
             android:launchMode="singleTask"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/app/src/main/java/aqua30/blewrapper/BLEActivity.java b/app/src/main/java/aqua30/blewrapper/BLEActivity.java
index 2dde52f..16d10e0 100644
--- a/app/src/main/java/aqua30/blewrapper/BLEActivity.java
+++ b/app/src/main/java/aqua30/blewrapper/BLEActivity.java
@@ -53,7 +53,7 @@ public class BLEActivity extends AppCompatActivity implements EasyPermissions.Pe
     public static final String mode = "mode";
     /* variables */
     private StringBuilder dataBuilder;
-//    private String connectedDeviceName, connectedDeviceAddress;
+    //    private String connectedDeviceName, connectedDeviceAddress;
     private String selectedMode;
 
     @Override
@@ -65,7 +65,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         button_bleMode = findViewById(R.id.bleMode);
         button_manualMode = findViewById(R.id.manualMode);
         /*  getting any presaved or pre connected device name and address
-        *   This details are automatically saved by the wrapper */
+         *   This details are automatically saved by the wrapper */
         selectedMode = PreferenceClass.getInstance(this).getString(mode, Manual);
         /* only for demo */
         setMode();
@@ -75,7 +75,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         bluetoothManager = new BluetoothController(this);
         bluetoothManager.setGoogleApiClient(mGoogleApiClient);
         /* set this if you want to receive the callbacks related to bluetooth permission, gps state for
-        *  device > M, bluetooth on device is connected or not*/
+         *  device > M, bluetooth on device is connected or not*/
         bluetoothManager.setConnectionCallbacks(this);
         /* set this callback if you want to received the data from BLE device */
         bluetoothManager.setDataCallbacks(this);
@@ -129,8 +129,8 @@ public void Disconnect(View view) {
         selectedMode = Manual;
         PreferenceClass.getEditor(this).putString(mode, selectedMode).apply();
         setMode();
-        if (!bluetoothManager.getSavedDevice().getDeviceAddress().isEmpty()){
-            setDataOnScreen("Manual mode activated. Disconnected "+
+        if (!bluetoothManager.getSavedDevice().getDeviceAddress().isEmpty()) {
+            setDataOnScreen("Manual mode activated. Disconnected " +
                     bluetoothManager.getSavedDevice().getDeviceAddress());
         }
         bluetoothManager.disconnect();
@@ -150,7 +150,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     @SuppressLint("LongLogTag")
     protected synchronized void buildGoogleApiClient() {
-        log( "Building GoogleApiClient");
+        log("Building GoogleApiClient");
         mGoogleApiClient = new GoogleApiClient.Builder(this)
                 .addApi(LocationServices.API)
                 .build();
@@ -184,7 +184,8 @@ public void onStop() {
     }
 
     @Override
-    public void onPermissionsGranted(int requestCode, List<String> perms) {}
+    public void onPermissionsGranted(int requestCode, List<String> perms) {
+    }
 
     @Override
     public void onPermissionsDenied(int requestCode, List<String> perms) {
@@ -214,8 +215,8 @@ public void afterPermissionGranted() {
             } else {
                 bluetoothManager.checkLocationRequirements();
             }
-        }catch (Exception e) {
-            Log.e("scan permission error","error: "+e.getMessage());
+        } catch (Exception e) {
+            Log.e("scan permission error", "error: " + e.getMessage());
         }
     }
 
@@ -307,6 +308,7 @@ public void connectedDeviceState(int connectedDeviceState) {
     /* Checking once the BLE is connected that*/
     private void checkPreviousState() {
         if (selectedMode.equals(BLE)) {
+            System.out.println("-----------------------------------------   WHAT KIND OF @ IS THIS : " + bluetoothManager.getSavedDevice().getDeviceAddress());
             if (!bluetoothManager.getSavedDevice().getDeviceAddress().isEmpty()) {
                 setDataOnScreen("Last saved device " + bluetoothManager.getSavedDevice().getDeviceName());
                 bluetoothManager.setDiscoveryCallbacks(new BluetoothViewContract.DiscoveryCallbacks() {
@@ -342,12 +344,12 @@ private void setDataOnScreen(String message) {
         }
     }
 
-    private String getTemperature(String message){
-        message = message.replace(" ","").trim();
+    private String getTemperature(String message) {
+        message = message.replace(" ", "").trim();
         final int msgLength = message.length();
         message = message.substring(0, 12) + "0" + message.substring(13, msgLength);
         ArrayList<Integer> byteArray = hexStringToByteArray(message, message.length());
-        return String.valueOf(toInt16_Temp(new int[] {byteArray.get(6), byteArray.get(7)}, 0) * 0.0625);
+        return String.valueOf(toInt16_Temp(new int[]{byteArray.get(6), byteArray.get(7)}, 0) * 0.0625);
     }
 
     public static double toInt16_Temp(int[] bytes, int index) {
diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
index 684386f..86120ae 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
@@ -120,7 +120,9 @@ public void onReceive(Context context, Intent intent) {
             } else if (ACTION_GATT_SERVICES_DISCOVERED.equals(action)) {
                 // Show all the supported services and characteristics on the user interface.
                 displayGattServices(mBLEService.getSupportedGattServices());
-                if (mGattCharacteristics != null) {
+
+                //if (mGattCharacteristics != null) {
+                if (false) {
                     BluetoothGattCharacteristic characteristic = null;
                     for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
                         UUID key = entry.getKey();
diff --git a/blewrapper/src/main/java/aqua/blewrapper/model/Device.java b/blewrapper/src/main/java/aqua/blewrapper/model/Device.java
index 4dc2648..8f6bb6c 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/model/Device.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/model/Device.java
@@ -25,7 +25,7 @@ public void setDeviceName(String deviceName) {
     }
 
     public String getDeviceAddress() {
-        return PreferenceClass.getInstance(context).getString(deviceName, "");
+        return PreferenceClass.getInstance(context).getString(deviceAddress, "");
     }
 
     public void setDeviceAddress(String deviceAddress) {

From 39f6fc2d7cb125a164902c266918bb736cbfcf4a Mon Sep 17 00:00:00 2001
From: wildchild <cobwild_child@hotmail.com>
Date: Mon, 12 Aug 2019 15:44:45 +0100
Subject: [PATCH 2/5] fixed typos , removed some checks

---
 .../src/main/java/aqua/blewrapper/helper/BLESession.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
index 86120ae..485e20c 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
@@ -121,8 +121,8 @@ public void onReceive(Context context, Intent intent) {
                 // Show all the supported services and characteristics on the user interface.
                 displayGattServices(mBLEService.getSupportedGattServices());
 
-                //if (mGattCharacteristics != null) {
-                if (false) {
+                if (mGattCharacteristics != null) {
+                //if (false) {
                     BluetoothGattCharacteristic characteristic = null;
                     for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
                         UUID key = entry.getKey();

From 4bcc4818a59ad0327ff333b05edfbd695d75f0be Mon Sep 17 00:00:00 2001
From: wildchild <cobwild_child@hotmail.com>
Date: Mon, 12 Aug 2019 16:10:13 +0100
Subject: [PATCH 3/5] Removed unknown service in AndroidManifest

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../aqua/blewrapper/helper/BLESession.java    | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3d50111..2dbeb2b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,8 +36,6 @@
         <service
             android:name="aqua.blewrapper.service.BLEService"
             android:enabled="true" />
-        <service
-            android:name="aqua.blewrapper.monitor_test.MBLEService"
-            android:enabled="true" />
+
     </application>
 </manifest>
diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
index 485e20c..a982486 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
@@ -31,11 +31,10 @@
 
 /**
  * Created by Saurabh on 02-01-2018.
- *
+ * <p>
  * A session is created for the device in connection. The connection lasts
  * as long as this session lasts. For every connection, a new session is created.
  * Once we are done with BLE connection , we destroy this session.
- *
  */
 
 public class BLESession extends LiveData {
@@ -49,7 +48,7 @@ public class BLESession extends LiveData {
     private String mDeviceAddress;
     private final String LIST_UUID = "UUID";
     private ArrayList<ArrayList<BluetoothGattCharacteristic>> mGattCharacteristics = new ArrayList<>();
-    public static HashMap<UUID,ArrayList<BluetoothGattCharacteristic>> servicemap = new HashMap<>();
+    public static HashMap<UUID, ArrayList<BluetoothGattCharacteristic>> servicemap = new HashMap<>();
 
     public BLESession(Context mContext) {
         this.mContext = mContext;
@@ -96,7 +95,7 @@ public void onServiceConnected(ComponentName componentName, IBinder service) {
                 Log.e(StateCodes.LOGTAG, "Unable to initialize Bluetooth");
             }
             // Automatically connects to the device upon successful start-up initialization.
-            log("device address in connection: "+ mDeviceAddress);
+            log("device address in connection: " + mDeviceAddress);
             if (!mDeviceAddress.isEmpty()) {
                 mBLEService.connect(mDeviceAddress);
             }
@@ -107,36 +106,51 @@ public void onServiceDisconnected(ComponentName componentName) {
             log("service disconnected");
             mBLEService = null;
         }
-    };
+    }
+
+    ;
 
     private final BroadcastReceiver mGattUpdateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
+
             final String action = intent.getAction();
+
             if (ACTION_GATT_CONNECTED.equals(action)) {
                 setValue(ACTION_GATT_CONNECTED);
             } else if (ACTION_GATT_DISCONNECTED.equals(action)) {
                 setValue(ACTION_GATT_DISCONNECTED);
             } else if (ACTION_GATT_SERVICES_DISCOVERED.equals(action)) {
                 // Show all the supported services and characteristics on the user interface.
+
                 displayGattServices(mBLEService.getSupportedGattServices());
 
                 if (mGattCharacteristics != null) {
-                //if (false) {
+                    //if (false) {
                     BluetoothGattCharacteristic characteristic = null;
+
+                    Log.d("Characterics", "SIZE : " + String.valueOf(servicemap.entrySet().size()));
                     for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
                         UUID key = entry.getKey();
                         ArrayList<BluetoothGattCharacteristic> value = entry.getValue();
                         /* this part was specific to our requirement. One can modify or delete this part
-                        *  as per their requirement.
-                        * */
-                        if(key.toString().contains("1809") && value.size() > 0) {
+                         *  as per their requirement.
+                         * */
+
+
+                        if (key.toString().contains("1809") && value.size() > 0) {
                             characteristic = value.get(1);
-                            Log.e("characteristics", characteristic.getValue()+"");
+                            Log.e("characteristics", characteristic.getValue() + "");
                             break;
                         }
                     }
+
+                    if (characteristic == null ){
+                        return;
+                    }
+
                     final int charaProp = characteristic.getProperties();
+
                     if ((charaProp | BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
                         if (mNotifyCharacteristic != null) {
                             mBLEService.setCharacteristicIndication(mNotifyCharacteristic, false);
@@ -145,6 +159,7 @@ public void onReceive(Context context, Intent intent) {
                         log("reading characteristics");
                         mBLEService.readCharacteristic(characteristic);
                     }
+
                     if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) {
                         mNotifyCharacteristic = characteristic;
                         mBLEService.setCharacteristicNotification(characteristic, true);
@@ -191,7 +206,7 @@ private void displayGattServices(List<BluetoothGattService> gattServices) {
             }
             mGattCharacteristics.add(charas);
             gattCharacteristicData.add(gattCharacteristicGroupData);
-            servicemap.put(gattService.getUuid(),charas);
+            servicemap.put(gattService.getUuid(), charas);
         }
     }
 

From 1eed97eca17801a53864688940abe3087ce18307 Mon Sep 17 00:00:00 2001
From: wildchild <cobwild_child@hotmail.com>
Date: Sat, 17 Aug 2019 15:24:28 +0100
Subject: [PATCH 4/5] Removed unknown service in AndroidManifest

---
 .idea/misc.xml                                | 17 ++++-
 .idea/modules.xml                             |  2 -
 .../java/aqua30/blewrapper/BLEActivity.java   | 44 +++++++++---
 .../aqua30/blewrapper/util/ByteUtils.java     | 13 ++++
 .../aqua30/blewrapper/util/Constants.java     | 21 ++++++
 .../aqua30/blewrapper/util/StringUtils.java   | 63 ++++++++++++++++
 app/src/main/res/layout/ac_test.xml           |  9 +--
 app/src/main/res/values/strings.xml           |  8 +--
 .../contracts/BluetoothManager.java           |  2 +
 .../contracts/BluetoothViewContract.java      |  2 +
 .../aqua/blewrapper/helper/BLESession.java    | 44 ++++++++----
 .../helper/BluetoothController.java           |  9 +++
 .../aqua/blewrapper/service/BLEService.java   | 72 ++++++++++++++++---
 13 files changed, 260 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/aqua30/blewrapper/util/ByteUtils.java
 create mode 100644 app/src/main/java/aqua30/blewrapper/util/Constants.java
 create mode 100644 app/src/main/java/aqua30/blewrapper/util/StringUtils.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7052b..9e762bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,26 +5,37 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 09166b6..a31261a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,8 +5,6 @@
       <module fileurl="file://$PROJECT_DIR$/Android-Bluetooth-Low-Energy-Wrapper-BLE.iml" filepath="$PROJECT_DIR$/Android-Bluetooth-Low-Energy-Wrapper-BLE.iml" />
       <module fileurl="file://$PROJECT_DIR$/BLEWrapper.iml" filepath="$PROJECT_DIR$/BLEWrapper.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/blewrapper/blewrapper.iml" filepath="$PROJECT_DIR$/blewrapper/blewrapper.iml" />
       <module fileurl="file://$PROJECT_DIR$/blewrapper/blewrapper.iml" filepath="$PROJECT_DIR$/blewrapper/blewrapper.iml" />
     </modules>
   </component>
diff --git a/app/src/main/java/aqua30/blewrapper/BLEActivity.java b/app/src/main/java/aqua30/blewrapper/BLEActivity.java
index 16d10e0..26859a3 100644
--- a/app/src/main/java/aqua30/blewrapper/BLEActivity.java
+++ b/app/src/main/java/aqua30/blewrapper/BLEActivity.java
@@ -26,6 +26,7 @@
 import aqua.blewrapper.contracts.BluetoothViewContract;
 import aqua.blewrapper.helper.BluetoothController;
 import aqua.blewrapper.model.PreferenceClass;
+import aqua.blewrapper.service.BLEService;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.AppSettingsDialog;
 import pub.devrel.easypermissions.EasyPermissions;
@@ -34,10 +35,13 @@
 import static aqua.blewrapper.helper.BluetoothController.log;
 
 /**
- * Created by Saurabh on 27-12-2017.
+ * Created by Derouiche elyes on 27-12-2017.
  */
-public class BLEActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks,
-        BluetoothViewContract.ConnectionStateCallbacks, BluetoothViewContract.CommunicationCallbacks, BluetoothViewContract.ConnectedDeviceStateCallbacks {
+public class BLEActivity extends AppCompatActivity implements
+        EasyPermissions.PermissionCallbacks,
+        BluetoothViewContract.ConnectionStateCallbacks,
+        BluetoothViewContract.CommunicationCallbacks,
+        BluetoothViewContract.ConnectedDeviceStateCallbacks {
 
     /* Views */
     private TextView dataView;
@@ -54,21 +58,28 @@ public class BLEActivity extends AppCompatActivity implements EasyPermissions.Pe
     /* variables */
     private StringBuilder dataBuilder;
     //    private String connectedDeviceName, connectedDeviceAddress;
-    private String selectedMode;
+    private String selectedMode = BLE;
+    private BLEService mBLEServiceInstance;
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.ac_test);
         dataBuilder = new StringBuilder();
         dataView = findViewById(R.id.input_text);
-        button_bleMode = findViewById(R.id.bleMode);
-        button_manualMode = findViewById(R.id.manualMode);
+
+//        button_bleMode = findViewById(R.id.bleMode);
+  //      button_manualMode = findViewById(R.id.manualMode);
+
+
         /*  getting any presaved or pre connected device name and address
          *   This details are automatically saved by the wrapper */
-        selectedMode = PreferenceClass.getInstance(this).getString(mode, Manual);
+    //    selectedMode = PreferenceClass.getInstance(this).getString(mode, Manual);
         /* only for demo */
-        setMode();
+      //  setMode();
+
+
         /* required for ble wrapper */
         buildGoogleApiClient();
         /* ble wrapper main object via which we'll do all the operations */
@@ -83,6 +94,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         bluetoothManager.setConnectedDeviceStateCallbacks(this);
         /* it checks all the required permission for Bluetooth activation */
         bluetoothManager.checkBluetoothRequirements();
+
+
+
+
     }
 
     private void setMode() {
@@ -115,7 +130,7 @@ public void onDeviceSelected(BluetoothDevice device) {
     public void Connect(View view) {
         selectedMode = BLE;
         PreferenceClass.getEditor(this).putString(mode, selectedMode).apply();
-        setMode();
+        //setMode();
         if (!bluetoothManager.getSavedDevice().getDeviceAddress().isEmpty()) {
             setDataOnScreen("Connecting to " + bluetoothManager.getSavedDevice().getDeviceName() + "...");
             bluetoothManager.connectToDevice(bluetoothManager.getSavedDevice().getDeviceAddress());
@@ -287,6 +302,11 @@ public void onDataReceived(String data) {
         setDataOnScreen("Data received: " + temp);
     }
 
+    @Override
+    public void sendData(String data) {
+        bluetoothManager.sendData(data);
+    }
+
     @Override
     public void connectedDeviceState(int connectedDeviceState) {
         switch (connectedDeviceState) {
@@ -391,4 +411,8 @@ public static ArrayList<Integer> hexStringToByteArray(String s, int len) {
         }
         return d;
     }
+
+    public void SendData(View view) {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/aqua30/blewrapper/util/ByteUtils.java b/app/src/main/java/aqua30/blewrapper/util/ByteUtils.java
new file mode 100644
index 0000000..5308706
--- /dev/null
+++ b/app/src/main/java/aqua30/blewrapper/util/ByteUtils.java
@@ -0,0 +1,13 @@
+package aqua30.blewrapper.util;
+
+public class ByteUtils {
+
+    public static byte[] reverse(byte[] value) {
+        int length = value.length;
+        byte[] reversed = new byte[length];
+        for (int i = 0; i < length; i++) {
+            reversed[i] = value[length - (i + 1)];
+        }
+        return reversed;
+    }
+}
diff --git a/app/src/main/java/aqua30/blewrapper/util/Constants.java b/app/src/main/java/aqua30/blewrapper/util/Constants.java
new file mode 100644
index 0000000..2bb588a
--- /dev/null
+++ b/app/src/main/java/aqua30/blewrapper/util/Constants.java
@@ -0,0 +1,21 @@
+package aqua30.blewrapper.util;
+
+import java.util.UUID;
+
+public class Constants {
+
+    public static String SERVICE_STRING = "7D2EA28A-F7BD-485A-BD9D-92AD6ECFE93E";
+    public static UUID SERVICE_UUID = UUID.fromString(SERVICE_STRING);
+
+    public static String CHARACTERISTIC_ECHO_STRING = "7D2EBAAD-F7BD-485A-BD9D-92AD6ECFE93E";
+    public static UUID CHARACTERISTIC_ECHO_UUID = UUID.fromString(CHARACTERISTIC_ECHO_STRING);
+
+    public static String CHARACTERISTIC_TIME_STRING = "7D2EDEAD-F7BD-485A-BD9D-92AD6ECFE93E";
+    public static UUID CHARACTERISTIC_TIME_UUID = UUID.fromString(CHARACTERISTIC_TIME_STRING);
+    public static String CLIENT_CONFIGURATION_DESCRIPTOR_STRING = "00002902-0000-1000-8000-00805f9b34fb";
+    public static UUID CLIENT_CONFIGURATION_DESCRIPTOR_UUID = UUID.fromString(CLIENT_CONFIGURATION_DESCRIPTOR_STRING);
+
+    public static final String CLIENT_CONFIGURATION_DESCRIPTOR_SHORT_ID = "2902";
+
+    public static final long SCAN_PERIOD = 5000;
+}
diff --git a/app/src/main/java/aqua30/blewrapper/util/StringUtils.java b/app/src/main/java/aqua30/blewrapper/util/StringUtils.java
new file mode 100644
index 0000000..7b93475
--- /dev/null
+++ b/app/src/main/java/aqua30/blewrapper/util/StringUtils.java
@@ -0,0 +1,63 @@
+package aqua30.blewrapper.util;
+
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * This class is meant to be a replacement for TextUtils to allow unit testing
+ * of files that may want to use common TextUtils methods.
+ */
+public class StringUtils {
+
+    private static final String TAG = "StringUtils";
+
+    private static String byteToHex(byte b) {
+        char char1 = Character.forDigit((b & 0xF0) >> 4, 16);
+        char char2 = Character.forDigit((b & 0x0F), 16);
+
+        return String.format("0x%1$s%2$s", char1, char2);
+    }
+
+    public static String byteArrayInHexFormat(byte[] byteArray) {
+        if (byteArray == null) {
+            return null;
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("{ ");
+        for (int i = 0; i < byteArray.length; i++) {
+            if (i > 0) {
+                stringBuilder.append(", ");
+            }
+            String hexString = byteToHex(byteArray[i]);
+            stringBuilder.append(hexString);
+        }
+        stringBuilder.append(" }");
+
+        return stringBuilder.toString();
+    }
+
+    public static byte[] bytesFromString(String string) {
+        byte[] stringBytes = new byte[0];
+        try {
+            stringBytes = string.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Failed to convert message string to byte array");
+        }
+
+        return stringBytes;
+    }
+
+    @Nullable
+    public static String stringFromBytes(byte[] bytes) {
+        String byteString = null;
+        try {
+            byteString = new String(bytes, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Unable to convert message bytes to string");
+        }
+        return byteString;
+    }
+}
diff --git a/app/src/main/res/layout/ac_test.xml b/app/src/main/res/layout/ac_test.xml
index a48f808..6ee00ef 100644
--- a/app/src/main/res/layout/ac_test.xml
+++ b/app/src/main/res/layout/ac_test.xml
@@ -32,18 +32,19 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:onClick="Connect"
-            android:text="BLE Mode"
+            android:text="Click 2 CONNECT"
             android:textSize="16sp" />
 
         <Button
-            android:id="@+id/manualMode"
+            android:id="@+id/bleSend"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:onClick="Disconnect"
-            android:text="Manual Mode"
+            android:onClick="SendData"
+            android:text="SEND SHIT"
             android:textSize="16sp" />
 
+
         <Button
             android:id="@+id/clear"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e01bd08..3ca730f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">FTDI</string>
+    <string name="app_name">BLEDEMO</string>
     <string name="setting">Settings</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
@@ -8,9 +8,9 @@
     <string name="unknown_characteristic">Unknown characteristic</string>
     <string name="unknown_service">Unknown service</string>
 
-    <string name="title_activity_main">FTDI D2xx Demo</string>
-    <string name="title_activity_ftdi_mode_fragment">Ftdi Mode Info</string>
-    <string name="title_activity_ftdi_mode_control">Ftdi Mode Control</string>
+    <string name="title_activity_main">BLE Demo</string>
+    <string name="title_activity_ftdi_mode_fragment">BLE Mode Info</string>
+    <string name="title_activity_ftdi_mode_control">BLE Mode Control</string>
     <string name="button_info">Information</string>
     <string name="button_configure">Device Configure</string>
     <string name="button_eeprom">Device EEPROM API</string>
diff --git a/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothManager.java b/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothManager.java
index 002c0f9..b07e0ac 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothManager.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothManager.java
@@ -37,4 +37,6 @@ public interface BluetoothManager<T> {
     void setGoogleApiClient(GoogleApiClient googleApiClient);
     void retryConnection();
     Device getSavedDevice();
+
+    void sendData();
 }
diff --git a/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java b/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java
index 32b7a17..cce466c 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java
@@ -26,6 +26,8 @@ interface DiscoveryCallbacks{
 
     interface CommunicationCallbacks{
         void onDataReceived(String data);
+
+        void sendData(String data);
     }
 
     interface ConnectedDeviceStateCallbacks {
diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
index a982486..0902f01 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
@@ -77,9 +77,9 @@ protected void onInactive() {
     public boolean connectTo(String deviceAddress) {
         mDeviceAddress = deviceAddress;
         if (mBLEService != null) {
-            log("connecting to device "+ deviceAddress);
+            log("connecting to device " + deviceAddress);
             final boolean result = mBLEService.connect(mDeviceAddress);
-            log("connected to device "+ result);
+            log("connected to device " + result);
             return result;
         }
         return false;
@@ -108,9 +108,10 @@ public void onServiceDisconnected(ComponentName componentName) {
         }
     }
 
-    ;
-
     private final BroadcastReceiver mGattUpdateReceiver = new BroadcastReceiver() {
+
+
+
         @Override
         public void onReceive(Context context, Intent intent) {
 
@@ -123,6 +124,7 @@ public void onReceive(Context context, Intent intent) {
             } else if (ACTION_GATT_SERVICES_DISCOVERED.equals(action)) {
                 // Show all the supported services and characteristics on the user interface.
 
+                // this outputs servicemap with services
                 displayGattServices(mBLEService.getSupportedGattServices());
 
                 if (mGattCharacteristics != null) {
@@ -133,19 +135,19 @@ public void onReceive(Context context, Intent intent) {
                     for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
                         UUID key = entry.getKey();
                         ArrayList<BluetoothGattCharacteristic> value = entry.getValue();
-                        /* this part was specific to our requirement. One can modify or delete this part
-                         *  as per their requirement.
-                         * */
 
+                        for (BluetoothGattCharacteristic bleChar : value) {
+                            Log.d("Charactertics", "UIDS : " + bleChar.getUuid());
 
-                        if (key.toString().contains("1809") && value.size() > 0) {
-                            characteristic = value.get(1);
-                            Log.e("characteristics", characteristic.getValue() + "");
-                            break;
+                            if (key.toString().contains("0000ec00") && value.size() > 0) {
+                                characteristic = bleChar;
+                                Log.e("characteristics FOUND", characteristic.getValue() + "");
+                                break;
+                            }
                         }
                     }
 
-                    if (characteristic == null ){
+                    if (characteristic == null) {
                         return;
                     }
 
@@ -160,14 +162,28 @@ public void onReceive(Context context, Intent intent) {
                         mBLEService.readCharacteristic(characteristic);
                     }
 
+                    if ((charaProp | BluetoothGattCharacteristic.PROPERTY_WRITE) > 0) {
+                        System.out.println("FOUND PROEPERTY WRITE BUT DON EVEN NO HA UZ IT");
+                        mBLEService.writeDataToCharacteristic(characteristic,"hallo".getBytes());
+
+                        System.out.println("END WRITTINGING");
+                    }
+
+                    System.out.println("-----------------------     ANYTHONG HERE : " + BluetoothGattCharacteristic.PROPERTY_NOTIFY);
+                    System.out.println("-----------------------     AND HERE : " + charaProp);
                     if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) {
-                        mNotifyCharacteristic = characteristic;
-                        mBLEService.setCharacteristicNotification(characteristic, true);
+                        if (mNotifyCharacteristic != null) {
+                            mNotifyCharacteristic = characteristic;
+                            mBLEService.setCharacteristicNotification(characteristic, true);
+                        }
                     }
+
                 } else {
                     Log.e("characteristics", "mGattCharacteristics == null");
                 }
                 setValue(ACTION_GATT_SERVICES_DISCOVERED);
+
+
             } else if (ACTION_DATA_AVAILABLE.equals(action)) {
                 setValue(intent);
             }
diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java
index ce11053..4426bbf 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java
@@ -316,6 +316,15 @@ public Device getSavedDevice() {
         return lastConnectedDevice;
     }
 
+    @Override
+    public void sendData() {
+    }
+
+    @Override
+    public void sendData(String data) {
+
+    }
+
     private BluetoothAdapter.LeScanCallback mLeScanCallback = new BluetoothAdapter.LeScanCallback() {
 
                 @Override
diff --git a/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java b/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java
index 0a35583..e62634a 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java
@@ -46,6 +46,20 @@ public class BLEService extends Service {
 
     // Implements callback methods for GATT events that the app cares about.  For example,
     // connection change and services discovered.
+
+    private static BLEService single_instance = null;
+
+    private BLEService(){
+
+    }
+
+    public static BLEService getInstance (){
+        if (single_instance == null)
+            single_instance = new BLEService();
+
+        return single_instance;
+    }
+
     private final BluetoothGattCallback mGattCallback = new BluetoothGattCallback() {
         @Override
         public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
@@ -73,6 +87,17 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
             }
         }
 
+
+        @Override
+        public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+            super.onCharacteristicWrite(gatt, characteristic, status);
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                Log.d("Characteristic ", "Characteristic written successfully");
+            } else {
+                Log.d("Characteristic ", "Characteristic write FAILLL");
+            }
+        }
+
         @Override
         public void onCharacteristicRead(BluetoothGatt gatt,
                                          BluetoothGattCharacteristic characteristic,
@@ -91,11 +116,18 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
 
         @Override
         public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                Log.d("Descriptor ", "Characteristic written successfully" + descriptor.getUuid().toString());
+            } else {
+                Log.d("Descriptor ", "Characteristic write FAILLL" + descriptor.getUuid().toString());
+            }
+
             for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
                 UUID key = entry.getKey();
                 ArrayList<BluetoothGattCharacteristic> value = entry.getValue();
-                if(key.toString().contains("1809")) {
-                    final BluetoothGattCharacteristic characteristic  = value.get(0);
+                if (key.toString().contains("1809")) {
+                    final BluetoothGattCharacteristic characteristic = value.get(0);
                     setCharacteristicIndication(characteristic, true);
                 }
             }
@@ -150,7 +182,7 @@ public boolean onUnbind(Intent intent) {
      *
      * @return Return true if the initialization is successful.
      */
-    public boolean  initialize() {
+    public boolean initialize() {
         // For API level 18 and above, get a reference to BluetoothAdapter through
         // BluetoothManager.
         if (mBluetoothManager == null) {
@@ -174,11 +206,10 @@ public boolean  initialize() {
      * Connects to the GATT server hosted on the Bluetooth LE device.
      *
      * @param address The device address of the destination device.
-     *
      * @return Return true if the connection is initiated successfully. The connection result
-     *         is reported asynchronously through the
-     *         {@code BluetoothGattCallback#onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int)}
-     *         callback.
+     * is reported asynchronously through the
+     * {@code BluetoothGattCallback#onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int)}
+     * callback.
      */
     public boolean connect(final String address) {
         if (mBluetoothAdapter == null || address == null) {
@@ -208,6 +239,8 @@ public boolean connect(final String address) {
         mBluetoothGatt = device.connectGatt(this, false, mGattCallback);
         log("Trying to create a new connection.");
         mBluetoothDeviceAddress = address;
+
+
         return true;
     }
 
@@ -237,7 +270,7 @@ public void close() {
             mBluetoothGatt.close();
             mBluetoothGatt = null;
         } catch (Exception e) {
-            log("dead object: "+ e.getMessage());
+            log("dead object: " + e.getMessage());
         }
     }
 
@@ -256,11 +289,32 @@ public void readCharacteristic(BluetoothGattCharacteristic characteristic) {
         mBluetoothGatt.readCharacteristic(characteristic);
     }
 
+    /* set new value for particular characteristic */
+    public void writeDataToCharacteristic(final BluetoothGattCharacteristic ch, final byte[] dataToWrite) {
+        if (mBluetoothAdapter == null || mBluetoothGatt == null || ch == null) return;
+
+        // first set it locally....
+        ch.setValue(dataToWrite);
+        // ... and then "commit" changes to the peripheral
+
+        new java.util.Timer().schedule(
+                new java.util.TimerTask() {
+                    @Override
+                    public void run() {
+                        System.out.println("WRITIIIIIIIIIIIIIIIIIIIIIIING");
+                        System.out.println(mBluetoothGatt.writeCharacteristic(ch));
+
+                    }
+                },
+                5000
+        );
+    }
+
     /**
      * Enables or disables notification on a give characteristic.
      *
      * @param characteristic Characteristic to act on.
-     * @param enabled If true, enable notification.  False otherwise.
+     * @param enabled        If true, enable notification.  False otherwise.
      */
     public void setCharacteristicNotification(BluetoothGattCharacteristic characteristic, boolean enabled) {
         if (mBluetoothAdapter == null || mBluetoothGatt == null) {

From 54040045127ee53417ef71cb43e07a0d3c120bde Mon Sep 17 00:00:00 2001
From: wildchild <cobwild_child@hotmail.com>
Date: Sat, 17 Aug 2019 16:10:20 +0100
Subject: [PATCH 5/5] BEFORE DESIGN BEGIN WITH TAB LAYOUT

---
 .../java/aqua30/blewrapper/BLEActivity.java   | 16 ++-------
 .../contracts/BluetoothViewContract.java      |  1 -
 .../aqua/blewrapper/helper/BLESession.java    |  7 ++--
 .../helper/BluetoothController.java           | 34 ++++++++-----------
 .../aqua/blewrapper/service/BLEService.java   | 26 ++++++++++----
 5 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/aqua30/blewrapper/BLEActivity.java b/app/src/main/java/aqua30/blewrapper/BLEActivity.java
index 26859a3..09ae6d3 100644
--- a/app/src/main/java/aqua30/blewrapper/BLEActivity.java
+++ b/app/src/main/java/aqua30/blewrapper/BLEActivity.java
@@ -26,7 +26,6 @@
 import aqua.blewrapper.contracts.BluetoothViewContract;
 import aqua.blewrapper.helper.BluetoothController;
 import aqua.blewrapper.model.PreferenceClass;
-import aqua.blewrapper.service.BLEService;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.AppSettingsDialog;
 import pub.devrel.easypermissions.EasyPermissions;
@@ -59,7 +58,6 @@ public class BLEActivity extends AppCompatActivity implements
     private StringBuilder dataBuilder;
     //    private String connectedDeviceName, connectedDeviceAddress;
     private String selectedMode = BLE;
-    private BLEService mBLEServiceInstance;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState)
@@ -73,12 +71,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState)
   //      button_manualMode = findViewById(R.id.manualMode);
 
 
-        /*  getting any presaved or pre connected device name and address
-         *   This details are automatically saved by the wrapper */
-    //    selectedMode = PreferenceClass.getInstance(this).getString(mode, Manual);
-        /* only for demo */
-      //  setMode();
-
 
         /* required for ble wrapper */
         buildGoogleApiClient();
@@ -96,6 +88,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState)
         bluetoothManager.checkBluetoothRequirements();
 
 
+        bluetoothManager.sendData();
 
 
     }
@@ -148,6 +141,7 @@ public void Disconnect(View view) {
             setDataOnScreen("Manual mode activated. Disconnected " +
                     bluetoothManager.getSavedDevice().getDeviceAddress());
         }
+
         bluetoothManager.disconnect();
     }
 
@@ -302,10 +296,6 @@ public void onDataReceived(String data) {
         setDataOnScreen("Data received: " + temp);
     }
 
-    @Override
-    public void sendData(String data) {
-        bluetoothManager.sendData(data);
-    }
 
     @Override
     public void connectedDeviceState(int connectedDeviceState) {
@@ -412,7 +402,5 @@ public static ArrayList<Integer> hexStringToByteArray(String s, int len) {
         return d;
     }
 
-    public void SendData(View view) {
 
-    }
 }
\ No newline at end of file
diff --git a/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java b/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java
index cce466c..fb7a5a1 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/contracts/BluetoothViewContract.java
@@ -27,7 +27,6 @@ interface DiscoveryCallbacks{
     interface CommunicationCallbacks{
         void onDataReceived(String data);
 
-        void sendData(String data);
     }
 
     interface ConnectedDeviceStateCallbacks {
diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
index 0902f01..dc92b80 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BLESession.java
@@ -111,7 +111,6 @@ public void onServiceDisconnected(ComponentName componentName) {
     private final BroadcastReceiver mGattUpdateReceiver = new BroadcastReceiver() {
 
 
-
         @Override
         public void onReceive(Context context, Intent intent) {
 
@@ -132,6 +131,7 @@ public void onReceive(Context context, Intent intent) {
                     BluetoothGattCharacteristic characteristic = null;
 
                     Log.d("Characterics", "SIZE : " + String.valueOf(servicemap.entrySet().size()));
+
                     for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
                         UUID key = entry.getKey();
                         ArrayList<BluetoothGattCharacteristic> value = entry.getValue();
@@ -164,13 +164,10 @@ public void onReceive(Context context, Intent intent) {
 
                     if ((charaProp | BluetoothGattCharacteristic.PROPERTY_WRITE) > 0) {
                         System.out.println("FOUND PROEPERTY WRITE BUT DON EVEN NO HA UZ IT");
-                        mBLEService.writeDataToCharacteristic(characteristic,"hallo".getBytes());
-
+                        mBLEService.writeDataToCharacteristic(characteristic, "hallo from android".getBytes());
                         System.out.println("END WRITTINGING");
                     }
 
-                    System.out.println("-----------------------     ANYTHONG HERE : " + BluetoothGattCharacteristic.PROPERTY_NOTIFY);
-                    System.out.println("-----------------------     AND HERE : " + charaProp);
                     if ((charaProp | BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) {
                         if (mNotifyCharacteristic != null) {
                             mNotifyCharacteristic = characteristic;
diff --git a/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java b/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java
index 4426bbf..8c3f165 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/helper/BluetoothController.java
@@ -47,7 +47,7 @@
 
 /**
  * Created by Saurabh on 27-12-2017.
- *
+ * <p>
  * Implementation class for BluetoothManager.
  * This class holds complete control of all operations.
  * It manages the life cycle for BLE operations.
@@ -175,7 +175,7 @@ public void checkBluetoothRequirements() {
             Log.e(LOGTAG, "Enabling BLE");
             Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
             mActivity.get().startActivityForResult(enableBtIntent, Request_Enable_Bluetooth);
-        }else {
+        } else {
             checkLocationRequirements();
         }
     }
@@ -318,27 +318,23 @@ public Device getSavedDevice() {
 
     @Override
     public void sendData() {
-    }
-
-    @Override
-    public void sendData(String data) {
 
     }
 
     private BluetoothAdapter.LeScanCallback mLeScanCallback = new BluetoothAdapter.LeScanCallback() {
 
-                @Override
-                public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
-                    log("Device discoverd");
-                    if (!scannedDevices.contains(device)) {
-                        log("device: " + device.getName() + ", " + device.getAddress());
-                        if (discoveryCallbacks != null) {
-                            discoveryCallbacks.onDeviceDiscovered(device);
-                        }
-                        scannedDevices.add(device);
-                    }
+        @Override
+        public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
+            log("Device discoverd");
+            if (!scannedDevices.contains(device)) {
+                log("device: " + device.getName() + ", " + device.getAddress());
+                if (discoveryCallbacks != null) {
+                    discoveryCallbacks.onDeviceDiscovered(device);
                 }
-            };
+                scannedDevices.add(device);
+            }
+        }
+    };
 
     @Override
     public void onPermissionResult(@ConnectionStateCallbacks.GPSConnectionState int permissionResult) {
@@ -362,7 +358,7 @@ public static void log(String message) {
 
     @Override
     public void onDataReceived(String data) {
-        log("Data received: "+ data);
+        log("Data received: " + data);
         if (communicationCallbacks != null)
             communicationCallbacks.onDataReceived(data);
     }
@@ -393,7 +389,7 @@ public void onGattConnectionState(@ConnectionStateCallbacks.GattConnectionState
         @Override
         public void onChanged(@Nullable Object state) {
             if (state instanceof Integer) {
-                switch ((int)state) {
+                switch ((int) state) {
                     case BluetoothTurnedOn:
                         log("BLE turned on");
                         if (connectionStateCallbacks != null)
diff --git a/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java b/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java
index e62634a..5d51595 100644
--- a/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java
+++ b/blewrapper/src/main/java/aqua/blewrapper/service/BLEService.java
@@ -49,11 +49,11 @@ public class BLEService extends Service {
 
     private static BLEService single_instance = null;
 
-    private BLEService(){
+    private BLEService() {
 
     }
 
-    public static BLEService getInstance (){
+    public static BLEService getInstance() {
         if (single_instance == null)
             single_instance = new BLEService();
 
@@ -118,9 +118,9 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
         public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
 
             if (status == BluetoothGatt.GATT_SUCCESS) {
-                Log.d("Descriptor ", "Characteristic written successfully" + descriptor.getUuid().toString());
+                Log.d("Descriptor ", "DESCRIPTOR written successfully" + descriptor.getUuid().toString());
             } else {
-                Log.d("Descriptor ", "Characteristic write FAILLL" + descriptor.getUuid().toString());
+                Log.d("Descriptor ", "DESCRIPTOR write FAILLL" + descriptor.getUuid().toString());
             }
 
             for (Map.Entry<UUID, ArrayList<BluetoothGattCharacteristic>> entry : servicemap.entrySet()) {
@@ -132,6 +132,20 @@ public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descri
                 }
             }
         }
+
+        @Override
+        public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
+            super.onReadRemoteRssi(gatt, rssi, status);
+            Log.d(TAG, "onReadRemoteRssi " + status);
+
+        }
+
+        @Override
+        public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+            super.onMtuChanged(gatt, mtu, status);
+            Log.d(TAG, "onMtuChanged " + status);
+        }
+
     };
 
     private void broadcastUpdate(final String action) {
@@ -221,10 +235,10 @@ public boolean connect(final String address) {
         if (mBluetoothDeviceAddress != null && address.equals(mBluetoothDeviceAddress) && mBluetoothGatt != null) {
             Log.d(TAG, "Trying to use an existing mBluetoothGatt for connection.");
             if (mBluetoothGatt.connect()) {
-                log("connection to Gatt - true");
+                log("connected to Gatt - true");
                 return true;
             } else {
-                log("connection to Gatt - false");
+                log("connected to Gatt - false");
                 return false;
             }
         }