From 39eebe4c02d184b4a2f36cd61950caa0daab4a74 Mon Sep 17 00:00:00 2001 From: Daniel Lublin Date: Mon, 17 Jan 2022 11:13:38 +0100 Subject: [PATCH] Remove, BaseActivity does this --- .../android/splash/ExpiredOldAndroidActivity.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java index cbc463daf..7291e79e0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java @@ -1,6 +1,5 @@ package org.briarproject.briar.android.splash; -import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -9,7 +8,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.system.AndroidWakeLockManager; import org.briarproject.bramble.api.system.Wakeful; import org.briarproject.briar.R; -import org.briarproject.briar.android.Localizer; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BaseActivity; import org.briarproject.briar.android.controller.BriarController; @@ -22,8 +20,6 @@ import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; -import static android.view.WindowManager.LayoutParams.FLAG_SECURE; -import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS; @MethodsNotNullByDefault @ParametersNotNullByDefault @@ -38,20 +34,11 @@ public class ExpiredOldAndroidActivity extends BaseActivity { public void onCreate(@Nullable Bundle state) { super.onCreate(state); - if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE); - setContentView(R.layout.activity_expired_old_android); findViewById(R.id.delete_account_button).setOnClickListener(v -> signOutAndDeleteAccount()); } - @Override - protected void attachBaseContext(Context base) { - super.attachBaseContext( - Localizer.getInstance().setLocale(base)); - Localizer.getInstance().setLocale(this); - } - @Override public void injectActivity(ActivityComponent component) { component.inject(this);