Pull request #417: Ikresic MM-6172 android release 12.0.0

Merge in MML/infobip-mobile-messaging-android from ikresic-MM-6172-android-release-12.0.0 to master Squashed commit of the following: commit b716e382a2dcd71e22d98fe0a7ce4e723034e6fb Author: ikresic <[email protected]> Date: Mon Jan 15 13:37:43 2024 +0100 - merging feature branch into release branch commit d9b7ff6582b5c305c05ba6befd794ec81c01988e Author: ikresic <[email protected]> Date: Mon Jan 15 13:37:11 2024 +0100 - merging feature branch into release branch commit 573034b127725b4f85100369b67cd19fa6cc7d0d Merge: 68edac8 f3ad3681 Author: ikresic <[email protected]> Date: Mon Jan 15 13:21:13 2024 +0100 Merge branch 'feature/release_12.0.0' into ikresic-MM-6172-android-release-12.0.0 # Conflicts: # README.md # gradle.properties # infobip-rtc-ui/README.md commit f3ad3681edee14b130fb0c83e59a91e4c8390b8e Author: Ivan Krešić <[email protected]> Date: Mon Jan 15 11:18:41 2024 +0000 Pull request #414: Updated min SDK version to 21 Merge in MML/infobip-mobile-messaging-android from ikresic-MM-6172-android-raise-min-sdk-version-to-21 to feature/release_12.0.0 Squashed commit of the following: commit e4012fbb064a3960e1d1e834ec193f26d8635915 Author: ikresic <[email protected]> Date: Thu Jan 11 16:56:59 2024 +0100 - updated minimum supported version in ReadMe commit fc830dc2814925d0a0b65bedf78c6173aaa04461 Author: ikresic <[email protected]> Date: Thu Jan 11 16:42:52 2024 +0100 - updated min SDK version to 21 commit d0ee096 Author: infobip-ci <[email protected]> Date: Thu Dec 28 12:27:45 2023 +0100 [Gradle Release Plugin] - new version commit: '11.3.0-SNAPSHOT'. commit 09297d1 Author: infobip-ci <[email protected]> Date: Thu Dec 28 12:27:44 2023 +0100 [Gradle Release Plugin] - pre tag commit: '11.2.1'. commit ac75ab6 Author: Alexander Boldyrev <[email protected]> Date: Thu Dec 28 10:33:37 2023 +0000 Pull request #412: Aboldyrev MM-5225 ungeo Merge in MML/infobip-mobile-messaging-android from aboldyrev-MM-5225-ungeo to master Squashed commit of the following: commit 1f4b65205add2264d4c7f246e6803bd577371491 Author: Alexander Boldyrev <[email protected]> Date: Thu Dec 28 09:34:09 2023 +0100 play services base added commit a1e56f7178c69642441f33dee3fe634b804f7230 Author: Alexander Boldyrev <[email protected]> Date: Wed Dec 27 22:52:20 2023 +0100 unused import commit 4e102b97298aee7cbaed2162906d7fd9d0842dda Author: Alexander Boldyrev <[email protected]> Date: Wed Dec 27 22:48:59 2023 +0100 back to GoogleApiAvailability for getErrorDialog & HMS support at Cordova commit 622935b Author: infobip-ci <[email protected]> Date: Wed Dec 27 17:16:21 2023 +0100 [Gradle Release Plugin] - new version commit: '11.3.0-SNAPSHOT'. commit 3b08356 Author: infobip-ci <[email protected]> Date: Wed Dec 27 17:16:20 2023 +0100 [Gradle Release Plugin] - pre tag commit: '11.2.0'. commit 458b2e8 Author: Ivan Krešić <[email protected]> Date: Wed Dec 27 15:56:15 2023 +0000 Pull request #411: Ikresic MM-5197 react native android geo opt out by default Merge in MML/infobip-mobile-messaging-android from ikresic-MM-5197-react-native-android-geo-opt-out-by-default to master Squashed commit of the following: commit af50722acfdf87e259294462ea62e8e32b839e33 Author: ikresic <[email protected]> Date: Wed Dec 27 16:34:48 2023 +0100 - removed unused dependency commit b5bd14384c16daf5c59b350a3ebf58ffcccab885 Author: Olga Koroleva <[email protected]> Date: Wed Dec 20 14:59:52 2023 +0100 method for deserializing geo objects to JSON added to the GeoBundleMapper commit 5f696ec28f486240169d6051998c0a6f8dbcfe36 Merge: 981e5508 6c05ffa8 Author: Olga Koroleva <[email protected]> Date: Wed Dec 20 11:22:46 2023 +0100 Merge branch 'okoroleva-PZ-622_GeofencingClient' into ikresic-MM-5197-react-native-android-geo-opt-out-by-default commit 981e55089fe34ebc8a09de05c2cd11f08c4c0b02 Author: ikresic <[email protected]> Date: Wed Dec 20 11:05:05 2023 +0100 - moved play-services-location dependency from sdk to the geo module commit 6c05ffa82429905b146f757b3454002474e7d706 Author: Olga Koroleva <[email protected]> Date: Tue Dec 19 17:51:58 2023 +0100 catching the throwable error in case if versions of the location-service collide commit 3415348 Author: infobip-ci <[email protected]> Date: Thu Dec 21 09:54:45 2023 +0100 [Gradle Release Plugin] - new version commit: '11.2.0-SNAPSHOT'. commit a2c42d7 Author: infobip-ci <[email protected]> Date: Thu Dec 21 09:54:44 2023 +0100 [Gradle Release Plugin] - pre tag commit: '11.1.4'. commit c16a30b Author: Olga Koroleva <[email protected]> Date: Wed Dec 20 16:15:57 2023 +0000 Pull request #410: catching the throwable error in case if versions of the location-service collide Merge in MML/infobip-mobile-messaging-android from okoroleva-PZ-622_GeofencingClient to master Squashed commit of the following: commit 6c05ffa82429905b146f757b3454002474e7d706 Author: Olga Koroleva <[email protected]> Date: Tue Dec 19 17:51:58 2023 +0100 catching the throwable error in case if versions of the location-service collide commit f618106 Author: Olga Koroleva <[email protected]> Date: Wed Dec 20 16:42:14 2023 +0100 Revert "Pull request #409: Ikresic MM-5197 react native android geo opt out by default" This reverts commit 493ba65. commit 493ba65 Author: Ivan Krešić <[email protected]> Date: Wed Dec 20 10:56:46 2023 +0000 Pull request #409: Ikresic MM-5197 react native android geo opt out by default Merge in MML/infobip-mobile-messaging-android from ikresic-MM-5197-react-native-android-geo-opt-out-by-default to master Squashed commit of the following: commit 5f696ec28f486240169d6051998c0a6f8dbcfe36 Merge: 981e5508 6c05ffa8 Author: Olga Koroleva <[email protected]> Date: Wed Dec 20 11:22:46 2023 +0100 Merge branch 'okoroleva-PZ-622_GeofencingClient' into ikresic-MM-5197-react-native-android-geo-opt-out-by-default commit 981e55089fe34ebc8a09de05c2cd11f08c4c0b02 Author: ikresic <[email protected]> Date: Wed Dec 20 11:05:05 2023 +0100 - moved play-services-location dependency from sdk to the geo module commit 6c05ffa82429905b146f757b3454002474e7d706 Author: Olga Koroleva <[email protected]> Date: Tue Dec 19 17:51:58 2023 +0100 catching the throwable error in case if versions of the location-service collide commit 1406261d3006e6e7415bd08972da61a0e622e2d4 Author: Alexander Boldyrev <[email protected]> Date: Tue Dec 19 13:12:33 2023 +0000 Pull request #407: Aboldyrev MM-5695 backup Merge in MML/infobip-mobile-messaging-android from aboldyrev-MM-5695-backup to feature/release_12.0.0 Squashed commit of the following: commit 0b2dfc67f0f68eef7303d36d81f6eec2e1ddf088 Author: Alexander Boldyrev <[email protected]> Date: Thu Dec 14 12:40:49 2023 +0100 device to device transfer disabled commit 033721de6d01b8e85e24cbe750e2b8cccb5133db Author: Alexander Boldyrev <[email protected]> Date: Tue Dec 12 16:23:33 2023 +0100 backup for demo app disabled commit b156579b04c80b3fe8fdbb60a0b079da0c6b01df Author: Alexander Boldyrev <[email protected]> Date: Tue Dec 12 10:48:59 2023 +0100 removed unnecessary rules commit 8b187f9244cea698fdec63ee5cc9c063ae6cd66e Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 22:43:31 2023 +0100 geo cleartexttraffic commit 39ece8236fabffff248e616c93e72a907851b471 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 22:27:47 2023 +0100 chat unuses cleartexttraffic commit 3a112904f4f9cf232e76ab291ec7b498518275e5 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 21:45:26 2023 +0100 database rules commit 9dc82e9fe93b93a0675066b40e292b777e869894 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 15:32:35 2023 +0100 revert cleartexttraffic commit 00dabf8f47416f098b151f8523e15e612e0a8993 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 15:24:01 2023 +0100 clearTextTraffic remaining parts commit 55ff43e7c267e47239eed56364a801f8e82b93b1 Merge: e80b9a81 50d5a5af Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 14:43:57 2023 +0100 Merge branch 'feature/release_12.0.0' into aboldyrev-MM-5695-backup # Conflicts: # infobip-mobile-messaging-android-sdk/src/main/AndroidManifest.xml commit e80b9a81ef450dc4923179598053b0078f20c45e Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 14:23:24 2023 +0100 more manifests commit bf85d5eb16b61558ffa1771278ffd9700fc9834a Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 14:08:26 2023 +0100 removed appcode commit 70d8ce3cb66eb30e2092d7fa57bbd7cc1294392b Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 13:56:19 2023 +0100 chats manifest commit 05fa18e99049df762fe2e612bdcad9e7b8538b96 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 12:43:20 2023 +0100 - Android manifests rollback commit 634fb14012ab950c51480f803d90f7edccb7a095 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 12:13:28 2023 +0100 - Android manifests - backup rules commit 50d5a5af1a8e100c7cc425c22a78697a193c0b3b Merge: 7e5a1742 347fa02 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 14:43:17 2023 +0100 Merge branch 'master' into feature/release_12.0.0 commit 7e5a174231897535c84391d0baa6d63717911ee4 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 11 11:04:20 2023 +0000 Pull request #405: Aboldyrev MM-6087 usescleartexttraffic Merge in MML/infobip-mobile-messaging-android from aboldyrev-MM-6087-usescleartexttraffic to feature/release_12.0.0 Squashed commit of the following: commit ae58b6067dee81e204d88c5f6d22c1f928c85ce3 Author: Alexander Boldyrev <[email protected]> Date: Fri Dec 8 15:38:35 2023 +0100 - extra check commit 4773128422bed598d3062f11bcd579d19d4c9a69 Merge: eb13dc35 604f7c5 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 4 15:41:29 2023 +0100 Merge branch 'master' into aboldyrev-MM-6087-usescleartexttraffic commit eb13dc35303db21eaeaaaebadc2efc5a2c41c4e7 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 4 14:02:43 2023 +0100 - tests clear text traffic commit adfd6f1dd43a31cae1c2489a91e8d946fde38e41 Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 4 11:52:44 2023 +0100 - tests gradle commit c500aaf75c99f475ae6b313c4fcd245be3ee4b3a Author: Alexander Boldyrev <[email protected]> Date: Mon Dec 4 10:58:24 2023 +0100 - cleartexttraffic false - downloadimagetask break condition
infobip · Jan 15, 2024 · 49a1609 · 49a1609
1 parent 68edac8
commit 49a1609
Show file tree

Hide file tree

Showing 16 changed files with 86 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Mobile Messaging SDK is designed and developed to easily enable push notificatio
 ## Requirements
 
 - Android Studio
-- Supported API Levels: 16 (Android 4.0 - Jellybean) - 34 (Android 14)
+- Supported API Levels: 21 (Android 5.0 - Lollipop) - 34 (Android 14)
 - <a href="https://developer.android.com/jetpack/androidx/migrate" target="_blank">AndroidX</a>
 
 ## Quick start guide

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ plugins {
 }
 
 ext {
-    mm_minSdkVersion = 16
+    mm_minSdkVersion = 21
     mm_compileSdkVersion = 34
     mm_targetSdkVersion = 34
     mm_buildToolsVersion = "34.0.0"

diff --git a/infobip-mobile-messaging-android-chat-sdk/src/androidTest/AndroidManifest.xml b/infobip-mobile-messaging-android-chat-sdk/src/androidTest/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <application
         android:usesCleartextTraffic="true"
-        tools:targetApi="m"/>
+        tools:replace="android:usesCleartextTraffic"
+        tools:targetApi="m" />
 
 </manifest>
diff --git a/infobip-mobile-messaging-android-chat-sdk/src/main/AndroidManifest.xml b/infobip-mobile-messaging-android-chat-sdk/src/main/AndroidManifest.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
     <queries>
         <!-- Camera -->
         <intent>
             <action android:name="android.media.action.IMAGE_CAPTURE" />
         </intent>
     </queries>
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <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>
+    <application
+        android:allowBackup="false"
+        android:usesCleartextTraffic="false">
         <activity
             android:name=".view.InAppChatAttachmentPreviewActivity"
             android:screenOrientation="portrait"
@@ -23,6 +28,7 @@
             android:noHistory="false"
             android:screenOrientation="portrait"
             android:theme="@style/IB_ChatDefaultTheme" />
+
         <receiver
             android:name=".core.PersonalizationBroadcastReceiver"
             android:exported="false">

diff --git a/infobip-mobile-messaging-android-demo/src/chatWithCalls/AndroidManifest.xml b/infobip-mobile-messaging-android-demo/src/chatWithCalls/AndroidManifest.xml
@@ -10,13 +10,13 @@
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
     <application
+        android:name=".ChatWithCallsApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:name"
-        android:name=".ChatWithCallsApplication">
+        tools:replace="android:name,android:allowBackup">
 
         <activity
             android:name=".MainActivity"

diff --git a/infobip-mobile-messaging-android-demo/src/cryptorMigration/AndroidManifest.xml b/infobip-mobile-messaging-android-demo/src/cryptorMigration/AndroidManifest.xml
@@ -3,18 +3,17 @@
     package="org.infobip.mobile.messaging.demo">
 
     <application
-        tools:replace="android:name"
+        android:name="org.infobip.mobile.messaging.demo.CryptorMigrationApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="org.infobip.mobile.messaging.demo.CryptorMigrationApplication"
-        >
+        tools:replace="android:name,android:allowBackup">
         <activity
             android:name=".MainActivity"
-            android:label="@string/main_activity_title"
             android:exported="true"
+            android:label="@string/main_activity_title"
             android:theme="@style/AppTheme.NoActionBar">
 
             <intent-filter>

diff --git a/infobip-mobile-messaging-android-demo/src/customInApp/AndroidManifest.xml b/infobip-mobile-messaging-android-demo/src/customInApp/AndroidManifest.xml
@@ -3,25 +3,24 @@
     package="org.infobip.mobile.messaging.demo">
 
     <application
-        tools:replace="android:name"
+        android:name="org.infobip.mobile.messaging.demo.InAppApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="org.infobip.mobile.messaging.demo.InAppApplication"
-        >
+        tools:replace="android:name,android:allowBackup">
         <receiver
             android:name=".InAppReceiver"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.infobip.mobile.messaging.interactive.MODAL_IN_APP_NOTIFICATION_IS_READY_TO_DISPLAY"/>
+                <action android:name="org.infobip.mobile.messaging.interactive.MODAL_IN_APP_NOTIFICATION_IS_READY_TO_DISPLAY" />
             </intent-filter>
         </receiver>
         <activity
             android:name=".MainActivity"
-            android:label="@string/main_activity_title"
             android:exported="true"
+            android:label="@string/main_activity_title"
             android:theme="@style/AppTheme.NoActionBar">
 
             <intent-filter>

diff --git a/infobip-mobile-messaging-android-demo/src/geofencing/AndroidManifest.xml b/infobip-mobile-messaging-android-demo/src/geofencing/AndroidManifest.xml
@@ -3,18 +3,17 @@
     package="org.infobip.mobile.messaging.demo">
 
     <application
-        tools:replace="android:name"
+        android:name="org.infobip.mobile.messaging.demo.GeoApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="org.infobip.mobile.messaging.demo.GeoApplication"
-        >
+        tools:replace="android:name,android:allowBackup">
         <activity
             android:name=".MainActivity"
-            android:label="@string/main_activity_title"
             android:exported="true"
+            android:label="@string/main_activity_title"
             android:theme="@style/AppTheme.NoActionBar">
 
             <intent-filter>

diff --git a/infobip-mobile-messaging-android-demo/src/main/AndroidManifest.xml b/infobip-mobile-messaging-android-demo/src/main/AndroidManifest.xml
@@ -4,11 +4,11 @@
     package="org.infobip.mobile.messaging.demo">
 
     <application
+        android:name="org.infobip.mobile.messaging.demo.Application"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="org.infobip.mobile.messaging.demo.Application">
-    </application>
+        tools:replace="android:allowBackup" />
 </manifest>
diff --git a/infobip-mobile-messaging-android-demo/src/push/AndroidManifest.xml b/infobip-mobile-messaging-android-demo/src/push/AndroidManifest.xml
@@ -6,9 +6,9 @@
 
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/main_activity_title"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="true">
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

diff --git a/infobip-mobile-messaging-android-geo-sdk/src/main/AndroidManifest.xml b/infobip-mobile-messaging-android-geo-sdk/src/main/AndroidManifest.xml
@@ -8,13 +8,14 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
-    <application>
+    <application android:allowBackup="false"
+        android:usesCleartextTraffic="false">
 
         <!--Service that's triggered by GeofenceTransitionsReceiver when geofence area is entered-->
         <service
             android:name="org.infobip.mobile.messaging.geo.transition.GeofenceTransitionsIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:enabled="false" />
+            android:enabled="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!--Receiver that triggers when geofence area is entered-->
         <receiver
@@ -35,8 +36,8 @@
         <!--Service that's triggered by GeofencingConsistencyReceiver when consistency of geo monitoring needs to be maintained-->
         <service
             android:name="org.infobip.mobile.messaging.geo.GeofencingConsistencyIntentService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:enabled="false" />
+            android:enabled="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
         <receiver
             android:name="org.infobip.mobile.messaging.geo.GeofencingConsistencyReceiver"
             android:enabled="false"

diff --git a/infobip-mobile-messaging-android-sdk/src/androidTest/AndroidManifest.xml b/infobip-mobile-messaging-android-sdk/src/androidTest/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <application
         android:usesCleartextTraffic="true"
-        tools:targetApi="m"/>
+        tools:replace="android:usesCleartextTraffic"
+        tools:targetApi="m" />
 
 </manifest>
diff --git a/infobip-mobile-messaging-android-sdk/src/main/AndroidManifest.xml b/infobip-mobile-messaging-android-sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <!-- Browser -->
@@ -19,8 +18,10 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
-        android:usesCleartextTraffic="true"
-        tools:targetApi="m">
+        android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_backup_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:usesCleartextTraffic="false">
 
         <service
             android:name="org.infobip.mobile.messaging.cloud.MobileMessagingCloudService"
@@ -30,9 +31,9 @@
 
         <service
             android:name="org.infobip.mobile.messaging.cloud.firebase.MobileMessagingFirebaseService"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
@@ -59,20 +60,20 @@
 
         <activity
             android:name=".view.WebViewActivity"
-            android:theme="@style/IB_WebViewTheme"
-            android:exported="false">
+            android:exported="false"
+            android:theme="@style/IB_WebViewTheme">
             <intent-filter>
-                <action android:name="org.infobip.mobile.messaging.NOTIFICATION_TAPPED"/>
+                <action android:name="org.infobip.mobile.messaging.NOTIFICATION_TAPPED" />
             </intent-filter>
         </activity>
 
         <activity
             android:name="org.infobip.mobile.messaging.NotificationTapReceiverActivity"
-            android:noHistory="true"
             android:excludeFromRecents="true"
+            android:exported="false"
+            android:noHistory="true"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:exported="false" />
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
     </application>
 </manifest>
diff --git a/...src/main/java/org/infobip/mobile/messaging/interactive/inapp/image/DownloadImageTask.java b/...src/main/java/org/infobip/mobile/messaging/interactive/inapp/image/DownloadImageTask.java
@@ -3,6 +3,8 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
+import android.os.Build;
+import android.security.NetworkSecurityPolicy;
 
 import org.infobip.mobile.messaging.logging.MobileMessagingLogger;
 
@@ -31,6 +33,13 @@ private Bitmap downloadWithRetries(String imageUrl) {
                 return BitmapFactory.decodeStream(input);
             } catch (Exception e) {
                 MobileMessagingLogger.e("Cannot download picture: " + e.getMessage());
+                // If exception is caused by http, skip retries.
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    if (!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted() && imageUrl.substring(0, 5).toLowerCase().startsWith("http:")) {
+                        MobileMessagingLogger.e("HTTP not permitted, use https or override usesClearTextTraffic on the application level.");
+                        break;
+                    }
+                }
             } finally {
                 attempt++;
             }

diff --git a/infobip-mobile-messaging-android-sdk/src/main/res/xml/backup_rules.xml b/infobip-mobile-messaging-android-sdk/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include
+        domain="sharedpref"
+        path="MobileMessagingSDK.xml" />
+    <include
+        domain="database"
+        path="mm_infobip_database.db" />
+</full-backup-content>
diff --git a/infobip-mobile-messaging-android-sdk/src/main/res/xml/data_backup_rules.xml b/infobip-mobile-messaging-android-sdk/src/main/res/xml/data_backup_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <include
+            domain="sharedpref"
+            path="MobileMessagingSDK.xml" />
+        <include
+            domain="database"
+            path="mm_infobip_database.db" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude
+            domain="sharedpref"
+            path="MobileMessagingSDK.xml" />
+        <exclude
+            domain="database"
+            path="mm_infobip_database.db" />
+    </device-transfer>
+</data-extraction-rules>