4.2.9-chat-java

QuickBlox · Sep 6, 2022 · 64dd551 · 64dd551
1 parent 2cd1271
commit 64dd551
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 133 deletions.
diff --git a/sample-chat-java/app/build.gradle b/sample-chat-java/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.quickblox.sample.chat.java"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 428000
-        versionName '4.2.8-java'
+        versionCode 429000
+        versionName '4.2.9'
         multiDexEnabled true
     }
 

diff --git a/sample-chat-java/app/google-services.json b/sample-chat-java/app/google-services.json
@@ -1,149 +1,29 @@
 {
   "project_info": {
-    "project_number": "247738611464",
+    "project_number": "Put here your value",
     "firebase_url": "https://qb-prod-samples.firebaseio.com",
     "project_id": "qb-prod-samples",
     "storage_bucket": "qb-prod-samples.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:247738611464:android:beb270faa2c3a789",
+        "mobilesdk_app_id": "Put here your value",
         "android_client_info": {
           "package_name": "com.quickblox.sample.chat.java"
         }
       },
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
+          "current_key": "Put here your value"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:247738611464:android:1cdc72e9ffd29448",
-        "android_client_info": {
-          "package_name": "com.quickblox.sample.chat.kotlin"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:247738611464:android:06cb0de4c719ad84",
-        "android_client_info": {
-          "package_name": "com.quickblox.sample.pushnotifications.java"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:247738611464:android:c2749661061637f0",
-        "android_client_info": {
-          "package_name": "com.quickblox.sample.pushnotifications.kotlin"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:247738611464:android:99e5b55a490c901c",
-        "android_client_info": {
-          "package_name": "com.quickblox.sample.videochat.java"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:247738611464:android:ac22e0d1b3a3e86b",
-        "android_client_info": {
-          "package_name": "com.quickblox.sample.videochat.kotlin"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
+              "client_id": "Put here your value",
               "client_type": 3
             }
           ]

diff --git a/sample-chat-java/app/proguard-rules.pro b/sample-chat-java/app/proguard-rules.pro
@@ -43,4 +43,7 @@
 -keep class com.bumptech.** { *; }
 
 #google gms
--keep class com.google.android.gms.** { *; }
+-keep class com.google.android.gms.** { *; }
+
+#json
+-keep class org.json.** { *; }
diff --git a/sample-chat-java/app/src/main/java/com/quickblox/sample/chat/java/App.java b/sample-chat-java/app/src/main/java/com/quickblox/sample/chat/java/App.java
@@ -10,7 +10,7 @@
 
 public class App extends Application {
 
-    //Chat settings
+    // chat settings
     public static final String USER_DEFAULT_PASSWORD = "quickblox";
     public static final int CHAT_PORT = 5223;
     public static final int SOCKET_TIMEOUT = 300;
@@ -21,13 +21,13 @@ public class App extends Application {
     public static final boolean RECONNECTION_ALLOWED = true;
     public static final boolean ALLOW_LISTEN_NETWORK = true;
 
-    //App credentials
+    // app credentials
     private static final String APPLICATION_ID = "";
     private static final String AUTH_KEY = "";
     private static final String AUTH_SECRET = "";
     private static final String ACCOUNT_KEY = "";
 
-    //Chat settings range
+    // chat settings range
     private static final int MAX_PORT_VALUE = 65535;
     private static final int MIN_PORT_VALUE = 1000;
     private static final int MIN_SOCKET_TIMEOUT = 300;
@@ -67,7 +67,7 @@ private void initCredentials() {
         QBSettings.getInstance().init(getApplicationContext(), APPLICATION_ID, AUTH_KEY, AUTH_SECRET);
         QBSettings.getInstance().setAccountKey(ACCOUNT_KEY);
 
-        // Uncomment and put your Api and Chat servers endpoints if you want to point the sample
+        // uncomment and put your Api and Chat servers endpoints if you want to point the sample
         // against your own server.
         //
         // QBSettings.getInstance().setEndpoints("https://your_api_endpoint.com", "your_chat_endpoint", ServiceZone.PRODUCTION);

diff --git a/...e-chat-java/app/src/main/java/com/quickblox/sample/chat/java/utils/NotificationUtils.java b/...e-chat-java/app/src/main/java/com/quickblox/sample/chat/java/utils/NotificationUtils.java
@@ -66,6 +66,10 @@ private static PendingIntent buildContentIntent(Context context, Class<? extends
         Intent intent = new Intent(context, activityClass);
         intent.putExtra(FcmConsts.EXTRA_FCM_MESSAGE, message);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        int intentFlag = 0;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            intentFlag = PendingIntent.FLAG_IMMUTABLE;
+        }
+        return PendingIntent.getActivity(context, 0, intent, intentFlag);
     }
 }
diff --git a/sample-chat-java/build.gradle b/sample-chat-java/build.gradle
@@ -28,7 +28,7 @@ ext {
     lintAbortOnError = false
 
     // QuickBlox SDK version
-    qbSdkVersion = '3.9.15'
+    qbSdkVersion = '3.10.1'
 
     //Firebase
     firebaseCoreVersion = '20.1.2'