From e443979dc96eacde2c2bd4354e390ad0c828b55a Mon Sep 17 00:00:00 2001 From: Binod Adhikary Date: Mon, 27 Jan 2025 00:43:27 +0545 Subject: [PATCH 1/4] fix(#385): Add a flag indicating production app avoiding red border --- .../medicmobile/webapp/mobile/EmbeddedBrowserActivity.java | 5 +++-- src/main/res/values/bools.xml | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/main/res/values/bools.xml diff --git a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java index 96f4e318..6091ec99 100644 --- a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java +++ b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java @@ -19,6 +19,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.Uri; import android.os.Bundle; @@ -80,13 +81,13 @@ public void onReceiveValue(String result) { this.settings = SettingsStore.in(this); this.appUrl = settings.getAppUrl(); - + boolean isProductionApp = getResources().getBoolean(R.bool.production); this.requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.main); // Add an alarming red border if using configurable (i.e. dev) // app with a medic production server. - if (settings.allowsConfiguration() && appUrl != null && appUrl.contains("app.medicmobile.org")) { + if (settings.allowsConfiguration() && appUrl != null && appUrl.contains("app.medicmobile.org") && !isProductionApp) { View webviewContainer = findViewById(R.id.lytWebView); webviewContainer.setPadding(10, 10, 10, 10); webviewContainer.setBackgroundResource(R.drawable.warning_background); diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml new file mode 100644 index 00000000..7033141b --- /dev/null +++ b/src/main/res/values/bools.xml @@ -0,0 +1,4 @@ + + + False + From 2986d7388ec57a1852bb8df5fba5f808e746f1f1 Mon Sep 17 00:00:00 2001 From: Binod Adhikary Date: Mon, 27 Jan 2025 00:45:20 +0545 Subject: [PATCH 2/4] fix(#385): Add a flag indicating production app avoiding red border --- .../org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java | 1 - src/main/res/values/bools.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java index 6091ec99..219bb641 100644 --- a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java +++ b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java @@ -19,7 +19,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.Uri; import android.os.Bundle; diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml index 7033141b..ba68ddcb 100644 --- a/src/main/res/values/bools.xml +++ b/src/main/res/values/bools.xml @@ -1,4 +1,4 @@ - False + false From f27477e69b96313f39c5ad41de560fabb67002b7 Mon Sep 17 00:00:00 2001 From: Binod Adhikary Date: Wed, 29 Jan 2025 01:33:00 +0545 Subject: [PATCH 3/4] Check allowCustomHosts instead of allowsConfiguration, as per PR feedback Co-authored-by: Joshua Kuestersteffen --- .../org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java index 219bb641..bd4f3bf4 100644 --- a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java +++ b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java @@ -86,7 +86,7 @@ public void onReceiveValue(String result) { // Add an alarming red border if using configurable (i.e. dev) // app with a medic production server. - if (settings.allowsConfiguration() && appUrl != null && appUrl.contains("app.medicmobile.org") && !isProductionApp) { + if (settings.allowCustomHosts() && appUrl != null && appUrl.contains("app.medicmobile.org")) { View webviewContainer = findViewById(R.id.lytWebView); webviewContainer.setPadding(10, 10, 10, 10); webviewContainer.setBackgroundResource(R.drawable.warning_background); From 0c4336ded6bd585c07fd8d513587bd30e3e2d955 Mon Sep 17 00:00:00 2001 From: Binod Adhikary Date: Wed, 29 Jan 2025 01:41:31 +0545 Subject: [PATCH 4/4] fix(#385): Remove production bool check --- .../webapp/mobile/EmbeddedBrowserActivity.java | 16 ++++++++-------- src/main/res/values/bools.xml | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 src/main/res/values/bools.xml diff --git a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java index bd4f3bf4..2e3c0c5a 100644 --- a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java +++ b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java @@ -61,7 +61,7 @@ public void onReceiveValue(String result) { }; -//> ACTIVITY LIFECYCLE METHODS + //> ACTIVITY LIFECYCLE METHODS @SuppressLint("ClickableViewAccessibility") @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -80,7 +80,7 @@ public void onReceiveValue(String result) { this.settings = SettingsStore.in(this); this.appUrl = settings.getAppUrl(); - boolean isProductionApp = getResources().getBoolean(R.bool.production); + this.requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.main); @@ -171,8 +171,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 +218,7 @@ protected void onActivityResult(int requestCd, int resultCode, Intent intent) { } } -//> ACCESSORS + //> ACCESSORS MrdtSupport getMrdtSupport() { return this.mrdt; } @@ -231,7 +231,7 @@ ChtExternalAppHandler getChtExternalAppHandler() { return this.chtExternalAppHandler; } -//> PUBLIC API + //> PUBLIC API public void evaluateJavascript(final String js) { evaluateJavascript(js, true); } @@ -278,7 +278,7 @@ public boolean getLocationPermissions() { return false; } -//> PRIVATE HELPERS + //> PRIVATE HELPERS private void locationRequestResolved() { evaluateJavascript("window.CHTCore.AndroidApi.v1.locationPermissionRequestResolved();"); } @@ -403,7 +403,7 @@ private void registerRetryConnectionBroadcastReceiver() { ); } -//> ENUMS + //> ENUMS public enum RequestCode { ACCESS_LOCATION_PERMISSION(100), ACCESS_STORAGE_PERMISSION(101), diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml deleted file mode 100644 index ba68ddcb..00000000 --- a/src/main/res/values/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - false -