Skip to content

Commit 7c16b0b

Browse files
adarshmishraadarshmishra
committed
Merge branch 'master' into development
2 parents 150dab0 + c5cacb0 commit 7c16b0b

5 files changed

Lines changed: 37 additions & 23 deletions

File tree

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
defaultConfig {
1010
applicationId "io.kommunicate.app"
1111
compileSdk 34
12-
minSdkVersion 21
13-
targetSdkVersion 35
12+
minSdkVersion 23
13+
targetSdkVersion 34
1414
versionCode 1
1515
versionName "1.0"
1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -54,7 +54,7 @@ android {
5454
dependencies {
5555
implementation fileTree(include: ['*.jar'], dir: 'libs')
5656
api project(':kommunicateui')
57-
//implementation 'io.kommunicate.sdk:kommunicateui:2.2.2'
57+
//implementation 'io.kommunicate.sdk:kommunicateui:2.14.5'
5858
implementation libs.appcompat
5959
implementation libs.multidex
6060
implementation libs.core.ktx

‎app/src/main/AndroidManifest.xml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44

55
<uses-permission android:name="io.kommunicate.app.permission.MAPS_RECEIVE" />
66

7-
<!--Permissions to be used when using these features-->
8-
<uses-permission
9-
android:name="android.permission.CAMERA"
10-
tools:node="merge" />
7+
<!--Permissions to be used when using these features-->
8+
<uses-permission
9+
android:name="android.permission.CAMERA"
10+
tools:node="merge" />
1111

1212
<!--Storage Permission required for API >= 33 -->
13+
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
14+
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
1315
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
1416
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
1517
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -23,15 +25,15 @@
2325
android:name="android.permission.READ_EXTERNAL_STORAGE"
2426
android:maxSdkVersion="32"
2527
tools:node="merge" />
26-
<uses-permission
27-
android:name="android.permission.RECORD_AUDIO"
28-
tools:node="merge" />
29-
<uses-permission
30-
android:name="android.permission.ACCESS_COARSE_LOCATION"
31-
tools:node="merge" />
32-
<uses-permission
33-
android:name="android.permission.ACCESS_FINE_LOCATION"
34-
tools:node="merge" />
28+
<uses-permission
29+
android:name="android.permission.RECORD_AUDIO"
30+
tools:node="merge" />
31+
<uses-permission
32+
android:name="android.permission.ACCESS_COARSE_LOCATION"
33+
tools:node="merge" />
34+
<uses-permission
35+
android:name="android.permission.ACCESS_FINE_LOCATION"
36+
tools:node="merge" />
3537

3638
<application
3739
android:name="kommunicate.io.sample.KommunicateApplication"
@@ -84,9 +86,9 @@
8486
android:value="https://api-test.kommunicate.io"
8587
tools:node="replace"/>-->
8688

87-
<!-- <meta-data-->
88-
<!-- android:name="io.kommunicate.devkit.notification.iconColor"-->
89-
<!-- android:resource="@color/colorPrimary">-->
89+
<!-- <meta-data
90+
android:name="io.kommunicate.devkit.notification.iconColor"
91+
android:resource="@color/colorPrimary">-->
9092
<!-- </meta-data>-->
9193

9294
</application>

‎kommunicate/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
compileSdk 34
1919
targetSdkVersion 35
2020
versionCode 1
21-
versionName "2.14.3"
21+
versionName "2.14.5"
2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323
buildConfigField "String", "KOMMUNICATE_VERSION", "\"" + versionName + "\""
2424
buildConfigField "String", "CHAT_SERVER_URL", '"https://chat.kommunicate.io"'

‎kommunicateui/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
targetSdkVersion 35
1717
minSdkVersion 21
1818
versionCode 1
19-
versionName "2.14.3"
19+
versionName "2.14.5"
2020
buildToolsVersion = '34.0.0'
2121
consumerProguardFiles 'proguard-rules.txt'
2222
vectorDrawables.useSupportLibrary = true
@@ -45,7 +45,7 @@ android {
4545
dependencies {
4646
implementation fileTree(dir: 'libs', include: ['*.jar'])
4747
api project(':kommunicate')
48-
// api 'io.kommunicate.sdk:kommunicate:2.10.4-temp'
48+
//api 'io.kommunicate.sdk:kommunicate:2.14.5'
4949
api libs.firebase.messaging
5050
api libs.play.services.maps
5151
api libs.gms.play.services.location

‎kommunicateui/src/main/java/io/kommunicate/ui/conversation/activity/ConversationActivity.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import androidx.appcompat.widget.Toolbar;
4343
import androidx.core.app.ActivityCompat;
4444
import androidx.core.app.TaskStackBuilder;
45+
import androidx.core.content.ContextCompat;
4546
import androidx.core.content.FileProvider;
4647
import androidx.core.view.MenuItemCompat;
4748
import androidx.fragment.app.Fragment;
@@ -833,13 +834,24 @@ public void onClick(DialogInterface dialog, int id) {
833834

834835
@Override
835836
public boolean isPermissionGranted() {
837+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
838+
return ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_MEDIA_IMAGES) == PackageManager.PERMISSION_GRANTED
839+
&& ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_MEDIA_VIDEO) == PackageManager.PERMISSION_GRANTED;
840+
}
836841
return !PermissionsUtils.checkSelfForStoragePermission(this);
837842
}
838843

839844
@Override
840845
public void checkPermission(KmStoragePermission storagePermission) {
841-
PermissionsUtils.requestPermissions(this, PermissionsUtils.getStoragePermission(getApplicationContext()), PermissionsUtils.REQUEST_STORAGE);
842846
this.alStoragePermission = storagePermission;
847+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
848+
List<String> permissions = new ArrayList<>();
849+
permissions.add(android.Manifest.permission.READ_MEDIA_IMAGES);
850+
permissions.add(android.Manifest.permission.READ_MEDIA_VIDEO);
851+
ActivityCompat.requestPermissions(this, permissions.toArray(new String[0]), KmPermissions.REQUEST_STORAGE_MULTI_SELECT_GALLERY);
852+
} else {
853+
PermissionsUtils.requestPermissions(this, PermissionsUtils.getStoragePermission(getApplicationContext()), KmPermissions.REQUEST_STORAGE_MULTI_SELECT_GALLERY);
854+
}
843855
}
844856

845857
public void processLocation() {

0 commit comments

Comments
 (0)