improve lib paho mqtt and update code sdk to support this library

qiscus · Jan 17, 2023 · 5ff0e63 · 5ff0e63
1 parent 17ba4bf
commit 5ff0e63
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 30 deletions.
diff --git a/chat-core/src/main/AndroidManifest.xml b/chat-core/src/main/AndroidManifest.xml
@@ -15,8 +15,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
-
     <application>
         <receiver
             android:name=".service.QiscusStartServiceReceiver"

diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusActivityCallback.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusActivityCallback.java
@@ -49,14 +49,6 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
 
     @Override
     public void onActivityStarted(Activity activity) {
-        AlarmManager alarmMgr = (AlarmManager) activity.getSystemService(Context.ALARM_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            if (!alarmMgr.canScheduleExactAlarms()) {
-                QiscusCore.setIsExactAlarmDisable(true);
-            } else {
-                QiscusCore.setIsExactAlarmDisable(false);
-            }
-        }
 
         foreground = true;
 
@@ -104,9 +96,7 @@ private void startActivityTransitionTimer() {
 
     private void check(){
         if (!foreground) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                QiscusPusherApi.getInstance().disconnect();
-            }
+            QiscusPusherApi.getInstance().disconnect();
         }
     }
 

diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusCore.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusCore.java
@@ -532,14 +532,6 @@ public static void setEnableDisableRealtime(Boolean enableDisableRealtime){
         enableRealtime = enableDisableRealtime;
     }
 
-    public static void setIsExactAlarmDisable(Boolean isExactAlarmDisable){
-        forceDisableRealtimeFromExactAlarm = isExactAlarmDisable;
-    }
-
-    public static boolean getIsExactAlarmDisable() {
-        return forceDisableRealtimeFromExactAlarm;
-    }
-
     /**
      * enableSync
      * Checker for enable or disable sync

diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/data/remote/QiscusPusherApi.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/data/remote/QiscusPusherApi.java
@@ -393,7 +393,7 @@ private void eventReport(String moduleName, String event, String message) {
 
     public void connect() {
         if (QiscusCore.hasSetupUser() && !connecting && QiscusAndroidUtil.isNetworkAvailable()
-                && QiscusCore.getEnableRealtime() && QiscusCore.getStatusRealtimeEnableDisable() && !QiscusCore.getIsExactAlarmDisable()) {
+                && QiscusCore.getEnableRealtime() && QiscusCore.getStatusRealtimeEnableDisable()) {
             connecting = true;
             qiscusAccount = QiscusCore.getQiscusAccount();
             MqttConnectOptions mqttConnectOptions = new MqttConnectOptions();
@@ -465,10 +465,6 @@ public void restartConnection() {
             return;
         }
 
-        if (QiscusCore.getIsExactAlarmDisable()){
-            QiscusLogger.print(TAG, "QiscusPusherApi... " + "Disconnect manually from client (exact alarm is false)");
-            return;
-        }
 
         if (connecting) {
             QiscusLogger.print(TAG, "Connecting... " + "connectingFromRestartConnection");

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -79,7 +79,7 @@ ext {
 
     qiscusMqttDeps = [
             client : "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0",
-            android: "com.qiscus.mqtt:android:1.1.6"
+            android: "com.qiscus.mqtt:android:1.1.7"
     ]
 
     okHttpDeps = [

diff --git a/docs/index.md b/docs/index.md
@@ -80,7 +80,7 @@ Secondly, you need to add SDK dependencies inside your app .gradle. Then, you ne
 ```
 dependencies {
     ...
-    implementation 'com.qiscus.sdk:chat-core:1.6.1'
+    implementation 'com.qiscus.sdk:chat-core:1.6.2'
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -41,7 +41,7 @@ chatVersionPatch=3
 # === qiscus chat-core library version ===
 chatCoreVersionMajor=1
 chatCoreVersionMinor=6
-chatCoreVersionPatch=1
+chatCoreVersionPatch=2
 
 # === qiscus default base url
 BASE_URL_SERVER="https://api.qiscus.com/"
@@ -57,7 +57,7 @@ android.enableR8=true
 
 libraryGroupId=com.qiscus.sdk
 libraryArtifactId=chat-core
-libraryVersion=1.6.1
+libraryVersion=1.6.2
 
 libraryGroupIdChat=com.qiscus.sdk
 libraryArtifactIdChat=chat