Merge pull request #799 from QuickBlox/videochat-java

4.1.0-videochat-java
QuickBlox · Sep 19, 2022 · 692e69a · 692e69a
2 parents 24e82c3 + 1cee852
commit 692e69a
Show file tree

Hide file tree

Showing 48 changed files with 774 additions and 1,535 deletions.
diff --git a/sample-videochat-java/app/build.gradle b/sample-videochat-java/app/build.gradle
@@ -20,26 +20,26 @@ android {
 
     compileSdkVersion 31
     buildToolsVersion "31.0.0"
-    flavorDimensions dimensionDefault
+    flavorDimensions "default"
 
     defaultConfig {
         applicationId "com.quickblox.sample.videochat.java"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 405000
-        versionName '4.0.5'
+        versionCode 410000
+        versionName '4.1.0'
         multiDexEnabled true
     }
 
     productFlavors {
         dev {
-            dimension dimensionDefault
+            dimension "default"
             buildConfigField('boolean', "IS_QA", "false")
             buildConfigField("int", "VERSION_QA_CODE", versionQACode.toString())
         }
 
         qa {
-            dimension dimensionDefault
+            dimension "default"
             buildConfigField("boolean", "IS_QA", "true")
             buildConfigField("int", "VERSION_QA_CODE", versionQACode.toString())
         }
@@ -83,14 +83,14 @@ android {
 }
 
 dependencies {
-    implementation "com.quickblox:quickblox-android-sdk-videochat-webrtc:$qbSdkVersion"
-    implementation "com.quickblox:quickblox-android-sdk-messages:$qbSdkVersion"
+    implementation 'com.quickblox:quickblox-android-sdk-videochat-webrtc:3.10.1'
+    implementation 'com.quickblox:quickblox-android-sdk-messages:3.10.1'
 
-    implementation "com.google.firebase:firebase-core:$firebaseCoreVersion"
-    implementation "com.navercorp.pulltorefresh:library:$pullToRefreshVersion@aar"
+    implementation 'com.google.firebase:firebase-core:21.1.0'
+    implementation 'com.navercorp.pulltorefresh:library:3.2.3@aar'
 
-    implementation "com.google.android.material:material:$materialVersion"
-    implementation "com.github.johnkil.android-robototextview:robototextview:$robotoTextViewVersion"
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.github.johnkil.android-robototextview:robototextview:4.0.0'
 }
 
 apply from: "../artifacts.gradle"

diff --git a/sample-videochat-java/app/proguard-rules.pro b/sample-videochat-java/app/proguard-rules.pro
@@ -41,4 +41,7 @@
 -keep class org.webrtc.** { *; }
 
 #google gms
--keep class com.google.android.gms.** { *; }
+-keep class com.google.android.gms.** { *; }
+
+#json
+-keep class org.json.** { *; }
diff --git a/sample-videochat-java/app/src/main/AndroidManifest.xml b/sample-videochat-java/app/src/main/AndroidManifest.xml
@@ -62,11 +62,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/BaseAppTheme" />
 
-        <activity
-            android:name=".activities.SettingsActivity"
-            android:configChanges="keyboardHidden|screenSize|orientation"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".activities.AppInfoActivity"
             android:screenOrientation="portrait" />

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
@@ -6,7 +6,7 @@
 import com.quickblox.sample.videochat.java.util.QBResRequestExecutor;
 
 public class App extends Application {
-    //App credentials
+    // аpp credentials
     private static final String APPLICATION_ID = "";
     private static final String AUTH_KEY = "";
     private static final String AUTH_SECRET = "";
@@ -35,7 +35,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/...ava/app/src/main/java/com/quickblox/sample/videochat/java/activities/AppInfoActivity.java b/...ava/app/src/main/java/com/quickblox/sample/videochat/java/activities/AppInfoActivity.java
@@ -14,7 +14,6 @@
 import com.quickblox.sample.videochat.java.BuildConfig;
 import com.quickblox.sample.videochat.java.R;
 
-
 public class AppInfoActivity extends BaseActivity {
 
     private TextView appVersionTextView;
@@ -68,9 +67,9 @@ public void fillUI() {
         if (BuildConfig.IS_QA) {
             String appVersion = BuildConfig.VERSION_NAME;
             String versionQACode = String.valueOf(BuildConfig.VERSION_QA_CODE);
-            String qaVersion = appVersion + "." + versionQACode;
+            String qaVersion = appVersion + "(" + versionQACode + ")";
             Spannable spannable = new SpannableString(qaVersion);
-            spannable.setSpan(new ForegroundColorSpan(Color.RED), appVersion.length() + 1,
+            spannable.setSpan(new ForegroundColorSpan(Color.RED), appVersion.length(),
                     qaVersion.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             appQAVersionTextView.setText(spannable, TextView.BufferType.SPANNABLE);
             appQAVersionTextView.setVisibility(View.VISIBLE);

diff --git a/...t-java/app/src/main/java/com/quickblox/sample/videochat/java/activities/BaseActivity.java b/...t-java/app/src/main/java/com/quickblox/sample/videochat/java/activities/BaseActivity.java
@@ -4,26 +4,21 @@
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.Environment;
-import android.os.PowerManager;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
 import com.quickblox.sample.videochat.java.App;
 import com.quickblox.sample.videochat.java.R;
 import com.quickblox.sample.videochat.java.util.QBResRequestExecutor;
-import com.quickblox.sample.videochat.java.utils.Consts;
 import com.quickblox.sample.videochat.java.utils.ErrorUtils;
 import com.quickblox.sample.videochat.java.utils.SharedPrefsHelper;
 
-import java.io.File;
-
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-
 /**
  * QuickBlox team
  */
@@ -45,8 +40,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public void initDefaultActionBar() {
         String currentUserFullName = "";
-        if (sharedPrefsHelper.getQbUser() != null) {
-            currentUserFullName = sharedPrefsHelper.getQbUser().getFullName();
+        if (sharedPrefsHelper.getUser() != null) {
+            currentUserFullName = sharedPrefsHelper.getUser().getFullName();
         }
 
         setActionBarTitle("");