From 17f5433ab0fcbdc66a96d49c5e2ee66ae348959a Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 28 Nov 2023 14:14:15 +0000 Subject: [PATCH 1/2] Use API 31 tapjacking protection. --- briar-android/src/main/AndroidManifest.xml | 7 ++++++- .../briarproject/briar/android/activity/BaseActivity.java | 2 ++ .../briarproject/briar/android/splash/ExpiredActivity.java | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml index 5ef527bf9..afbf84980 100644 --- a/briar-android/src/main/AndroidManifest.xml +++ b/briar-android/src/main/AndroidManifest.xml @@ -33,12 +33,17 @@ tools:ignore="ScopedStorage" /> - + + = 31) getWindow().setHideOverlayWindows(true); + for (ActivityLifecycleController alc : lifecycleControllers) { alc.onActivityCreate(this); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java index 3f8828ce5..901d32329 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java @@ -13,6 +13,7 @@ import org.briarproject.briar.android.Localizer; import androidx.appcompat.app.AppCompatActivity; import static android.content.Intent.ACTION_VIEW; +import static android.os.Build.VERSION.SDK_INT; import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS; @@ -25,6 +26,8 @@ public class ExpiredActivity extends AppCompatActivity if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE); + if (SDK_INT >= 31) getWindow().setHideOverlayWindows(true); + setContentView(R.layout.activity_expired); findViewById(R.id.download_briar_button).setOnClickListener(this); } From 14fded3777c05e5f3f06ec8daea3988ed6c7555c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 28 Nov 2023 14:14:56 +0000 Subject: [PATCH 2/2] Update link to download page (the old link is now a redirect). --- .../org/briarproject/briar/android/splash/ExpiredActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java index 901d32329..ea69fe301 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java @@ -41,7 +41,7 @@ public class ExpiredActivity extends AppCompatActivity @Override public void onClick(View v) { - Uri uri = Uri.parse("https://briarproject.org/download.html"); + Uri uri = Uri.parse("https://briarproject.org/download-briar"); startActivity(new Intent(ACTION_VIEW, uri)); finish(); }