Skip to content

Commit 67e9ac5

Browse files
committed
4.5.0-conference-java
1 parent 9edff1a commit 67e9ac5

File tree

12 files changed

+287
-120
lines changed

12 files changed

+287
-120
lines changed

sample-conference-java/app/build.gradle

+6-7
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ repositories {
1818
android {
1919
def versionQACode = 1
2020

21-
compileSdkVersion 31
22-
buildToolsVersion "31.0.0"
23-
flavorDimensions dimensionDefault
24-
2521
defaultConfig {
22+
compileSdk 34
2623
applicationId "com.quickblox.sample.videochat.conference.java"
2724
minSdkVersion 21
28-
targetSdkVersion 31
29-
versionCode 441000
30-
versionName '4.4.1'
25+
targetSdkVersion 34
26+
versionCode 450000
27+
versionName '4.5.0'
3128
multiDexEnabled true
3229
}
3330

31+
flavorDimensions dimensionDefault
3432
productFlavors {
3533
dev {
3634
dimension dimensionDefault
@@ -80,6 +78,7 @@ android {
8078
sourceCompatibility JavaVersion.VERSION_1_8
8179
targetCompatibility JavaVersion.VERSION_1_8
8280
}
81+
namespace 'com.quickblox.sample.videochat.conference.java'
8382
}
8483

8584
dependencies {

sample-conference-java/app/proguard-rules.pro

+8-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,11 @@
4444
-keep class com.bumptech.** { *; }
4545

4646
# google gms
47-
-keep class com.google.android.gms.** { *; }
47+
-keep class com.google.android.gms.** { *; }
48+
49+
#json
50+
-keep class org.json.** { *; }
51+
52+
-keep class com.google.gson.reflect.TypeToken
53+
-keep class * extends com.google.gson.reflect.TypeToken
54+
-keep public class * implements java.lang.reflect.Type

sample-conference-java/app/src/main/AndroidManifest.xml

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.quickblox.sample.videochat.conference.java">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.VIBRATE" />
76
<uses-permission android:name="com.quickblox.sample.videochat.conference.java.permission.C2D_MESSAGE" />
@@ -10,13 +9,24 @@
109
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
1110
<uses-permission android:name="android.permission.WAKE_LOCK" />
1211
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
13-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
14-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
12+
<uses-permission
13+
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
14+
android:maxSdkVersion="32" />
15+
<uses-permission
16+
android:name="android.permission.READ_EXTERNAL_STORAGE"
17+
android:maxSdkVersion="32" />
18+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
1519
<uses-permission android:name="android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI" />
1620
<uses-permission android:name="android.permission.CAMERA" />
1721
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
1822
<uses-permission android:name="android.permission.RECORD_AUDIO" />
1923
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
24+
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
25+
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
26+
27+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
28+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
29+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
2030

2131
<uses-feature
2232
android:name="android.hardware.camera"
@@ -121,7 +131,7 @@
121131

122132
<service
123133
android:name=".services.CallService"
124-
android:foregroundServiceType="mediaProjection"
134+
android:foregroundServiceType="camera|microphone|mediaProjection"
125135
tools:targetApi="29" />
126136

127137
<service

sample-conference-java/app/src/main/java/com/quickblox/sample/videochat/conference/java/App.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class App extends Application {
2121

22-
//Chat settings
22+
// chat settings
2323
public static final int CHAT_PORT = 5223;
2424
public static final int SOCKET_TIMEOUT = 300;
2525
public static final boolean KEEP_ALIVE = true;
@@ -29,13 +29,13 @@ public class App extends Application {
2929
public static final boolean RECONNECTION_ALLOWED = true;
3030
public static final boolean ALLOW_LISTEN_NETWORK = true;
3131

32-
//Chat settings range
32+
// chat settings range
3333
private static final int MAX_PORT_VALUE = 65535;
3434
private static final int MIN_PORT_VALUE = 1000;
3535
private static final int MIN_SOCKET_TIMEOUT = 300;
3636
private static final int MAX_SOCKET_TIMEOUT = 60000;
3737

38-
//App credentials
38+
// app credentials
3939
private static final String APPLICATION_ID = "";
4040
private static final String AUTH_KEY = "";
4141
private static final String AUTH_SECRET = "";
@@ -124,7 +124,7 @@ private void initCredentials() {
124124
QBSettings.getInstance().init(getApplicationContext(), APPLICATION_ID, AUTH_KEY, AUTH_SECRET);
125125
QBSettings.getInstance().setAccountKey(ACCOUNT_KEY);
126126

127-
// Uncomment and put your Api and Chat servers endpoints if you want to point the sample
127+
// uncomment and put your Api and Chat servers endpoints if you want to point the sample
128128
// against your own server.
129129
//
130130
// QBSettings.getInstance().setEndpoints("https://your.api.endpoint.com", "your.chat.endpoint.com", ServiceZone.PRODUCTION);

0 commit comments

Comments
 (0)