README.md

@@ -18,7 +18,7 @@ Mobile Messaging SDK is designed and developed to easily enable push notificatio
     ```groovy
     dependencies {
         ...
-        implementation ('com.infobip:infobip-mobile-messaging-android-sdk:13.2.2@aar') {
+        implementation ('com.infobip:infobip-mobile-messaging-android-sdk:13.9.1@aar') {
             transitive = true
         }
     }

build.gradle

@@ -1,14 +1,16 @@
 buildscript {
     //Kotlin-Gradle-AGP compatibility matrix https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
-    ext.mm_kotlinVersion = "1.8.20"
-    ext.mm_gradlePluginVersion = '8.5.2'
+    ext.mm_kotlinVersion = "2.0.21"
+    ext.mm_gradlePluginVersion = "8.5.2"
+    ext.mm_desugarJdkVersion = "2.1.4"
+
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$mm_gradlePluginVersion"
-        classpath "com.android.tools:desugar_jdk_libs:1.1.5"
+        classpath "com.android.tools:desugar_jdk_libs:$mm_desugarJdkVersion"
     }
 }
 
@@ -29,11 +31,14 @@ ext {
     mm_firebaseMessagingVersion = "22.0.0"
     mm_gmsLocationVersion = "21.0.1"
     mm_constraintLayoutVersion = "2.1.4"
-    mm_appCompatVersion = "1.6.1"
-    mm_materialVersion = "1.9.0"
+    mm_appCompatVersion = "1.7.0"
+    mm_materialVersion = "1.12.0"
     mm_coreKtxVersion = "1.10.1"
-    mm_desugarJdkVersion = "1.1.5"
     mm_lifecycleVersion = "2.5.1"
+    mm_junitVersion = "4.13.2"
+    mm_mockitoCoreVersion = "1.10.19"
+    mm_multidexVersion = "2.0.1"
+    mm_coroutinesVersion = "1.9.0"
     mm_version = "$version"
 }
 
@@ -47,8 +52,10 @@ allprojects {
 //It's required to be applied here, to have `subprojects.publish` task available
 subprojects {
     apply plugin: "maven-publish"
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions.jvmTarget = "1.8"
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
     }
     afterEvaluate { project ->
         if (project.hasProperty('android')) {
@@ -65,7 +72,7 @@ tasks.register('publishAllPublicationsToMavenRepository') {
     dependsOn subprojects.collect { it.tasks.named('publishReleasePublicationToSonatypeRepository') }
 }
 
-task updateVersionInReadme {
+tasks.register('updateVersionInReadme') {
     doLast {
         def readmeFile = new File('README.md')
         def text = readmeFile.text
@@ -75,7 +82,7 @@ task updateVersionInReadme {
     }
 }
 
-task updateRtcUiVersionInReadme {
+tasks.register('updateRtcUiVersionInReadme') {
     doLast {
         def readmeFile = new File('infobip-rtc-ui/README.md')
         def text = readmeFile.text

infobip-mobile-messaging-android-chat-sdk/build.gradle

@@ -17,9 +17,9 @@ plugins {
 }
 
 android {
-    namespace "org.infobip.mobile.messaging.chat"
-    compileSdkVersion mm_compileSdkVersion
-    buildToolsVersion mm_buildToolsVersion
+    namespace = "org.infobip.mobile.messaging.chat"
+    buildToolsVersion = mm_buildToolsVersion
+    compileSdk = mm_compileSdkVersion
 
     publishing {
         multipleVariants {
@@ -69,6 +69,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     lint {
         abortOnError false
     }
@@ -87,27 +88,27 @@ dependencies {
     }
 
     implementation project(":infobip-mobile-messaging-android-sdk")
-    api project(":infobip-mobile-messaging-android-resources")
     implementation project(":infobip-mobile-messaging-api-java")
+    api project(":infobip-mobile-messaging-android-resources")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$mm_kotlinVersion"
-    implementation "androidx.core:core-ktx:$mm_coreKtxVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$mm_coroutinesVersion"
 
+    implementation "androidx.core:core-ktx:$mm_coreKtxVersion"
     implementation "androidx.constraintlayout:constraintlayout:$mm_constraintLayoutVersion"
     implementation "androidx.appcompat:appcompat:$mm_appCompatVersion"
+    implementation 'androidx.exifinterface:exifinterface:1.3.7'
     implementation "com.google.android.material:material:$mm_materialVersion"
-    implementation 'androidx.exifinterface:exifinterface:1.3.6'
-
-    androidTestImplementation project(":infobip-mobile-messaging-android-test")
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation "junit:junit:4.12"
-    androidTestImplementation "org.mockito:mockito-core:1.10.19"
-    androidTestImplementation 'com.android.support:multidex:2.0.1'
 
     testImplementation project(":infobip-mobile-messaging-android-test")
-    testImplementation "junit:junit:4.12"
-    testImplementation "org.mockito:mockito-core:1.10.19"
+    testImplementation "junit:junit:$mm_junitVersion"
+    testImplementation "org.mockito:mockito-core:$mm_mockitoCoreVersion"
 
+    androidTestImplementation project(":infobip-mobile-messaging-android-test")
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation "junit:junit:$mm_junitVersion"
+    androidTestImplementation "org.mockito:mockito-core:$mm_mockitoCoreVersion"
+    androidTestImplementation "com.android.support:multidex:$mm_multidexVersion"
 }
 
 android.libraryVariants.all { variant ->

infobip-mobile-messaging-android-chat-sdk/proguard-rules.pro

@@ -23,3 +23,62 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+
+-printmapping mobile-messaging-chat-out.map
+-keepparameternames
+-renamesourcefileattribute SourceFile
+-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,EnclosingMethod
+
+# Preserve all annotations.
+
+-keepattributes *Annotation*
+
+# Preserve all public classes, and their public and protected fields and
+# methods.
+
+-keep public class org.infobip.mobile.messaging.chat.** {
+    public protected *;
+}
+
+-keep public interface org.infobip.mobile.messaging.chat.** {
+    public protected *;
+}
+
+# Preserve the special static methods that are required in all enumeration
+# classes.
+
+-keepclassmembers class org.infobip.mobile.messaging.chat.** extends java.lang.Enum {
+    <fields>;
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+-keep public enum org.infobip.mobile.messaging.chat.** { *; }
+
+# Preserve all .class method names.
+
+-keepclassmembernames class org.infobip.mobile.messaging.chat.** {
+    java.lang.Class class$(java.lang.String);
+    java.lang.Class class$(java.lang.String, boolean);
+}
+
+# Preserve all native method names and the names of their classes.
+
+-keepclasseswithmembernames class org.infobip.mobile.messaging.chat.** {
+    native <methods>;
+}
+
+# Explicitly preserve all serialization members. The Serializable interface
+# is only a marker interface, so it wouldn't save them.
+# You can comment this out if your library doesn't use serialization.
+# If your code contains serializable classes that have to be backward
+# compatible, please refer to the manual.
+
+-keepclassmembers class org.infobip.mobile.messaging.chat.** implements java.io.Serializable {
+    static final long serialVersionUID;
+    static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}

infobip-mobile-messaging-android-chat-sdk/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
         <!-- Camera -->
@@ -11,9 +12,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application
@@ -42,5 +40,29 @@
             android:name="org.infobip.mobile.messaging.chat.InAppChatImpl"
             android:value="org.infobip.mobile.messaging.MessageHandlerModule" />
 
+        <!-- File provider for files created for chat camera -->
+        <provider
+            android:name=".attachments.InAppChatAttachmentFileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <!-- Trigger Google Play services to install the backported photo picker module. -->
+        <service
+            android:name="com.google.android.gms.metadata.ModuleDependencies"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+            <meta-data
+                android:name="photopicker_activity:0:required"
+                android:value="" />
+        </service>
     </application>
 </manifest>