fix issue get db, crash, and issue security

Arief Nur Putranto · Arief Nur Putranto · commit 991a058e22d7 · 2025-02-04T15:52:40.000+07:00
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Second, you need to add SDK dependencies inside your app .gradle. Then, you need
 ```
 dependencies { 
        ... 
-       implementation 'com.qiscus.sdk:chat-core:1.9.0'
+       implementation 'com.qiscus.sdk:chat-core:1.9.1'
 }
 ```
 
diff --git a/chat-core/src/main/AndroidManifest.xml b/chat-core/src/main/AndroidManifest.xml
@@ -43,15 +43,15 @@
 
         <service
             android:name=".service.QiscusNetworkCheckerJobService"
-            android:exported="true"
+            android:exported="false"
             android:label="QiscusNetworkCheckerJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />
         <service android:name="org.eclipse.paho.android.service.MqttService" />
         <service android:name=".service.QiscusSyncService" />
 
         <service
             android:name=".service.QiscusSyncJobService"
-            android:exported="true"
+            android:exported="false"
             android:label="QiscusSyncJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />
     </application>
diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusAppComponent.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusAppComponent.java
@@ -83,7 +83,7 @@ public synchronized String getAppId() {
     }
 
     public synchronized String getAppServer() {
-        return appServer;
+        return this.appServer;
     }
 
     public synchronized void setAppServer(String appServer) {
@@ -107,11 +107,11 @@ public synchronized void setAutomaticHeartBeat(int automaticHeartBeat) {
     }
 
     public synchronized int getNetworkConnectionInterval() {
-        return networkConnectionInterval;
+        return this.networkConnectionInterval;
     }
 
     public synchronized void setNetworkConnectionInterval(int automaticHeartBeatnetworkConnectionInterval) {
-        this.networkConnectionInterval = networkConnectionInterval;
+        this.networkConnectionInterval = automaticHeartBeatnetworkConnectionInterval;
     }
 
     public synchronized Boolean getEnableEventReport() {
diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/data/local/QiscusDb.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/data/local/QiscusDb.java
@@ -38,8 +38,8 @@
 final class QiscusDb {
 
     static final String DATABASE_NAME = "qiscus.db";
-    static final int DATABASE_VERSION = 20;
-    static final int DATABASE_MINIMUM_VERSION = 20;
+    static final int DATABASE_VERSION = 21;
+    static final int DATABASE_MINIMUM_VERSION = 21;
     private static final String JSON_EMPTY_FORMAT = "{}";
     private static final String TAG = QiscusDb.class.getSimpleName();
 
@@ -283,14 +283,14 @@ static ContentValues toContentValues(QiscusComment qiscusComment) {
             values.put(COLUMN_ROOM_ID, qiscusComment.getRoomId());
             values.put(COLUMN_UNIQUE_ID, qiscusComment.getUniqueId());
             values.put(COLUMN_COMMENT_BEFORE_ID, qiscusComment.getCommentBeforeId());
-            values.put(COLUMN_MESSAGE, set(qiscusComment.getMessage()));
+            values.put(COLUMN_MESSAGE, qiscusComment.getMessage());
             values.put(COLUMN_SENDER, set(qiscusComment.getSender()));
             values.put(COLUMN_SENDER_EMAIL, set(qiscusComment.getSenderEmail()));
             values.put(COLUMN_SENDER_AVATAR, set(qiscusComment.getSenderAvatar()));
             values.put(COLUMN_TIME, qiscusComment.getTime().getTime());
-            values.put(COLUMN_STATE, set(qiscusComment.getState()));
-            values.put(COLUMN_DELETED, set(qiscusComment.isDeleted()));
-            values.put(COLUMN_HARD_DELETED, set(qiscusComment.isHardDeleted()));
+            values.put(COLUMN_STATE, qiscusComment.getState());
+            values.put(COLUMN_DELETED, qiscusComment.isDeleted() ? 1 : 0);
+            values.put(COLUMN_HARD_DELETED, qiscusComment.isHardDeleted() ? 1: 0);
             values.put(COLUMN_TYPE, set(qiscusComment.getRawType()));
             values.put(COLUMN_PAYLOAD, set(qiscusComment.getExtraPayload()));
             values.put(COLUMN_EXTRAS, set(
@@ -316,9 +316,9 @@ static QiscusComment parseCursor(Cursor cursor) {
             qiscusComment.setCommentBeforeId(
                     cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_COMMENT_BEFORE_ID))
             );
-            qiscusComment.setMessage(getString(
+            qiscusComment.setMessage(
                     cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_MESSAGE))
-            ));
+            );
             qiscusComment.setSender(getString(
                     cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_SENDER))
             ));
@@ -331,15 +331,13 @@ static QiscusComment parseCursor(Cursor cursor) {
             qiscusComment.setTime(new Date(
                     cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_TIME))
             ));
-            qiscusComment.setState(getInteger(
-                    cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_STATE))
-            ));
-            qiscusComment.setDeleted(getBoolean(
-                    cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_DELETED))
-            ));
-            qiscusComment.setHardDeleted(getBoolean(
-                    cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_HARD_DELETED))
+            qiscusComment.setState(
+                    cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATE)
             ));
+            qiscusComment.setDeleted(
+                    cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_DELETED)) == 1
+            );
+            qiscusComment.setHardDeleted(cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_HARD_DELETED)) == 1);
             qiscusComment.setRawType(getString(
                     cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_TYPE))
             ));
diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/service/QiscusNetworkCheckerJobService.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/service/QiscusNetworkCheckerJobService.java
@@ -118,7 +118,7 @@ public void onCreate() {
     @Override
     public void onDestroy() {
 
-        Executors.newSingleThreadExecutor().execute(() -> {
+        if (Thread.currentThread().getId() != 1){
             try {
                 unregisterReceiver(networkStateReceiver);
                 QiscusLogger.print(TAG, "onDestroy");
@@ -130,7 +130,21 @@ public void onDestroy() {
             } catch (Exception e) {
                 QiscusErrorLogger.print(e);
             }
-        });
+        }else{
+            Executors.newSingleThreadExecutor().execute(() -> {
+                try {
+                    unregisterReceiver(networkStateReceiver);
+                    QiscusLogger.print(TAG, "onDestroy");
+                    EventBus.getDefault().unregister(this);
+                }catch (IllegalArgumentException e) {
+                    // already unregistered
+                }catch (RuntimeException r) {
+                    QiscusErrorLogger.print(r);
+                } catch (Exception e) {
+                    QiscusErrorLogger.print(e);
+                }
+            });
+        }
 
         super.onDestroy();
     }
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.9.0'
+    implementation 'com.qiscus.sdk:chat-core:1.9.1'
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
@@ -43,7 +43,7 @@ chatVersionPatch=0
 # === qiscus chat-core library version ===
 chatCoreVersionMajor=1
 chatCoreVersionMinor=9
-chatCoreVersionPatch=0
+chatCoreVersionPatch=1
 
 # === qiscus default base url
 BASE_URL_SERVER="https://api.qiscus.com/"
@@ -59,7 +59,7 @@ android.useAndroidX=true
 
 libraryGroupId=com.qiscus.sdk
 libraryArtifactId=chat-core
-libraryVersion=1.9.0
+libraryVersion=1.9.1
 
 libraryGroupIdChat=com.qiscus.sdk
 libraryArtifactIdChat=chat

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ Second, you need to add SDK dependencies inside your app .gradle. Then, you need`
`54`	`54`	```
`55`	`55`	`dependencies {`
`56`	`56`	`...`
`57`		`- implementation 'com.qiscus.sdk:chat-core:1.9.0'`
	`57`	`+ implementation 'com.qiscus.sdk:chat-core:1.9.1'`
`58`	`58`	`}`
`59`	`59`	```
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public synchronized String getAppId() {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public synchronized String getAppServer() {`
`86`		`- return appServer;`
	`86`	`+ return this.appServer;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public synchronized void setAppServer(String appServer) {`
`@@ -107,11 +107,11 @@ public synchronized void setAutomaticHeartBeat(int automaticHeartBeat) {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public synchronized int getNetworkConnectionInterval() {`
`110`		`- return networkConnectionInterval;`
	`110`	`+ return this.networkConnectionInterval;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public synchronized void setNetworkConnectionInterval(int automaticHeartBeatnetworkConnectionInterval) {`
`114`		`- this.networkConnectionInterval = networkConnectionInterval;`
	`114`	`+ this.networkConnectionInterval = automaticHeartBeatnetworkConnectionInterval;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public synchronized Boolean getEnableEventReport() {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ Secondly, you need to add SDK dependencies inside your app .gradle. Then, you ne`
`80`	`80`	```
`81`	`81`	`dependencies {`
`82`	`82`	`...`
`83`		`- implementation 'com.qiscus.sdk:chat-core:1.9.0'`
	`83`	`+ implementation 'com.qiscus.sdk:chat-core:1.9.1'`
`84`	`84`	`}`
`85`	`85`	```
`86`	`86`