feat(#362): android 15 support (#407)

karimkkanji · m5r · mrjones-plip · web-flow · commit 58557bd784b4 · 2025-07-23T09:59:08.000-07:00
* uplift `targetSdkVersion` to 35 (Android 15) * android 15 security flag "Block apps that don't match the top UID on the stack from launching activities" * compile app using android 15 preview sdk * try handling overlaps with window insets * fix `java.lang.RuntimeException: Unable to start activity ComponentInfo{org.medicmobile.webapp.mobile/org.medicmobile.webapp.mobile.EmbeddedBrowserActivity}: android.app.Fragment$InstantiationException: Unable to instantiate fragment org.medicmobile.webapp.mobile.OpenSettingsDialogFragment: could not find Fragment constructor` * apply insets margins to layout instead of individual elements * android:fitsSystemWindows="true" * simplify * UPD: add echis.go.ke domains to app * UPD: add echis urls to prod app * UPD: add aab files in artifacts * UPD: add version number * UPD: add version number * UPD: add version number * UPD: add keystore data * UPD: add keystore data * UPD: add build pipelines * chore(#362): bump gradle API to support Android 15 and 16 * bump actions/cache to v4 per CI failing * UPD: target sdk 36 * chore(#362): target API 35 (Android 15) instead of 36 We use Robolectric which supports up to API level 35 * chore(#362): Bump robolectric and junit versions to latest * UPD: add training branch * UPD: add chis kenya for training * UPD: restore working gradle versions, AGP to be updated later * UPD: update tests * UPD: add support for android 15 to production apps * Update .gitlab-ci.yml file for prod * UPD: remove gitlab ci * UPD: removed commented out code lines * UPD: only add file in master * UPD: only add file in master * UPD: only add file in master * UPD: only add file in master * UPD: remove chis_kenya specific files * UPD: remove chis_kenya specific files * CHORE: remove commented out code * CHORE: removed unused imports --------- Co-authored-by: m5r <mokht@rmi.al> Co-authored-by: mrjones-plip <mrjones-plip@plip.com> Co-authored-by: Binod Adhikary <adhikary@medicmobile.org>
diff --git a/build.gradle b/build.gradle
@@ -101,7 +101,7 @@ def getVersionName = {
 }
 
 android {
-  compileSdk 34
+  compileSdk 35
   packagingOptions {
     resources {
       excludes += ['META-INF/LICENSE', 'META-INF/NOTICE']
@@ -114,7 +114,7 @@ android {
 
   defaultConfig {
     //noinspection OldTargetApi
-    targetSdkVersion 34
+    targetSdkVersion 35
     minSdkVersion 21 // Android 5.0
     versionCode getVersionCode()
     versionName getVersionName()
@@ -483,10 +483,10 @@ dependencies {
   testImplementation 'junit:junit:4.13.2'
   testImplementation 'org.mockito:mockito-inline:5.2.0'
   testImplementation 'com.google.android:android-test:4.1.1.4'
-  testImplementation 'org.robolectric:robolectric:4.12.1'
+  testImplementation 'org.robolectric:robolectric:4.15.1'
   testImplementation 'androidx.test.espresso:espresso-core:3.5.1'
   testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
-  testImplementation 'androidx.test.ext:junit:1.1.5'
+  testImplementation 'androidx.test.ext:junit:1.2.1'
   androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.1'
   androidTestImplementation 'androidx.test.ext:junit:1.1.5'
   androidTestImplementation 'androidx.test:runner:1.5.2'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
   <application android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:allowBackup="false"
+      android:allowCrossUidActivitySwitchFromBelow="false"
       android:fullBackupContent="@xml/backup_rules_sdk_30_and_lower"
       android:dataExtractionRules="@xml/backup_rules"
       android:largeHeap="true"
diff --git a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java
@@ -21,6 +21,7 @@
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
@@ -33,6 +34,7 @@
 import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -61,7 +63,7 @@ public void onReceiveValue(String result) {
 	};
 
 
-	//> ACTIVITY LIFECYCLE METHODS
+//> ACTIVITY LIFECYCLE METHODS
 	@SuppressLint("ClickableViewAccessibility")
 	@Override public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -83,23 +85,26 @@ public void onReceiveValue(String result) {
 
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.main);
+		View webviewContainer = findViewById(R.id.lytWebView);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+			ViewCompat.requestApplyInsets(webviewContainer.getRootView());
+		}
 
 		// Add an alarming red border if using configurable (i.e. dev)
 		// app with a medic production server.
-		if (settings.allowCustomHosts() && appUrl != null && appUrl.contains("app.medicmobile.org")) {
-			View webviewContainer = findViewById(R.id.lytWebView);
+		if (settings.allowsConfiguration() && appUrl != null && appUrl.contains("app.medicmobile.org")) {
 			webviewContainer.setPadding(10, 10, 10, 10);
 			webviewContainer.setBackgroundResource(R.drawable.warning_background);
 		}
 
 		// Add a noticeable border to easily identify a training app
 		if (BuildConfig.IS_TRAINING_APP) {
-			View webviewContainer = findViewById(R.id.lytWebView);
 			webviewContainer.setPadding(10, 10, 10, 10);
 			webviewContainer.setBackgroundResource(R.drawable.training_background);
 		}
 
 		container = findViewById(R.id.wbvMain);
+
 		getFragmentManager()
 			.beginTransaction()
 			.add(new OpenSettingsDialogFragment(), OpenSettingsDialogFragment.class.getName())
@@ -171,8 +176,8 @@ protected void onStop() {
 	@Override public void onBackPressed() {
 		trace(this, "onBackPressed()");
 		container.evaluateJavascript(
-			"angular.element(document.body).injector().get('AndroidApi').v1.back()",
-			backButtonHandler);
+				"angular.element(document.body).injector().get('AndroidApi').v1.back()",
+				backButtonHandler);
 	}
 
 	@Override
@@ -218,7 +223,7 @@ protected void onActivityResult(int requestCd, int resultCode, Intent intent) {
 		}
 	}
 
-	//> ACCESSORS
+//> ACCESSORS
 	MrdtSupport getMrdtSupport() {
 		return this.mrdt;
 	}
@@ -231,7 +236,7 @@ ChtExternalAppHandler getChtExternalAppHandler() {
 		return this.chtExternalAppHandler;
 	}
 
-	//> PUBLIC API
+//> PUBLIC API
 	public void evaluateJavascript(final String js) {
 		evaluateJavascript(js, true);
 	}
@@ -278,7 +283,7 @@ public boolean getLocationPermissions() {
 		return false;
 	}
 
-	//> PRIVATE HELPERS
+//> PRIVATE HELPERS
 	private void locationRequestResolved() {
 		evaluateJavascript("window.CHTCore.AndroidApi.v1.locationPermissionRequestResolved();");
 	}
@@ -403,7 +408,7 @@ private void registerRetryConnectionBroadcastReceiver() {
 		);
 	}
 
-	//> ENUMS
+//> ENUMS
 	public enum RequestCode {
 		ACCESS_LOCATION_PERMISSION(100),
 		ACCESS_STORAGE_PERMISSION(101),
diff --git a/src/main/java/org/medicmobile/webapp/mobile/OpenSettingsDialogFragment.java b/src/main/java/org/medicmobile/webapp/mobile/OpenSettingsDialogFragment.java
@@ -13,8 +13,10 @@
 
 import java.time.Clock;
 
+@SuppressLint("ValidFragment")
 public class OpenSettingsDialogFragment extends Fragment {
 
+	private View view;
 	private int fingerTapCount = 0;
 	private long lastTimeTap = 0;
 	private GestureHandler swipeGesture;
@@ -31,11 +33,10 @@ public boolean onTouch(View view, MotionEvent event) {
 	};
 
 	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setRetainInstance(true);
-		View view = getActivity().findViewById(R.id.wbvMain);
-		view.setOnTouchListener(onTouchListener);
+	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		this.view = view.findViewById(R.id.wbvMain);
+		this.view.setOnTouchListener(onTouchListener);
 	}
 
 	private void countTaps(MotionEvent event) {
diff --git a/src/main/java/org/medicmobile/webapp/mobile/SettingsDialogActivity.java b/src/main/java/org/medicmobile/webapp/mobile/SettingsDialogActivity.java
@@ -10,6 +10,7 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
@@ -19,6 +20,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.FragmentActivity;
 
 import org.medicmobile.webapp.mobile.adapters.FilterableListAdapter;
@@ -59,11 +61,14 @@ private void displayServerSelectList() {
 		state = STATE_LIST;
 
 		setContentView(R.layout.server_select_list);
-
-		ListView list = findViewById(R.id.lstServers);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+			View view = findViewById(R.id.serverSelectListLayout);
+			ViewCompat.requestApplyInsets(view.getRootView());
+		}
 
 		List<ServerMetadata> servers = serverRepo.getServers();
 		ServerMetadataAdapter adapter = ServerMetadataAdapter.createInstance(this, servers);
+		ListView list = findViewById(R.id.lstServers);
 		list.setAdapter(adapter);
 		list.setOnItemClickListener(new ServerClickListener(adapter));
 
@@ -80,6 +85,10 @@ private void displayCustomServerForm() {
 		state = STATE_FORM;
 
 		setContentView(R.layout.custom_server_form);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+			View view = findViewById(R.id.customServerFormLayout);
+			ViewCompat.requestApplyInsets(view.getRootView());
+		}
 
 		if(!this.settings.hasWebappSettings()) {
 			cancelButton().setVisibility(View.GONE);
diff --git a/src/main/res/layout/custom_server_form.xml b/src/main/res/layout/custom_server_form.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:tools="http://schemas.android.com/tools"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:orientation="vertical">
-	<EditText android:id="@+id/txtAppUrl"
-			android:hint="@string/txtAppUrl"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:inputType="textUri"
-			android:autofillHints=""
-			android:padding="32dp"/>
-	<!-- OnClick is ignored because lint generates error
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/customServerFormLayout"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:fitsSystemWindows="true"
+  android:orientation="vertical"
+  android:paddingLeft="16dp"
+  android:paddingRight="16dp">
+
+  <EditText
+    android:id="@+id/txtAppUrl"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:autofillHints=""
+    android:hint="@string/txtAppUrl"
+    android:inputType="textUri"
+    android:padding="32dp" />
+  <!-- OnClick is ignored because lint generates error
 	     incorrectly.  Test with future build tool versions
 	     to see if this exception can be removed -->
-	<Button android:id="@+id/btnCancelSettings"
-			style="@style/standardButton"
-			android:layout_toStartOf="@+id/btnSaveSettings"
-			android:layout_alignParentBottom="true"
-			android:onClick="cancelSettingsEdit"
-			android:text="@string/btnCancel"
-			tools:ignore="OnClick" />
-	<!-- OnClick is ignored because lint generates error
+  <Button
+    android:id="@+id/btnCancelSettings"
+    style="@style/standardButton"
+    android:layout_alignParentBottom="true"
+    android:layout_toStartOf="@+id/btnSaveSettings"
+    android:onClick="cancelSettingsEdit"
+    android:text="@string/btnCancel"
+    tools:ignore="OnClick" />
+  <!-- OnClick is ignored because lint generates error
 	     incorrectly.  Test with future build tool versions
 	     to see if this exception can be removed -->
-	<Button android:id="@+id/btnSaveSettings"
-			style="@style/standardButton"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentBottom="true"
-			android:onClick="verifyAndSave"
-			android:text="@string/btnSave"
-			tools:ignore="OnClick" />
+  <Button
+    android:id="@+id/btnSaveSettings"
+    style="@style/standardButton"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentBottom="true"
+    android:onClick="verifyAndSave"
+    android:text="@string/btnSave"
+    tools:ignore="OnClick" />
 </RelativeLayout>
diff --git a/src/main/res/layout/main.xml b/src/main/res/layout/main.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/lytWebView"
 		android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
+		android:layout_height="fill_parent"
+    android:fitsSystemWindows="true">
 	<WebView android:id="@+id/wbvMain"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"/>
diff --git a/src/main/res/layout/server_select_list.xml b/src/main/res/layout/server_select_list.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/serverSelectListLayout"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
+  android:fitsSystemWindows="true"
   android:orientation="vertical">
 
-  <EditText android:id="@+id/instanceSearchBox"
-    android:hint="@string/instancesSearch"
+  <EditText
+    android:id="@+id/instanceSearchBox"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:inputType="textUri"
     android:autofillHints=""
-    android:padding="32dp"/>
+    android:hint="@string/instancesSearch"
+    android:inputType="textUri"
+    android:padding="32dp" />
 
   <ListView
     android:id="@+id/lstServers"
diff --git a/src/test/java/org/medicmobile/webapp/mobile/OpenSettingsDialogFragmentTest.java b/src/test/java/org/medicmobile/webapp/mobile/OpenSettingsDialogFragmentTest.java
@@ -37,6 +37,7 @@ public class OpenSettingsDialogFragmentTest {
 
 	private OpenSettingsDialogFragment openSettingsDialogFragment;
 	private Activity activity;
+	private View fragmentView;
 	private ArgumentCaptor<OnTouchListener> argsOnTouch;
 	private ArgumentCaptor<Intent> argsStartActivity;
 
@@ -45,21 +46,22 @@ public void setup() {
 		activity = mock(Activity.class, RETURNS_SMART_NULLS);
 		doNothing().when(activity).finish();
 
-		View view = mock(View.class);
+		fragmentView = mock(View.class);
+		View webView = mock(View.class);
 		argsOnTouch = ArgumentCaptor.forClass(OnTouchListener.class);
-		doNothing().when(view).setOnTouchListener(argsOnTouch.capture());
+		doNothing().when(webView).setOnTouchListener(argsOnTouch.capture());
+		when(fragmentView.findViewById(R.id.wbvMain)).thenReturn(webView);
 
 		MockSettings fragmentSettings = withSettings()
 			.useConstructor()
 			.defaultAnswer(CALLS_REAL_METHODS);
 
 		openSettingsDialogFragment = mock(OpenSettingsDialogFragment.class, fragmentSettings);
 		when(openSettingsDialogFragment.getActivity()).thenReturn(activity);
-		when(openSettingsDialogFragment.getActivity().findViewById(R.id.wbvMain)).thenReturn(view);
 		argsStartActivity = ArgumentCaptor.forClass(Intent.class);
 		doNothing().when(openSettingsDialogFragment).startActivity(argsStartActivity.capture());
 
-		openSettingsDialogFragment.onCreate(null);
+		openSettingsDialogFragment.onViewCreated(fragmentView, null);
 	}
 
 	private void tap(OnTouchListener onTouchListener, MotionEvent eventTap, int times) {
@@ -240,11 +242,11 @@ public void onCreate_setsRetainInstanceTrue_preservesStateAfterRecreation() {
 		when(eventTap.getActionMasked()).thenReturn(MotionEvent.ACTION_DOWN);
 
 		// First creation
-		openSettingsDialogFragment.onCreate(savedState);
+		openSettingsDialogFragment.onViewCreated(fragmentView, savedState);
 		OnTouchListener firstListener = argsOnTouch.getValue();
+
 		// Set up initial clock mock
 		Clock initialTime = Clock.fixed(Instant.ofEpochMilli(1000), ZoneOffset.UTC);
-		// Update clock time for subsequent taps
 		Clock laterTime = Clock.fixed(Instant.ofEpochMilli(1200), ZoneOffset.UTC);
 
 		try (MockedStatic<Clock> mockClock = mockStatic(Clock.class)) {
@@ -255,14 +257,15 @@ public void onCreate_setsRetainInstanceTrue_preservesStateAfterRecreation() {
 
 			// Simulate fragment recreation (e.g., due to configuration change)
 			Activity newActivity = mock(Activity.class, RETURNS_SMART_NULLS);
-			View newView = mock(View.class);
+			View newFragmentView = mock(View.class);
+			View newWebView = mock(View.class);
 			ArgumentCaptor<OnTouchListener> newArgsOnTouch = ArgumentCaptor.forClass(OnTouchListener.class);
-			doNothing().when(newView).setOnTouchListener(newArgsOnTouch.capture());
+			doNothing().when(newWebView).setOnTouchListener(newArgsOnTouch.capture());
+			when(newFragmentView.findViewById(R.id.wbvMain)).thenReturn(newWebView);
 			when(openSettingsDialogFragment.getActivity()).thenReturn(newActivity);
-			when(newActivity.findViewById(R.id.wbvMain)).thenReturn(newView);
 
 			//> WHEN
-			openSettingsDialogFragment.onCreate(savedState);
+			openSettingsDialogFragment.onViewCreated(newFragmentView, savedState);
 			OnTouchListener recreatedListener = newArgsOnTouch.getValue();
 
 			mockClock.when(Clock::systemUTC).thenReturn(laterTime);
