4.5.0-conference-java

QuickBlox · Sep 19, 2024 · 67e9ac5 · 67e9ac5
1 parent 9edff1a
commit 67e9ac5
Show file tree

Hide file tree

Showing 12 changed files with 287 additions and 120 deletions.
diff --git a/sample-conference-java/app/build.gradle b/sample-conference-java/app/build.gradle
@@ -18,19 +18,17 @@ repositories {
 android {
     def versionQACode = 1
 
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
-    flavorDimensions dimensionDefault
-
     defaultConfig {
+        compileSdk 34
         applicationId "com.quickblox.sample.videochat.conference.java"
         minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 441000
-        versionName '4.4.1'
+        targetSdkVersion 34
+        versionCode 450000
+        versionName '4.5.0'
         multiDexEnabled true
     }
 
+    flavorDimensions dimensionDefault
     productFlavors {
         dev {
             dimension dimensionDefault
@@ -80,6 +78,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.quickblox.sample.videochat.conference.java'
 }
 
 dependencies {

diff --git a/sample-conference-java/app/proguard-rules.pro b/sample-conference-java/app/proguard-rules.pro
@@ -44,4 +44,11 @@
 -keep class com.bumptech.** { *; }
 
 # google gms
--keep class com.google.android.gms.** { *; }
+-keep class com.google.android.gms.** { *; }
+
+#json
+-keep class org.json.** { *; }
+
+-keep class com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
diff --git a/sample-conference-java/app/src/main/AndroidManifest.xml b/sample-conference-java/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.quickblox.sample.videochat.conference.java">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.quickblox.sample.videochat.conference.java.permission.C2D_MESSAGE" />
@@ -10,13 +9,24 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -121,7 +131,7 @@
 
         <service
             android:name=".services.CallService"
-            android:foregroundServiceType="mediaProjection"
+            android:foregroundServiceType="camera|microphone|mediaProjection"
             tools:targetApi="29" />
 
         <service

diff --git a/...conference-java/app/src/main/java/com/quickblox/sample/videochat/conference/java/App.java b/...conference-java/app/src/main/java/com/quickblox/sample/videochat/conference/java/App.java
@@ -19,7 +19,7 @@
 
 public class App extends Application {
 
-    //Chat settings
+    // chat settings
     public static final int CHAT_PORT = 5223;
     public static final int SOCKET_TIMEOUT = 300;
     public static final boolean KEEP_ALIVE = true;
@@ -29,13 +29,13 @@ public class App extends Application {
     public static final boolean RECONNECTION_ALLOWED = true;
     public static final boolean ALLOW_LISTEN_NETWORK = true;
 
-    //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;
     private static final int MAX_SOCKET_TIMEOUT = 60000;
 
-    //App credentials
+    // app credentials
     private static final String APPLICATION_ID = "";
     private static final String AUTH_KEY = "";
     private static final String AUTH_SECRET = "";
@@ -124,7 +124,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.com", ServiceZone.PRODUCTION);