Bug Fix And Change Amq Port

Author: Mehrdad Safari

ArTalkNotificationCore/src/main/java/com/araditc/anc/Arad.kt

@@ -2,6 +2,7 @@ package com.araditc.anc
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.Handler
 import com.araditc.anc.data.local.IMessage
 import com.google.android.gms.tasks.Tasks
 import com.google.firebase.FirebaseApp
@@ -92,7 +93,7 @@ object Arad {
         val editor = sharedPreferences.edit()
         editor.putString("clientUserName", clientUserName)
         editor.putString("clientPassword", clientPassword)
-        editor.putString("connectionURL", "tcp://$connectionURL:1883")
+        editor.putString("connectionURL", "tcp://$connectionURL")
         editor.apply()
     }
 
@@ -125,6 +126,7 @@ object Arad {
 
             override fun messageArrived(topic: String, message: MqttMessage) {
                 setMessage(message.payload.toString(Charsets.UTF_8))
+                disconnectBroker()
             }
 
             override fun deliveryComplete(token: IMqttDeliveryToken) {
@@ -156,7 +158,7 @@ object Arad {
     }
 
     private fun subscribeToTopicBroker(topic: String) {
-        broker.subscribe(topic, 0, null, object : IMqttActionListener {
+        broker.subscribe(topic, 1, null, object : IMqttActionListener {
             override fun onSuccess(asyncActionToken: IMqttToken?) {
             }
 

ArTalkNotificationCore/src/main/java/com/araditc/anc/service/fcm/FcmMessaging.kt

@@ -1,12 +1,14 @@
 package com.araditc.anc.service.fcm
 
+import android.util.Log
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.araditc.anc.Arad
 
 class FcmMessaging : FirebaseMessagingService() {
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        Log.i("APN" , "Fcm WakeUp")
         Arad.setWakeUp(true)
     }
 

README.md

@@ -58,7 +58,7 @@ implementation 'com.github.araditc:Arad.Push.Android.SDK:TAG'
 >```
 
 >```kotlin
-> var devicename = DeviceUtils.getDeviceName()
+> var deviceName = DeviceUtils.getDeviceName()
 > var packageName = DeviceUtils.getPackageName(this)
 > var deviceVersion = DeviceUtils.getVersion(this)
 > //================================ FCM Implementation ======================================

app/src/main/java/com/araditc/ane/ui/MainActivity.kt

@@ -14,7 +14,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         //================================= Device Util ============================================
-        var devicename = DeviceUtils.getDeviceName()
+        var deviceName = DeviceUtils.getDeviceName()
         var packageName = DeviceUtils.getPackageName(this)
         var deviceVersion = DeviceUtils.getVersion(this)
         //================================ FCM Implementation ======================================
@@ -37,7 +37,7 @@ class MainActivity : ComponentActivity() {
         Arad.getMessage(this@MainActivity);
         Arad.setIMessage(object : IMessage {
             override fun MessageReceive(payload: String) {
-                Log.i("APN", "Message Receive If Message Exist For This User In Server")
+                Log.i("APN", "Message Receive If Message Exist For This User In Server $payload")
             }
         })
         Arad.setIWakeUp(object : IWakeUp {