From 241b9a8a58f7b295fbd28bf46e83811607e9fb9d Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Wed, 4 Sep 2024 10:58:38 +0200
Subject: [PATCH 01/18] Bump compile and target SDK to version 34

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 61f2a35b6c..fbb777b74e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -223,7 +223,7 @@ static def getDate() {
 
 android {
     namespace 'org.commcare.dalvik'
-    compileSdk 33
+    compileSdk 34
 
     lintOptions {
         abortOnError false
@@ -250,7 +250,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         multiDexEnabled true
         applicationId 'org.commcare.dalvik'
         testNamespace 'org.commcare.dalvik.test'

From 8b8c4418278d7e503e2c0817fa6afa3c86f34a54 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Mon, 23 Sep 2024 12:19:25 +0200
Subject: [PATCH 02/18] Remove unused cipher pool

---
 .../models/encryption/CipherPool.java         |  59 ---------
 .../models/legacy/DecryptingCursor.java       | 113 ------------------
 .../services/CommCareSessionService.java      |  27 -----
 .../org/commcare/CommCareTestApplication.java |   1 -
 4 files changed, 200 deletions(-)
 delete mode 100755 app/src/org/commcare/models/encryption/CipherPool.java
 delete mode 100755 app/src/org/commcare/models/legacy/DecryptingCursor.java

diff --git a/app/src/org/commcare/models/encryption/CipherPool.java b/app/src/org/commcare/models/encryption/CipherPool.java
deleted file mode 100755
index 2283bb2574..0000000000
--- a/app/src/org/commcare/models/encryption/CipherPool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.commcare.models.encryption;
-
-import android.util.Log;
-
-import java.util.HashSet;
-import java.util.Stack;
-
-import javax.crypto.Cipher;
-
-/**
- * @author ctsims
- */
-public abstract class CipherPool {
-    private static final String TAG = CipherPool.class.getSimpleName();
-
-    private static final int GROWTH_FACTOR = 5;
-
-    private final HashSet<Cipher> issued = new HashSet<>();
-    private final Stack<Cipher> free = new Stack<>();
-
-    //TODO: Pass in factory and finalize all API's rather than
-    //leaving the class to be anonymous?
-    public CipherPool() {
-
-    }
-
-    public synchronized final void init() {
-        grow();
-    }
-
-    public synchronized final Cipher borrow() {
-        if (free.isEmpty()) {
-            grow();
-            Log.d(TAG, "Growing cipher pool. Current size is: " + free.size() + issued.size());
-        }
-        Cipher toLend = free.pop();
-        issued.add(toLend);
-        return toLend;
-    }
-
-    public synchronized final void remit(Cipher cipher) {
-        issued.remove(cipher);
-        free.push(cipher);
-    }
-
-    private synchronized void grow() {
-        for (int i = 0; i < GROWTH_FACTOR; ++i) {
-            free.push(generateNewCipher());
-        }
-    }
-
-    protected abstract Cipher generateNewCipher();
-
-    public synchronized final void expire() {
-        //do we want to try to destroy the final object here?
-        issued.clear();
-        free.clear();
-    }
-}
diff --git a/app/src/org/commcare/models/legacy/DecryptingCursor.java b/app/src/org/commcare/models/legacy/DecryptingCursor.java
deleted file mode 100755
index 0f3d153d28..0000000000
--- a/app/src/org/commcare/models/legacy/DecryptingCursor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.commcare.models.legacy;
-
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQuery;
-
-import org.commcare.models.encryption.CipherPool;
-import org.commcare.core.encryption.CryptUtil;
-import org.commcare.modern.database.DatabaseHelper;
-import org.commcare.modern.models.EncryptedModel;
-
-import javax.crypto.Cipher;
-
-/**
- * @author ctsims
- */
-public class DecryptingCursor extends SQLiteCursor {
-    final Cipher cipher;
-    final EncryptedModel model;
-    final CipherPool pool;
-
-    public DecryptingCursor(SQLiteDatabase db, SQLiteCursorDriver driver, String editTable, SQLiteQuery query, EncryptedModel model, CipherPool pool) {
-        super(db, driver, editTable, query);
-        this.model = model;
-        this.pool = pool;
-        this.cipher = pool.borrow();
-    }
-
-    @Override
-    public byte[] getBlob(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getBlob(columnIndex);
-        } else {
-            return decrypt(columnIndex);
-        }
-    }
-
-    @Override
-    public double getDouble(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getDouble(columnIndex);
-        } else {
-            return Double.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public float getFloat(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getFloat(columnIndex);
-        } else {
-            return Float.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public int getInt(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getInt(columnIndex);
-        } else {
-            return Integer.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public long getLong(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getLong(columnIndex);
-        } else {
-            return Long.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public short getShort(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getShort(columnIndex);
-        } else {
-            return Short.valueOf(new String(decrypt(columnIndex)));
-        }
-    }
-
-    @Override
-    public String getString(int columnIndex) {
-        if (!isEncrypted(columnIndex)) {
-            return super.getString(columnIndex);
-        } else {
-            return new String(decrypt(columnIndex));
-        }
-    }
-
-    private boolean isEncrypted(int columnIndex) {
-        String column = this.getColumnName(columnIndex);
-        if (model.isEncrypted(column)) {
-            return true;
-        }
-        return (column.equals(DatabaseHelper.DATA_COL) &&
-                model.isBlobEncrypted());
-    }
-
-    private byte[] decrypt(int columnIndex) {
-        byte[] data = super.getBlob(columnIndex);
-        return CryptUtil.decrypt(data, cipher);
-    }
-
-
-    @Override
-    public void close() {
-        super.close();
-        pool.remit(cipher);
-    }
-}
diff --git a/app/src/org/commcare/services/CommCareSessionService.java b/app/src/org/commcare/services/CommCareSessionService.java
index 1ed06a1e51..ca9da6d2ca 100644
--- a/app/src/org/commcare/services/CommCareSessionService.java
+++ b/app/src/org/commcare/services/CommCareSessionService.java
@@ -27,7 +27,6 @@
 import org.commcare.interfaces.FormSaveCallback;
 import org.commcare.models.database.user.DatabaseUserOpenHelper;
 import org.commcare.models.database.user.UserSandboxUtils;
-import org.commcare.models.encryption.CipherPool;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.sync.FormSubmissionHelper;
 import org.commcare.tasks.DataSubmissionListener;
@@ -83,7 +82,6 @@ public class CommCareSessionService extends Service {
     public static final ReentrantLock sessionAliveLock = new ReentrantLock();
 
     private Timer maintenanceTimer;
-    private CipherPool pool;
 
     private byte[] key = null;
 
@@ -141,7 +139,6 @@ public CommCareSessionService getService() {
     public void onCreate() {
         mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
         setSessionLength();
-        createCipherPool();
     }
 
     @Override
@@ -154,27 +151,6 @@ public void onTaskRemoved(Intent rootIntent) {
         }
     }
 
-    public void createCipherPool() {
-        pool = new CipherPool() {
-            @Override
-            public Cipher generateNewCipher() {
-                synchronized (lock) {
-                    try {
-                        SecretKeySpec spec = new SecretKeySpec(key, "AES");
-                        Cipher decrypter = Cipher.getInstance("AES");
-                        decrypter.init(Cipher.DECRYPT_MODE, spec);
-
-                        return decrypter;
-                    } catch (NoSuchPaddingException | NoSuchAlgorithmException |
-                             InvalidKeyException e) {
-                        e.printStackTrace();
-                    }
-                }
-                return null;
-            }
-        };
-    }
-
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         // We want this service to continue running until it is explicitly
@@ -286,7 +262,6 @@ public void prepareStorage(byte[] symetricKey, UserKeyRecord record) {
         synchronized (lock) {
             this.userKeyRecordUUID = record.getUuid();
             this.key = symetricKey;
-            pool.init();
             if (userDatabase != null && userDatabase.isOpen()) {
                 userDatabase.close();
             }
@@ -488,8 +463,6 @@ public void closeServiceResources() {
                 maintenanceTimer.cancel();
             }
             logoutStartedAt = -1;
-
-            pool.expire();
             endHeartbeatLifecycle();
         }
     }
diff --git a/app/unit-tests/src/org/commcare/CommCareTestApplication.java b/app/unit-tests/src/org/commcare/CommCareTestApplication.java
index eb38ef32cb..368a3cc496 100644
--- a/app/unit-tests/src/org/commcare/CommCareTestApplication.java
+++ b/app/unit-tests/src/org/commcare/CommCareTestApplication.java
@@ -201,7 +201,6 @@ public void startUserSession(byte[] symetricKey, UserKeyRecord record, boolean r
         // manually create/setup session service because robolectric doesn't
         // really support services
         CommCareSessionService ccService = startRoboCommCareService();
-        ccService.createCipherPool();
         ccService.prepareStorage(symetricKey, record);
         User user = getUserFromDb(ccService, record);
         if (user == null && cachedUserPassword != null) {

From b93b72ec39a60bff9ef8229b0f891bd6fbd3e1f6 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Tue, 29 Oct 2024 09:55:59 +0200
Subject: [PATCH 03/18] Bump AGP version to version 8.1.1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e0a5d687a1..3eb760f227 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

From 000fef69264515ad470749e6b1a158e03b7f861a Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Thu, 14 Nov 2024 14:36:54 +0200
Subject: [PATCH 04/18] Set foreground service type

---
 app/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 2c45970177..4121c7a076 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -38,6 +38,7 @@
     <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
         android:usesPermissionFlags="neverForLocation"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <uses-feature
         android:name="android.hardware.telephony"
@@ -307,6 +308,7 @@
 
         <service
             android:enabled="true"
+            android:foregroundServiceType="dataSync"
             android:name="org.commcare.services.CommCareSessionService">
         </service>
 

From e8879bc95264ec2592a09f1665709c65209fe465 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Thu, 14 Nov 2024 14:37:38 +0200
Subject: [PATCH 05/18] Set exported attribute to receivers

---
 app/AndroidManifest.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 4121c7a076..81c9f0aed9 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -374,7 +374,9 @@
         <activity android:name="org.commcare.activities.MessageActivity">
         </activity>
 
-        <receiver android:name="org.commcare.views.notifications.NotificationClearReceiver">
+        <receiver
+            android:exported="false"
+            android:name="org.commcare.views.notifications.NotificationClearReceiver">
         </receiver>
 
         <activity
@@ -562,6 +564,7 @@
             Below code removes this receiver's entry from Manifest.
          -->
         <receiver android:name="io.ona.kujaku.receivers.KujakuNetworkChangeReceiver"
+            android:exported="false"
             tools:node="remove"/>
 
         <!-- The zebra-print-android library is not yet targeting Android 12 and at least one

From 88760e30277113c75db17b5d39ef90fb2560e41e Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Fri, 15 Nov 2024 12:14:00 +0200
Subject: [PATCH 06/18] Set exported attribute to dynamic broadcast receivers

---
 .../org/commcare/activities/CommCareActivity.java    | 10 +++++++++-
 .../org/commcare/activities/FormEntryActivity.java   | 12 ++++++++++--
 .../commcare/utils/SessionRegistrationHelper.java    |  8 +++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
index fe513fd95c..1e492f47ff 100755
--- a/app/src/org/commcare/activities/CommCareActivity.java
+++ b/app/src/org/commcare/activities/CommCareActivity.java
@@ -9,6 +9,7 @@
 import android.content.DialogInterface;
 import android.content.IntentFilter;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Spannable;
 import android.util.DisplayMetrics;
@@ -302,7 +303,14 @@ protected void onResume() {
 
         if (shouldListenToSyncComplete() && isBackgroundSyncEnabled()) {
             dataSyncCompleteBroadcastReceiver = new DataSyncCompleteBroadcastReceiver();
-            registerReceiver(dataSyncCompleteBroadcastReceiver, new IntentFilter(COMMCARE_DATA_UPDATE_ACTION));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                registerReceiver(
+                        dataSyncCompleteBroadcastReceiver,
+                        new IntentFilter(COMMCARE_DATA_UPDATE_ACTION), Context.RECEIVER_NOT_EXPORTED);
+            } else {
+                registerReceiver(
+                        dataSyncCompleteBroadcastReceiver, new IntentFilter(COMMCARE_DATA_UPDATE_ACTION));
+            }
         }
     }
 
diff --git a/app/src/org/commcare/activities/FormEntryActivity.java b/app/src/org/commcare/activities/FormEntryActivity.java
index d7bff64b32..19453dd191 100644
--- a/app/src/org/commcare/activities/FormEntryActivity.java
+++ b/app/src/org/commcare/activities/FormEntryActivity.java
@@ -297,7 +297,11 @@ public void onReceive(Context context, Intent intent) {
         IntentFilter filter = new IntentFilter();
         filter.addAction(PollSensorAction.XPATH_ERROR_ACTION);
         filter.addAction(GeoUtils.ACTION_LOCATION_ERROR);
-        registerReceiver(mLocationServiceIssueReceiver, filter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(mLocationServiceIssueReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            registerReceiver(mLocationServiceIssueReceiver, filter);
+        }
     }
 
     @Override
@@ -997,7 +1001,11 @@ public void onResumeSessionSafe() {
         reportVideoUsageIfAny();
 
         IntentFilter intentFilter = new IntentFilter(PENGING_SYNC_ALERT_ACTION);
-        registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter);
+        }
 
         // Flag that a background sync shouldn't be triggered when this activity is in the foreground
         CommCareApplication.instance().setBackgroundSyncSafe(false);
diff --git a/app/src/org/commcare/utils/SessionRegistrationHelper.java b/app/src/org/commcare/utils/SessionRegistrationHelper.java
index 2603e795e1..2a2b5ba0be 100755
--- a/app/src/org/commcare/utils/SessionRegistrationHelper.java
+++ b/app/src/org/commcare/utils/SessionRegistrationHelper.java
@@ -5,6 +5,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Build;
 import android.util.Log;
 
 import org.commcare.activities.DispatchActivity;
@@ -52,7 +54,11 @@ public static boolean handleSessionExpiration(AppCompatActivity activity) {
     }
 
     public static void registerSessionExpirationReceiver(AppCompatActivity activity) {
-        activity.registerReceiver(userSessionExpiredReceiver, expirationFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            activity.registerReceiver(userSessionExpiredReceiver, expirationFilter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            activity.registerReceiver(userSessionExpiredReceiver, expirationFilter);
+        }
     }
 
     /**

From 569476d1354e81645c12687b5e76053cb71b0298 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Fri, 15 Nov 2024 12:18:12 +0200
Subject: [PATCH 07/18] Migrate from Google Play core

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 61b794a701..329ef610ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -124,7 +124,7 @@ dependencies {
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'androidx.work:work-runtime-ktx:2.7.1'
 
-    implementation 'com.google.android.play:core:1.10.3'
+    implementation 'com.google.android.play:app-update:2.1.0'
     implementation 'android.arch.lifecycle:common-java8:1.1.1'
 
 

From 124f9f12f1061ed3d7a5b8a68a7ccada55d2cc2b Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Wed, 27 Nov 2024 20:37:12 +0200
Subject: [PATCH 08/18] Migrate to configuration avoindance APIs

---
 app/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 329ef610ec..6e3dd02283 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -184,7 +184,7 @@ afterEvaluate {
  * https://discuss.gradle.org/t/gradle-7-0-seems-to-take-an-overzealous-approach-to-inter-task-dependencies/39656/2
  * Gradle 7.0 treats any copy tasks as having an implicit dependencies with each other.
  */
-task injectPropertiesIntoFirebaseConfigFile {
+tasks.register('injectPropertiesIntoFirebaseConfigFile') {
     description = 'Injects properties into the google-services.json file at runtime'
 
     copy {
@@ -492,7 +492,7 @@ android {
  * Download and unpack commcare app associated with 'cc_app_id' into assets
  * folder
  */
-task downloadCCApp(type: Exec)
+tasks.register('downloadCCApp', Exec)
 
 // task configuration phase
 downloadCCApp {
@@ -522,7 +522,7 @@ downloadCCApp {
 }
 
 
-task downloadRestoreFile(type: Exec)
+tasks.register('downloadRestoreFile', Exec)
 
 // task configuration phase
 downloadRestoreFile {
@@ -552,7 +552,7 @@ downloadRestoreFile {
 }
 
 // dynamically inject commcare app download into standalone build process
-tasks.whenTaskAdded { task ->
+tasks.configureEach { task ->
     if ((task.name == 'processStandaloneDebugResources' ||
             task.name == 'processStandaloneReleaseResources') && 'true' == runDownloadScripts) {
         task.dependsOn downloadCCApp

From 65a8b2a8d748eda77f95dd7910c3bce5489a13fb Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Wed, 27 Nov 2024 20:55:01 +0200
Subject: [PATCH 09/18] Remove package attribute from manifest files

---
 app/AndroidManifest.xml                               | 3 +--
 commcare-support-library/src/main/AndroidManifest.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 81c9f0aed9..ee4151919a 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.commcare.dalvik"
-          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"
           android:versionCode="106"
           android:versionName="2.55">
diff --git a/commcare-support-library/src/main/AndroidManifest.xml b/commcare-support-library/src/main/AndroidManifest.xml
index f572a4257e..568741e54f 100644
--- a/commcare-support-library/src/main/AndroidManifest.xml
+++ b/commcare-support-library/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.commcare.commcaresupportlibrary" />
\ No newline at end of file
+<manifest />
\ No newline at end of file

From 476f0dd720f61a336b7573fc72d5c090c72daee6 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Thu, 28 Nov 2024 16:51:00 +0200
Subject: [PATCH 10/18] Revert "Set foreground service type"

This reverts commit 000fef69264515ad470749e6b1a158e03b7f861a.
---
 app/AndroidManifest.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index ee4151919a..1adda3331b 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -37,7 +37,6 @@
     <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
         android:usesPermissionFlags="neverForLocation"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <uses-feature
         android:name="android.hardware.telephony"
@@ -307,7 +306,6 @@
 
         <service
             android:enabled="true"
-            android:foregroundServiceType="dataSync"
             android:name="org.commcare.services.CommCareSessionService">
         </service>
 

From ecee832d67c92bb0418da9353a5653a3dac42925 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Thu, 28 Nov 2024 21:21:08 +0200
Subject: [PATCH 11/18] Set CommCareSessionService foreground service type

---
 app/AndroidManifest.xml                                   | 7 +++++--
 app/src/org/commcare/services/CommCareSessionService.java | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 1adda3331b..efe2fe566d 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -37,6 +37,7 @@
     <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
         android:usesPermissionFlags="neverForLocation"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <uses-feature
         android:name="android.hardware.telephony"
@@ -303,12 +304,14 @@
             android:name="org.commcare.activities.FormRecordListActivity"
             android:windowSoftInputMode="adjustResize">
         </activity>
-
         <service
             android:enabled="true"
+            android:foregroundServiceType="specialUse"
             android:name="org.commcare.services.CommCareSessionService">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Service that maintains an encryption key in memory to securely submit data to the server" />
         </service>
-
         <activity
             android:launchMode="singleTop"
             android:name="org.commcare.activities.FormEntryActivity"
diff --git a/app/src/org/commcare/services/CommCareSessionService.java b/app/src/org/commcare/services/CommCareSessionService.java
index ab2543914d..7aa18dcdca 100644
--- a/app/src/org/commcare/services/CommCareSessionService.java
+++ b/app/src/org/commcare/services/CommCareSessionService.java
@@ -9,6 +9,7 @@
 import android.app.Service;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ServiceInfo;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
@@ -208,11 +209,14 @@ public IBinder onBind(Intent intent) {
     /**
      * Show a notification while this service is running.
      */
-    @SuppressLint("UnspecifiedImmutableFlag")
     public void showLoggedInNotification(@Nullable User user) {
         // Send the notification. This will cause error messages if CommCare doesn't have
         // permission to post notifications
-        this.startForeground(NOTIFICATION, createSessionNotification());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            this.startForeground(NOTIFICATION, createSessionNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+        } else {
+            this.startForeground(NOTIFICATION, createSessionNotification());
+        }
     }
 
     /**

From ef25be8f1b574e3c34969071cb24e63ef503e405 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Thu, 28 Nov 2024 21:36:40 +0200
Subject: [PATCH 12/18] Fix pendingIntent mutability flag

---
 .../services/CommCareFirebaseMessagingService.java    | 10 +++++-----
 .../org/commcare/services/CommCareSessionService.java | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
index f189193956..96826247ee 100644
--- a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
+++ b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
@@ -92,11 +92,11 @@ private void showNotification(RemoteMessage.Notification notification) {
         i.setAction(Intent.ACTION_MAIN);
         i.addCategory(Intent.CATEGORY_LAUNCHER);
 
-        PendingIntent contentIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_IMMUTABLE);
-        else
-            contentIntent = PendingIntent.getActivity(this, 0, i, 0);
+        int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
+        }
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, i, pendingIntentFlags);
 
         NotificationCompat.Builder fcmNotification = new NotificationCompat.Builder(this,
                 CommCareNoficationManager.NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID)
diff --git a/app/src/org/commcare/services/CommCareSessionService.java b/app/src/org/commcare/services/CommCareSessionService.java
index 7aa18dcdca..7e3770423a 100644
--- a/app/src/org/commcare/services/CommCareSessionService.java
+++ b/app/src/org/commcare/services/CommCareSessionService.java
@@ -706,12 +706,11 @@ private Notification createSessionNotification(){
         callable.setAction("android.intent.action.MAIN");
         callable.addCategory("android.intent.category.LAUNCHER");
 
-        // The PendingIntent to launch our activity if the user selects this notification
-        PendingIntent contentIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            contentIntent = PendingIntent.getActivity(this, 0, callable, PendingIntent.FLAG_IMMUTABLE);
-        else
-            contentIntent = PendingIntent.getActivity(this, 0, callable, 0);
+        int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
+        }
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, callable, pendingIntentFlags);
 
         String notificationText;
         if (AppUtils.getInstalledAppRecords().size() > 1) {

From 641857ff0674c26d94c9a12153cffac025be1706 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Fri, 29 Nov 2024 16:50:46 +0530
Subject: [PATCH 13/18] update test libs and work manager

---
 app/build.gradle | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6e3dd02283..e95c1d2220 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,32 +30,32 @@ configurations {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation('org.robolectric:robolectric:4.8.2') {
         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')
     }
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'androidx.test:runner:1.5.2'
-    testImplementation 'androidx.test.ext:junit:1.1.3'
-    testImplementation 'androidx.work:work-testing:2.7.1'
-    testImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.2'
+    testImplementation 'androidx.test:core:1.6.1'
+    testImplementation 'androidx.test:runner:1.6.2'
+    testImplementation 'androidx.test.ext:junit:1.2.1'
+    testImplementation 'androidx.work:work-testing:2.10.0'
+    testImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    testImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     testImplementation 'io.mockk:mockk:1.12.7'
-    testImplementation 'org.json:json:20140107'
+    testImplementation 'org.json:json:20231013'
     testImplementation project(path: ':commcare-core', configuration: 'testsAsJar')
 
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.ext:truth:1.4.0'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.ext:truth:1.6.0'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
 
     // need uiautomator to rotate the device.
     // this only works with API >=18
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
 
     // release build type expects commcare jars to be in app/libs
     implementation(project(':commcare-core')) {
@@ -121,8 +121,8 @@ dependencies {
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
         exclude group: 'io.realm'
     }
-    implementation 'androidx.work:work-runtime:2.7.1'
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
+    implementation 'androidx.work:work-runtime:2.10.0'
+    implementation 'androidx.work:work-runtime-ktx:2.10.0'
 
     implementation 'com.google.android.play:app-update:2.1.0'
     implementation 'android.arch.lifecycle:common-java8:1.1.1'
@@ -138,7 +138,7 @@ dependencies {
     implementation 'com.appmattus.certificatetransparency:certificatetransparency-android:2.5.4'
 
     // Dependency required for API desugaring
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_minimal:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_minimal:2.1.3'
 }
 
 ext {
@@ -222,7 +222,7 @@ static def getDate() {
 
 android {
     namespace 'org.commcare.dalvik'
-    compileSdk 34
+    compileSdk 35
 
     lintOptions {
         abortOnError false

From 0e86fb6426cdcc82d319fb69610c6677432c7f63 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Mon, 2 Dec 2024 15:10:34 +0200
Subject: [PATCH 14/18] Bump Support Library compile SDK to 35 and target SDK
 to 34

---
 commcare-support-library/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commcare-support-library/build.gradle b/commcare-support-library/build.gradle
index 90e68ba167..652b537f70 100644
--- a/commcare-support-library/build.gradle
+++ b/commcare-support-library/build.gradle
@@ -40,10 +40,10 @@ afterEvaluate {
 
 android {
     namespace "org.commcare.commcaresupportlibrary"
-    compileSdk 33
+    compileSdk 35
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {

From 9b03da9405ddab2b5f91742732433cb472fb8da1 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 5 Dec 2024 13:46:52 +0530
Subject: [PATCH 15/18] enable gradle configuration cache

---
 gradle.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5c4c18bd18..030bb06fa1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # generate R classes with final fields
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false
+
+# Enables Gradle Configuration Cache to improve build performance
+org.gradle.configuration-cache=true

From b22e5cdbfbb7ac322c0a5eba3b5bfe2f92dc9af9 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 5 Dec 2024 22:52:00 +0530
Subject: [PATCH 16/18] Removes some logs which are killing our sumologic usage

---
 .../commcare/activities/CommCareGraphActivity.java   |  4 ----
 .../org/commcare/android/javarosa/IntentCallout.java |  1 -
 .../appupdate/CommcareFlexibleAppUpdateManager.java  |  2 --
 app/src/org/commcare/graph/view/GraphView.java       |  8 --------
 .../org/commcare/preferences/HiddenPreferences.java  |  1 -
 app/src/org/commcare/tasks/DataPullTask.java         |  1 -
 app/src/org/commcare/tasks/LogSubmissionTask.java    |  1 -
 app/src/org/commcare/utils/FormUploadUtil.java       | 12 ++++++++----
 8 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/app/src/org/commcare/activities/CommCareGraphActivity.java b/app/src/org/commcare/activities/CommCareGraphActivity.java
index 1d82f689a2..156f6cbd17 100755
--- a/app/src/org/commcare/activities/CommCareGraphActivity.java
+++ b/app/src/org/commcare/activities/CommCareGraphActivity.java
@@ -31,9 +31,5 @@ protected void onCreate(Bundle savedInstanceState) {
     protected void onDestroy() {
         super.onDestroy();
         FirebaseAnalyticsUtil.reportGraphViewFullScreenClosed();
-
-        String title = getTitle() == null || getTitle().length() == 0 ? "(no title)" : getTitle().toString();
-        Logger.log(LogTypes.TYPE_GRAPHING,
-                String.format("End viewing full screen graph for %s", title));
     }
 }
diff --git a/app/src/org/commcare/android/javarosa/IntentCallout.java b/app/src/org/commcare/android/javarosa/IntentCallout.java
index 8225217316..94c243f7f7 100644
--- a/app/src/org/commcare/android/javarosa/IntentCallout.java
+++ b/app/src/org/commcare/android/javarosa/IntentCallout.java
@@ -165,7 +165,6 @@ public Intent generate(EvaluationContext ec) {
                 }
             }
         }
-        Logger.log(LogTypes.TYPE_FORM_ENTRY, "Generated intent for callout: " + i.toString());
         return i;
     }
 
diff --git a/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java b/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java
index fcf04c0680..137e0e0b25 100644
--- a/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java
+++ b/app/src/org/commcare/appupdate/CommcareFlexibleAppUpdateManager.java
@@ -161,8 +161,6 @@ private void publishStatus() {
         if (mAppUpdateState == newState) {
             return;
         }
-        Logger.log(LogTypes.TYPE_CC_UPDATE, "Publishing status update to : " + newState.name() + ", from : "
-                + (mAppUpdateState != null ? mAppUpdateState.name() : "null"));
         mAppUpdateState = newState;
         mCallback.run();
     }
diff --git a/app/src/org/commcare/graph/view/GraphView.java b/app/src/org/commcare/graph/view/GraphView.java
index 97e75081b5..76c443b24d 100755
--- a/app/src/org/commcare/graph/view/GraphView.java
+++ b/app/src/org/commcare/graph/view/GraphView.java
@@ -83,20 +83,12 @@ public GraphWebView(Context context) {
         protected void onAttachedToWindow() {
             super.onAttachedToWindow();
             FirebaseAnalyticsUtil.reportGraphViewAttached();
-
-            String displayTitle = mTitle == null || "".equals(mTitle) ? "(no title)" : mTitle;
-            Logger.log(LogTypes.TYPE_GRAPHING,
-                    String.format("Start viewing graph in list for %s", displayTitle));
         }
 
         @Override
         protected void onDetachedFromWindow() {
             super.onDetachedFromWindow();
             FirebaseAnalyticsUtil.reportGraphViewDetached();
-
-            String displayTitle = mTitle == null || "".equals(mTitle) ? "(no title)" : mTitle;
-            Logger.log(LogTypes.TYPE_GRAPHING,
-                    String.format("End viewing graph in list for %s", displayTitle));
         }
     }
 
diff --git a/app/src/org/commcare/preferences/HiddenPreferences.java b/app/src/org/commcare/preferences/HiddenPreferences.java
index f435f5831e..cda1288e50 100644
--- a/app/src/org/commcare/preferences/HiddenPreferences.java
+++ b/app/src/org/commcare/preferences/HiddenPreferences.java
@@ -310,7 +310,6 @@ public static int getIdOfInterruptedSSD() {
     }
 
     public static void clearInterruptedSSD() {
-        Logger.log(LogTypes.TYPE_MAINTENANCE, "Clearing interrupted state");
         String currentUserId = CommCareApplication.instance().getCurrentUserId();
         CommCareApplication.instance().getCurrentApp().getAppPreferences().edit()
                 .putInt(ID_OF_INTERRUPTED_SSD + currentUserId, -1).apply();
diff --git a/app/src/org/commcare/tasks/DataPullTask.java b/app/src/org/commcare/tasks/DataPullTask.java
index 7f5242b644..e0eb215089 100644
--- a/app/src/org/commcare/tasks/DataPullTask.java
+++ b/app/src/org/commcare/tasks/DataPullTask.java
@@ -152,7 +152,6 @@ private ResultAndError<PullTaskResult> doTaskBackgroundHelper() {
 
         publishProgress(PROGRESS_STARTED);
         HiddenPreferences.setPostUpdateSyncNeeded(false);
-        Logger.log(LogTypes.TYPE_USER, "Starting Sync");
         determineIfLoginNeeded();
 
         AndroidTransactionParserFactory factory = getTransactionParserFactory();
diff --git a/app/src/org/commcare/tasks/LogSubmissionTask.java b/app/src/org/commcare/tasks/LogSubmissionTask.java
index 40fa132caa..64ac182c6a 100644
--- a/app/src/org/commcare/tasks/LogSubmissionTask.java
+++ b/app/src/org/commcare/tasks/LogSubmissionTask.java
@@ -355,7 +355,6 @@ private LogSubmitOutcomes checkSubmissionResult(int numberOfLogsToSubmit,
         if (submittedSuccesfully.size() == numberOfLogsToSubmit) {
             return LogSubmitOutcomes.SUBMITTED;
         } else {
-            Logger.log(LogTypes.TYPE_MAINTENANCE, numberOfLogsToSubmit - submittedSuccesfully.size() + " logs remain on phone.");
             //Some remain unsent
             return LogSubmitOutcomes.SERIALIZED;
         }
diff --git a/app/src/org/commcare/utils/FormUploadUtil.java b/app/src/org/commcare/utils/FormUploadUtil.java
index e358b81b94..f0d97ab02d 100644
--- a/app/src/org/commcare/utils/FormUploadUtil.java
+++ b/app/src/org/commcare/utils/FormUploadUtil.java
@@ -361,10 +361,14 @@ private static boolean buildMultipartEntity(List<MultipartBody.Part> parts,
                 }
             }
         }
-        Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Attempted to add "
-                + numAttachmentsInInstanceFolder + " attachments to submission entity");
-        Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Successfully added "
-                + numAttachmentsSuccessfullyAdded + " attachments to submission entity");
+        if (numAttachmentsInInstanceFolder > 0) {
+            Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Attempted to add "
+                    + numAttachmentsInInstanceFolder + " attachments to submission entity");
+        }
+        if (numAttachmentsSuccessfullyAdded > 0) {
+            Logger.log(LogTypes.TYPE_FORM_SUBMISSION, "Successfully added "
+                    + numAttachmentsSuccessfullyAdded + " attachments to submission entity");
+        }
         return true;
     }
 

From 38a4dc9d9cd01f740a779a173765f8c598240377 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Mon, 9 Dec 2024 09:51:30 +0200
Subject: [PATCH 17/18] Update broacast receivers exported attribute

---
 app/src/org/commcare/activities/CommCareActivity.java    | 2 +-
 .../commcare/activities/CommCareWiFiDirectActivity.java  | 6 +++++-
 app/src/org/commcare/activities/FormEntryActivity.java   | 4 ++--
 .../location/CommCareProviderLocationController.kt       | 9 ++++++++-
 .../org/commcare/utils/SessionRegistrationHelper.java    | 2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
index 1e492f47ff..6aa5d49dcd 100755
--- a/app/src/org/commcare/activities/CommCareActivity.java
+++ b/app/src/org/commcare/activities/CommCareActivity.java
@@ -303,7 +303,7 @@ protected void onResume() {
 
         if (shouldListenToSyncComplete() && isBackgroundSyncEnabled()) {
             dataSyncCompleteBroadcastReceiver = new DataSyncCompleteBroadcastReceiver();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 registerReceiver(
                         dataSyncCompleteBroadcastReceiver,
                         new IntentFilter(COMMCARE_DATA_UPDATE_ACTION), Context.RECEIVER_NOT_EXPORTED);
diff --git a/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java b/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
index 5a096dd1c4..400f0e0c8d 100644
--- a/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
+++ b/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
@@ -225,7 +225,11 @@ public void onResumeSessionSafe() {
                 .findFragmentById(R.id.wifi_manager_fragment);
 
         mReceiver = new WiFiDirectBroadcastReceiver(mManager, fragment);
-        registerReceiver(mReceiver, mIntentFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(mReceiver, mIntentFilter, Context.RECEIVER_EXPORTED);
+        } else {
+            registerReceiver(mReceiver, mIntentFilter);
+        }
 
         fragment.startReceiver(mManager, mChannel);
 
diff --git a/app/src/org/commcare/activities/FormEntryActivity.java b/app/src/org/commcare/activities/FormEntryActivity.java
index 19453dd191..efb4228a33 100644
--- a/app/src/org/commcare/activities/FormEntryActivity.java
+++ b/app/src/org/commcare/activities/FormEntryActivity.java
@@ -297,7 +297,7 @@ public void onReceive(Context context, Intent intent) {
         IntentFilter filter = new IntentFilter();
         filter.addAction(PollSensorAction.XPATH_ERROR_ACTION);
         filter.addAction(GeoUtils.ACTION_LOCATION_ERROR);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             registerReceiver(mLocationServiceIssueReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
         } else {
             registerReceiver(mLocationServiceIssueReceiver, filter);
@@ -1001,7 +1001,7 @@ public void onResumeSessionSafe() {
         reportVideoUsageIfAny();
 
         IntentFilter intentFilter = new IntentFilter(PENGING_SYNC_ALERT_ACTION);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED);
         } else {
             registerReceiver(pendingSyncAlertBroadcastReceiver, intentFilter);
diff --git a/app/src/org/commcare/location/CommCareProviderLocationController.kt b/app/src/org/commcare/location/CommCareProviderLocationController.kt
index 923abe8bbe..e7ee17c2eb 100644
--- a/app/src/org/commcare/location/CommCareProviderLocationController.kt
+++ b/app/src/org/commcare/location/CommCareProviderLocationController.kt
@@ -7,7 +7,9 @@ import android.content.IntentFilter
 import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
+import android.os.Build
 import android.os.Bundle
+import androidx.annotation.RequiresApi
 import org.commcare.utils.GeoUtils
 
 /**
@@ -47,7 +49,12 @@ class CommCareProviderLocationController(private var mContext: Context?,
             mListener?.missingPermissions()
             return
         }
-        mContext?.registerReceiver(mReceiver, IntentFilter(LocationManager.PROVIDERS_CHANGED_ACTION))
+        val intentFilter = IntentFilter(LocationManager.PROVIDERS_CHANGED_ACTION);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            mContext?.registerReceiver(mReceiver, intentFilter, Context.RECEIVER_EXPORTED)
+        } else {
+            mContext?.registerReceiver(mReceiver, intentFilter)
+        }
         checkProviderAndRequestLocation()
     }
 
diff --git a/app/src/org/commcare/utils/SessionRegistrationHelper.java b/app/src/org/commcare/utils/SessionRegistrationHelper.java
index 2a2b5ba0be..0cae9140fe 100755
--- a/app/src/org/commcare/utils/SessionRegistrationHelper.java
+++ b/app/src/org/commcare/utils/SessionRegistrationHelper.java
@@ -54,7 +54,7 @@ public static boolean handleSessionExpiration(AppCompatActivity activity) {
     }
 
     public static void registerSessionExpirationReceiver(AppCompatActivity activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             activity.registerReceiver(userSessionExpiredReceiver, expirationFilter, Context.RECEIVER_NOT_EXPORTED);
         } else {
             activity.registerReceiver(userSessionExpiredReceiver, expirationFilter);

From 86ef226046e606beeac143654483f98fa1e25637 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Mon, 9 Dec 2024 15:14:01 +0200
Subject: [PATCH 18/18] Downgrade Espresso to 3.4

Espress 3.5.1 and higher is causing our instrumentation tests to not run
in BrowserStack.
---
 app/build.gradle | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e95c1d2220..c52ce0c061 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,28 +34,28 @@ dependencies {
     testImplementation('org.robolectric:robolectric:4.8.2') {
         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')
     }
-    testImplementation 'androidx.test:core:1.6.1'
-    testImplementation 'androidx.test:runner:1.6.2'
-    testImplementation 'androidx.test.ext:junit:1.2.1'
-    testImplementation 'androidx.work:work-testing:2.10.0'
-    testImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
+    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'androidx.test:runner:1.5.2'
+    testImplementation 'androidx.test.ext:junit:1.1.3'
+    testImplementation 'androidx.work:work-testing:2.7.1'
+    testImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     testImplementation 'io.mockk:mockk:1.12.7'
     testImplementation 'org.json:json:20231013'
     testImplementation project(path: ':commcare-core', configuration: 'testsAsJar')
 
-    androidTestImplementation 'androidx.test:runner:1.6.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.ext:truth:1.6.0'
-    androidTestImplementation 'androidx.test:rules:1.6.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.ext:truth:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
 
     // need uiautomator to rotate the device.
     // this only works with API >=18
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 
     // release build type expects commcare jars to be in app/libs
     implementation(project(':commcare-core')) {