4.0.5-videochat-java

QuickBlox · May 30, 2022 · 5feee78 · 5feee78
1 parent fdf5f7e
commit 5feee78
Show file tree

Hide file tree

Showing 19 changed files with 296 additions and 516 deletions.
diff --git a/sample-videochat-java/app/build.gradle b/sample-videochat-java/app/build.gradle
@@ -1,41 +1,33 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://maven.fabric.io/public' }
-    }
-
-    dependencies {
-        classpath "io.fabric.tools:gradle:$fabricToolsVersion"
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
 
 repositories {
     google()
-    jcenter()
+    mavenCentral()
     maven {
         url "https://github.com/QuickBlox/quickblox-android-sdk-releases/raw/master/"
     }
-    maven { url 'https://maven.fabric.io/public' }
-    flatDir { dirs 'libs' }
 }
 
 android {
-    def versionQACode = 3
+    def versionQACode = 1
 
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
     flavorDimensions dimensionDefault
 
     defaultConfig {
         applicationId "com.quickblox.sample.videochat.java"
-        minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 404000
-        versionName '4.0.4'
+        minSdkVersion 21
+        targetSdkVersion 31
+        versionCode 405000
+        versionName '4.0.5'
         multiDexEnabled true
     }
 
@@ -59,12 +51,14 @@ android {
             minifyEnabled false
             shrinkResources false
             proguardFile 'proguard-rules.pro'
-            zipAlignEnabled false
             resValue "string", "versionName", "QuickBlox Video Chat Java\nBuild version " + defaultConfig.getVersionName()
         }
 
         release {
             signingConfig signingConfigs.debug
+            minifyEnabled true
+            shrinkResources true
+            proguardFile 'proguard-rules.pro'
             resValue "string", "versionName", "QuickBlox Video Chat Java\nBuild version " + defaultConfig.getVersionName()
         }
     }
@@ -94,12 +88,9 @@ dependencies {
 
     implementation "com.google.firebase:firebase-core:$firebaseCoreVersion"
     implementation "com.navercorp.pulltorefresh:library:$pullToRefreshVersion@aar"
-    implementation("com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion@aar") {
-        transitive = true
-    }
+
     implementation "com.google.android.material:material:$materialVersion"
     implementation "com.github.johnkil.android-robototextview:robototextview:$robotoTextViewVersion"
-    implementation "com.github.bumptech.glide:glide:$glideVersion"
 }
 
 apply from: "../artifacts.gradle"

diff --git a/sample-videochat-java/app/google-services.json b/sample-videochat-java/app/google-services.json
@@ -1,154 +1,29 @@
 {
   "project_info": {
-    "project_number": "247738611464",
-    "firebase_url": "https://qb-prod-samples.firebaseio.com",
-    "project_id": "qb-prod-samples",
-    "storage_bucket": "qb-prod-samples.appspot.com"
+    "project_number": "Put here your value",
+    "firebase_url": "https://qb-samples.firebaseio.com",
+    "project_id": "qb-samples",
+    "storage_bucket": "qb-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"
-        }
-      ],
-      "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"
+          "package_name": "com.quickblox.sample.videochat.kotlin"
         }
       },
-      "oauth_client": [],
-      "api_key": [
+      "oauth_client": [
         {
-          "current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
+          "client_id": "Put here your value",
+          "client_type": 3
         }
       ],
-      "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_type": 3
-            }
-          ]
+          "current_key": "Put here your value"
         }
-      }
+      ]
     }
   ],
   "configuration_version": "1"

diff --git a/sample-videochat-java/app/proguard-rules.pro b/sample-videochat-java/app/proguard-rules.pro
@@ -1,21 +1,44 @@
 # Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# By default, the flags in this file are appended to flags specified
+
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
 #
 # For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+# http://developer.android.com/guide/developing/tools/proguard.html
 
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+#-dontusemixedcaseclassnames
+#-dontskipnonpubliclibraryclasses
+#-verbose
+#
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes EnclosingMethod
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes Exceptions
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+#quickblox sdk
+-keep class com.quickblox.** { *; }
+
+#smack xmpp library
+-keep class org.jxmpp.** { *; }
+-keep class org.jivesoftware.** { *; }
+-dontwarn org.jivesoftware.**
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+#webrtc
+-keep class org.webrtc.** { *; }
 
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#google gms
+-keep class com.google.android.gms.** { *; }
diff --git a/sample-videochat-java/app/src/main/AndroidManifest.xml b/sample-videochat-java/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.quickblox.sample.videochat.java">
 
-    <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -12,7 +11,7 @@
     <uses-permission android:name="com.quickblox.sample.messages.permission.C2D_MESSAGE" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
 
     <uses-feature android:name="android.hardware.camera" />
@@ -32,6 +31,7 @@
 
         <activity
             android:name=".activities.SplashActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -50,7 +50,8 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
-        <activity android:name=".activities.PermissionsActivity"
+        <activity
+            android:name=".activities.PermissionsActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -72,15 +73,21 @@
 
         <service android:name=".services.LoginService" />
 
-        <service android:name=".services.CallService" />
+        <service
+            android:name=".services.CallService"
+            android:foregroundServiceType="mediaProjection" />
 
-        <service android:name=".services.fcm.PushListenerService">
+        <service
+            android:name=".services.fcm.PushListenerService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
-        <service android:name="com.quickblox.messages.services.fcm.QBFcmPushInstanceIDService">
+        <service
+            android:name="com.quickblox.messages.services.fcm.QBFcmPushInstanceIDService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>

diff --git a/sample-videochat-java/app/src/main/java/com/quickblox/sample/videochat/java/App.java b/sample-videochat-java/app/src/main/java/com/quickblox/sample/videochat/java/App.java
@@ -2,12 +2,9 @@
 
 import android.app.Application;
 
-import com.crashlytics.android.Crashlytics;
 import com.quickblox.auth.session.QBSettings;
 import com.quickblox.sample.videochat.java.util.QBResRequestExecutor;
 
-import io.fabric.sdk.android.Fabric;
-
 public class App extends Application {
     //App credentials
     private static final String APPLICATION_ID = "";
@@ -24,17 +21,10 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         instance = this;
-        initFabric();
         checkAppCredentials();
         initCredentials();
     }
 
-    private void initFabric() {
-        if (!BuildConfig.DEBUG) {
-            Fabric.with(this, new Crashlytics());
-        }
-    }
-
     private void checkAppCredentials() {
         if (APPLICATION_ID.isEmpty() || AUTH_KEY.isEmpty() || AUTH_SECRET.isEmpty() || ACCOUNT_KEY.isEmpty()) {
             throw new AssertionError(getString(R.string.error_credentials_empty));