Making the branch release ready

Gradle changes are becoming importantly necessary. Sooner we merge the ongoing upgrade branch in master, we dont have to deal with workarounds like this commit
Iterable · Nov 12, 2024 · 441816c · 441816c
1 parent 3b87dec
commit 441816c
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         applicationId "com.iterable.iterableapi.testapp"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,9 +12,10 @@
         android:theme="@style/AppTheme">
         <activity
             android:name="com.iterable.androidsdk.AnonTrackingTestActivity"
-            android:exported="false" />
+            android:exported="true" />
         <activity
             android:name="com.iterable.androidsdk.MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
@@ -23,6 +24,15 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
+            android:exported="true" />
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
+            android:exported="true" />
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
+            android:exported="true" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/iterable/androidsdk/AnonTrackingTestActivity.java b/app/src/main/java/com/iterable/androidsdk/AnonTrackingTestActivity.java
@@ -177,7 +177,10 @@ public String onAuthTokenRequested() {
             } else {
                 userEmail = null;
             }
-            final Duration days7 = Duration.ofDays(7);
+            Duration days7 = null;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                days7 = Duration.ofDays(7);
+            }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 jwtToken = IterableJwtGenerator.generateToken(secret, days7, userEmail, userId);
             }

diff --git a/iterableapi-ui/build.gradle b/iterableapi-ui/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 31
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/iterableapi-ui/src/main/res/layout-v21/banner_view.xml b/iterableapi-ui/src/main/res/layout-v21/banner_view.xml
@@ -7,6 +7,7 @@
     android:layout_gravity="center_vertical"
     android:layout_marginTop="8dp"
     android:layout_marginStart="16dp"
+    android:layout_marginLeft="16dp"
     android:layout_marginBottom="12dp"
     app:cardCornerRadius="8dp"
     app:cardElevation="0dp"
@@ -18,6 +19,7 @@
         android:layout_width="240dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:ellipsize="end"
         android:maxLines="2"
@@ -34,6 +36,7 @@
         android:layout_width="240dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:maxLines="2"
@@ -73,7 +76,9 @@
             android:background="@drawable/primary_banner_button_background"
             android:ellipsize="end"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:paddingStart="12dp"

diff --git a/iterableapi-ui/src/main/res/layout-v21/card_view.xml b/iterableapi-ui/src/main/res/layout-v21/card_view.xml
@@ -39,7 +39,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginTop="16dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -55,7 +57,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:maxLines="2"
@@ -84,7 +88,9 @@
             android:background="@drawable/primary_card_button_background"
             android:ellipsize="end"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginRight="16dp"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:paddingStart="12dp"

diff --git a/iterableapi-ui/src/main/res/layout/banner_view.xml b/iterableapi-ui/src/main/res/layout/banner_view.xml
@@ -7,6 +7,7 @@
     android:layout_gravity="center_vertical"
     android:layout_marginTop="8dp"
     android:layout_marginStart="16dp"
+    android:layout_marginLeft="16dp"
     android:layout_marginBottom="12dp"
     app:cardCornerRadius="8dp"
     app:cardElevation="0dp"
@@ -18,6 +19,7 @@
         android:layout_width="240dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:ellipsize="end"
         android:maxLines="2"
@@ -33,6 +35,7 @@
         android:id="@+id/embedded_message_body"
         android:layout_width="240dp"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:ellipsize="end"
@@ -51,6 +54,7 @@
         android:layout_height="80dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:contentDescription=""
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -72,6 +76,7 @@
             android:background="@drawable/primary_banner_button_background"
             android:ellipsize="end"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:paddingStart="12dp"
@@ -88,6 +93,7 @@
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:background="@drawable/secondary_banner_button_background"
             android:ellipsize="end"
             android:paddingTop="8dp"

diff --git a/iterableapi-ui/src/main/res/layout/card_view.xml b/iterableapi-ui/src/main/res/layout/card_view.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
@@ -39,6 +40,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="16dp"
             android:ellipsize="end"
@@ -55,6 +58,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="8dp"
             android:ellipsize="end"
@@ -81,7 +86,9 @@
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:background="@drawable/primary_card_button_background"
             android:ellipsize="end"
             android:paddingStart="8dp"
@@ -90,13 +97,15 @@
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="32dp"
+            tools:ignore="Suspicious0dp" />
 
         <Button
             android:id="@+id/embedded_message_second_button"
             android:layout_width="0dp"
             android:layout_height="36dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:layout_weight="1"
             android:background="@drawable/secondary_card_button_background"
             android:ellipsize="end"

diff --git a/iterableapi-ui/src/main/res/layout/notification_view.xml b/iterableapi-ui/src/main/res/layout/notification_view.xml
@@ -8,6 +8,7 @@
     android:layout_marginTop="8dp"
     android:layout_marginBottom="12dp"
     android:layout_marginStart="16dp"
+    android:layout_marginLeft="16dp"
     app:cardCornerRadius="8dp"
     app:cardElevation="0dp"
     android:background="@drawable/notification_view_border"
@@ -18,6 +19,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
@@ -34,6 +37,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
@@ -62,6 +67,7 @@
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:textColor="@color/notification_text_color"
             android:background="@drawable/primary_notification_button_background"
             android:ellipsize="end"
@@ -80,6 +86,7 @@
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:textColor="@color/notification_text_color"
             android:background="@drawable/secondary_notification_button_background"
             android:ellipsize="end"

diff --git a/iterableapi/build.gradle b/iterableapi/build.gradle
@@ -17,7 +17,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 31
 
         buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.6.0-beta1\""
 

diff --git a/iterableapi/src/main/AndroidManifest.xml b/iterableapi/src/main/AndroidManifest.xml
@@ -3,6 +3,9 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"
+        tools:ignore="ProtectedPermissions" />
+
     <application>
         <!--FCM-->
         <service
@@ -28,6 +31,15 @@
             android:launchMode="singleInstance"
             android:excludeFromRecents="true"
             android:theme="@style/TrampolineActivity.Transparent"/>
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
+            android:exported="true" />
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
+            android:exported="true" />
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
+            android:exported="true" />
 
         <uses-library android:name="androidx.security" android:required="false" />
     </application>

diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableTaskStorage.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableTaskStorage.java
@@ -1,5 +1,6 @@
 package com.iterable.iterableapi;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -184,6 +185,7 @@ IterableTask getTask(String id) {
         return task;
     }
 
+    @SuppressLint("Range")
     private IterableTask createTaskFromCursor(Cursor cursor) {
         String id, name;
         IterableTaskType type = null;