reverting from Java 8

neatorobito · May 19, 2017 · 5f045e3 · 5f045e3
1 parent 40e8cc5
commit 5f045e3
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,10 +18,6 @@ android {
     }
     productFlavors {
     }
-    compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
-    }
 }
 
 buildscript {

diff --git a/src/main/java/com/peak/salut/BackgroundClientRegistrationJob.java b/src/main/java/com/peak/salut/BackgroundClientRegistrationJob.java
@@ -66,9 +66,12 @@ public void doOnBackground() {
                 Log.d(Salut.TAG, "Registered Host | " + salutInstance.registeredHost.deviceName);
 
                 salutInstance.thisDevice.isRegistered = true;
-                new Handler(Looper.getMainLooper()).post(() -> {
-                    if (onRegistered != null)
-                        onRegistered.call();
+                new Handler(Looper.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (onRegistered != null)
+                            onRegistered.call();
+                    }
                 });
 
                 salutInstance.startListeningForData();
@@ -82,7 +85,12 @@ public void doOnBackground() {
                 salutInstance.disconnectFromDevice();
 
                 if (onUnregisterSuccess != null) { //Success Callback.
-                    new Handler(Looper.getMainLooper()).post(() -> onUnregisterSuccess.call());
+                    new Handler(Looper.getMainLooper()).post(new Runnable() {
+                        @Override
+                        public void run() {
+                            onUnregisterSuccess.call();
+                        }
+                    });
                 }
 
                 Log.d(Salut.TAG, "This device has successfully been unregistered from the server.");
@@ -96,11 +104,14 @@ public void doOnBackground() {
             ex.printStackTrace();
 
             Log.e(Salut.TAG, "An error occurred while attempting to register or unregister.");
-            new Handler(Looper.getMainLooper()).post(() -> {
-                if (onRegistrationFail != null && !salutInstance.thisDevice.isRegistered) //Prevents both callbacks from being called.
-                    onRegistrationFail.call();
-                if (onUnregisterFailure != null)
-                    onUnregisterFailure.call();
+            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                @Override
+                public void run() {
+                    if (onRegistrationFail != null && !salutInstance.thisDevice.isRegistered) //Prevents both callbacks from being called.
+                        onRegistrationFail.call();
+                    if (onUnregisterFailure != null)
+                        onUnregisterFailure.call();
+                }
             });
 
             if (salutInstance.thisDevice.isRegistered && salutInstance.isConnectedToAnotherDevice) {

diff --git a/src/main/java/com/peak/salut/BackgroundDataJob.java b/src/main/java/com/peak/salut/BackgroundDataJob.java
@@ -47,7 +47,12 @@ public void doOnBackground() {
 
             if (!data.isEmpty()) {
                 new Handler(Looper.getMainLooper()).post(
-                        () -> salutInstance.dataReceiver.dataCallback.onDataReceived(data));
+                        new Runnable() {
+                            @Override
+                            public void run() {
+                                salutInstance.dataReceiver.dataCallback.onDataReceived(data);
+                            }
+                        });
             }
         } catch (Exception ex) {
             Log.e(Salut.TAG, "An error occurred while trying to receive data.");

diff --git a/src/main/java/com/peak/salut/BackgroundServerRegistrationJob.java b/src/main/java/com/peak/salut/BackgroundServerRegistrationJob.java
@@ -53,7 +53,12 @@ public void doOnBackground() {
 
                 if (salutInstance.onDeviceRegisteredWithHost != null) {
                     new Handler(Looper.getMainLooper()).post(
-                            () -> salutInstance.onDeviceRegisteredWithHost.call(finalDevice));
+                            new Runnable() {
+                                @Override
+                                public void run() {
+                                    salutInstance.onDeviceRegisteredWithHost.call(finalDevice);
+                                }
+                            });
                 }
 
             } else {
@@ -63,16 +68,22 @@ public void doOnBackground() {
                 toClient.writeUTF(Salut.UNREGISTER_CODE);
                 toClient.flush();
 
-                salutInstance.registeredClients.stream().filter(
-                        registered -> registered.serviceAddress.equals(clientSocket.getInetAddress()
-                                .toString().replace("/", ""))).forEach(registered -> {
-                    salutInstance.registeredClients.remove(registered);
-                    if (salutInstance.onDeviceUnregistered != null) {
-                        new Handler(Looper.getMainLooper()).post(
-                                () -> salutInstance.onDeviceUnregistered.call(registered));
+                for (final SalutDevice registered : salutInstance.registeredClients) {
+                    if (registered.serviceAddress.equals(clientSocket.getInetAddress()
+                            .toString().replace("/", ""))) {
+                        salutInstance.registeredClients.remove(registered);
+                        if (salutInstance.onDeviceUnregistered != null) {
+                            new Handler(Looper.getMainLooper()).post(
+                                    new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            salutInstance.onDeviceUnregistered.call(registered);
+                                        }
+                                    });
+                        }
+                        Log.d(Salut.TAG, "\nSuccesfully unregistered device.\n");
                     }
-                    Log.d(Salut.TAG, "\nSuccesfully unregistered device.\n");
-                });
+                }
             }
 
             fromClient.close();