- Updated PLogMQTTProvider.kt

umair13adil · Jul 1, 2020 · adb440a · adb440a
1 parent 3676c92
commit adb440a
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.blackbox.library.plog"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 20
-        versionName "1.0.3"
+        versionCode 21
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/plog/build.gradle b/plog/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 31
-        versionName "1.0.3"
+        versionCode 32
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }

diff --git a/plog/src/main/java/com/blackbox/plog/mqtt/PLogMQTTProvider.kt b/plog/src/main/java/com/blackbox/plog/mqtt/PLogMQTTProvider.kt
@@ -2,9 +2,12 @@ package com.blackbox.plog.mqtt
 
 import android.content.Context
 import android.support.annotation.RawRes
+import android.util.Log
 import com.blackbox.plog.mqtt.client.PahoMqqtClient
+import com.blackbox.plog.pLogs.impl.PLogImpl
 import org.eclipse.paho.android.service.MqttAndroidClient
 import org.eclipse.paho.client.mqttv3.MqttClient
+import java.io.InputStream
 
 object PLogMQTTProvider {
 
@@ -37,7 +40,8 @@ object PLogMQTTProvider {
                        connectionTimeout: Int = this.connectionTimeout,
                        isCleanSession: Boolean = this.isCleanSession,
                        isAutomaticReconnect: Boolean = this.isAutomaticReconnect,
-                       @RawRes certificateRes: Int) {
+                       @RawRes certificateRes: Int? = null,
+                       certificateStream: InputStream? = null) {
 
         this.mqttEnabled = true
         this.writeLogsToLocalStorage = writeLogsToLocalStorage
@@ -54,6 +58,14 @@ object PLogMQTTProvider {
 
         val baseUrl = "ssl://${brokerUrl}:${port}"
 
-        androidClient = PahoMqqtClient.instance?.getMqttClient(context, baseUrl, MqttClient.generateClientId(), certificateRes)
+        if (certificateRes != null) {
+            androidClient = PahoMqqtClient.instance?.getMqttClient(context, baseUrl, MqttClient.generateClientId(), certificateRes)
+        } else if (certificateStream != null) {
+            androidClient = PahoMqqtClient.instance?.getMqttClient(context, baseUrl, MqttClient.generateClientId(), certificateStream)
+        } else {
+            if (PLogImpl.getConfig()?.isDebuggable!!) {
+                Log.e(TAG, "No certificate provided!")
+            }
+        }
     }
 }
diff --git a/plog/src/main/java/com/blackbox/plog/mqtt/client/PahoMqqtClient.kt b/plog/src/main/java/com/blackbox/plog/mqtt/client/PahoMqqtClient.kt
@@ -9,6 +9,7 @@ import com.blackbox.plog.utils.Utils
 import org.eclipse.paho.android.service.MqttAndroidClient
 import org.eclipse.paho.client.mqttv3.*
 import java.io.IOException
+import java.io.InputStream
 import java.io.UnsupportedEncodingException
 import java.security.KeyManagementException
 import java.security.KeyStoreException
@@ -22,8 +23,7 @@ class PahoMqqtClient {
     private var connectOptions: MqttConnectOptions? = null
     private var isConnected = false
 
-    fun getMqttClient(context: Context, brokerUrl: String?, clientId: String?, @RawRes certFile: Int): MqttAndroidClient {
-
+    private fun setUpClient(context: Context, brokerUrl: String?, clientId: String?) {
         connectOptions = MqttConnectOptions()
         connectOptions?.connectionTimeout = PLogMQTTProvider.connectionTimeout
         connectOptions?.keepAliveInterval = PLogMQTTProvider.keepAliveIntervalSeconds
@@ -51,6 +51,11 @@ class PahoMqqtClient {
                 }
             }
         })
+    }
+
+    fun getMqttClient(context: Context, brokerUrl: String?, clientId: String?, @RawRes certFile: Int): MqttAndroidClient {
+
+        setUpClient(context, brokerUrl, clientId)
 
         val socketFactoryOptions = SocketFactory.SocketFactoryOptions()
         socketFactoryOptions.withCaInputStream(context.resources.openRawResource(certFile))
@@ -70,6 +75,41 @@ class PahoMqqtClient {
         } catch (e: UnrecoverableKeyException) {
             e.printStackTrace()
         }
+
+        connect()
+
+        return mqttAndroidClient!!
+    }
+
+    fun getMqttClient(context: Context, brokerUrl: String?, clientId: String?, certInputStream: InputStream): MqttAndroidClient {
+
+        setUpClient(context, brokerUrl, clientId)
+
+        val socketFactoryOptions = SocketFactory.SocketFactoryOptions()
+        socketFactoryOptions.withCaInputStream(certInputStream)
+
+        try {
+            connectOptions?.socketFactory = SocketFactory(socketFactoryOptions)
+        } catch (e: KeyStoreException) {
+            e.printStackTrace()
+        } catch (e: NoSuchAlgorithmException) {
+            e.printStackTrace()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } catch (e: KeyManagementException) {
+            e.printStackTrace()
+        } catch (e: CertificateException) {
+            e.printStackTrace()
+        } catch (e: UnrecoverableKeyException) {
+            e.printStackTrace()
+        }
+
+        connect()
+
+        return mqttAndroidClient!!
+    }
+
+    private fun connect(){
         try {
             val token = mqttAndroidClient!!.connect(connectOptions)
             token.actionCallback = object : IMqttActionListener {
@@ -98,7 +138,6 @@ class PahoMqqtClient {
                 Log.e(TAG, Utils.getStackTrace(e))
             }
         }
-        return mqttAndroidClient!!
     }
 
     @Throws(MqttException::class)