Add secure window preference

citiususc · Sep 6, 2018 · 200fd27 · 200fd27
1 parent 2482dc1
commit 200fd27
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 1 deletion.
diff --git a/Calendula/src/main/java/es/usc/citius/servando/calendula/CalendulaActivity.java b/Calendula/src/main/java/es/usc/citius/servando/calendula/CalendulaActivity.java
@@ -25,11 +25,13 @@
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.view.WindowManager;
 
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.iconics.IconicsDrawable;
@@ -45,6 +47,8 @@
 import es.usc.citius.servando.calendula.pinlock.UnlockStateManager;
 import es.usc.citius.servando.calendula.util.LogUtil;
 import es.usc.citius.servando.calendula.util.PermissionUtils;
+import es.usc.citius.servando.calendula.util.PreferenceKeys;
+import es.usc.citius.servando.calendula.util.PreferenceUtils;
 import es.usc.citius.servando.calendula.util.ScreenUtils;
 
 
@@ -65,6 +69,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // set FLAG secure if the secure_window preference is enabled
+        if (PreferenceUtils.getBoolean(PreferenceKeys.SECURE_WINDOW, false)) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
+                    WindowManager.LayoutParams.FLAG_SECURE);
+        }
+    }
+
     protected CalendulaActivity setupToolbar(@Nullable String title, @ColorInt int color, @ColorInt int iconColor) {
         // set up the toolbar
         toolbar = (android.support.v7.widget.Toolbar) findViewById(R.id.toolbar);

diff --git a/Calendula/src/main/java/es/usc/citius/servando/calendula/util/PreferenceKeys.java b/Calendula/src/main/java/es/usc/citius/servando/calendula/util/PreferenceKeys.java
@@ -77,7 +77,9 @@ public enum PreferenceKeys {
     UNLOCK_PIN_HASH(R.string.prefkey_unlock_pin_hash),
     UNLOCK_PIN_SALT(R.string.prefkey_unlock_pin_salt),
     FINGERPRINT_ENABLED(R.string.prefkey_fingerprint_enabled),
-    UNLOCK_PIN_TIMEOUT(R.string.prefkey_pin_timeout);
+    UNLOCK_PIN_TIMEOUT(R.string.prefkey_pin_timeout),
+    // Secure window
+    SECURE_WINDOW(R.string.prefkey_secure_window);
 
     @StringRes
     private final int stringId;

diff --git a/Calendula/src/main/res/values-es/strings_translatable.xml b/Calendula/src/main/res/values-es/strings_translatable.xml
@@ -478,6 +478,8 @@ Si eliges no descargarla, puede perderse alguna información de tus medicamentos
 <string name="pin_recovery_title">"Recuperación de PIN"</string>
 <string name="pin_use_fingerprint">"Usar huella dactilar"</string>
 <string name="pref_fingerprint_enable_title">"Desbloqueo con huella dactilar"</string>
+    <string name="pref_secure_window_title">"Ventana segura"</string>
+    <string name="pref_secure_window_summary">"Impide que se muestre información de la app en capturas de pantalla o en el menú de aplicaciones en ejecución"</string>
 <string name="pref_header_privacy">"Privacidad"</string>
 <string name="pref_summary_pin_lock_set">"PIN configurado"</string>
 <string name="pref_summary_pin_lock_unset">"PIN no configurado"</string>

diff --git a/Calendula/src/main/res/values-gl-rES/strings_translatable.xml b/Calendula/src/main/res/values-gl-rES/strings_translatable.xml
@@ -479,6 +479,8 @@ Se escolles non facelo, algunha información das túas medicinas pode perderse."
 <string name="pin_recovery_title">"Recuperación de PIN"</string>
 <string name="pin_use_fingerprint">"Usar pegada dactilar"</string>
 <string name="pref_fingerprint_enable_title">"Desbloqueo con pegada dactilar"</string>
+    <string name="pref_secure_window_title">"Xanela segura"</string>
+    <string name="pref_secure_window_summary">"Impide que se amose información da app en capturas de pantalla ou no menú de aplicacións en execución"</string>
 <string name="pref_header_privacy">"Privacidade"</string>
 <string name="pref_summary_pin_lock_set">"PIN configurado"</string>
 <string name="pref_summary_pin_lock_unset">"PIN non configurado"</string>

diff --git a/Calendula/src/main/res/values/strings_preferences.xml b/Calendula/src/main/res/values/strings_preferences.xml
@@ -77,5 +77,7 @@
     <string name="prefkey_unlock_pin_salt" translatable="false">unlock_pin_salt</string>
     <string name="prefkey_fingerprint_enabled" translatable="false">fingerprint_enabled</string>
     <string name="prefkey_pin_timeout" translatable="false">pref_pin_timeout</string>
+    <!-- Allow screenshots -->
+    <string name="prefkey_secure_window">pref_key_secure_window</string>
 
 </resources>
diff --git a/Calendula/src/main/res/values/strings_translatable.xml b/Calendula/src/main/res/values/strings_translatable.xml
@@ -476,6 +476,8 @@ If you choose not to download it, some of your medicines' information may be los
 <string name="pin_recovery_title">"PIN recovery"</string>
 <string name="pin_use_fingerprint">"Use fingerprint"</string>
 <string name="pref_fingerprint_enable_title">"Fingerprint unlock"</string>
+    <string name="pref_secure_window_title">"Secure window"</string>
+    <string name="pref_secure_window_summary">"Prevents app info from appearing in screenshots or in the open apps menu"</string>
 <string name="pref_header_privacy">"Privacy"</string>
 <string name="pref_summary_pin_lock_set">"PIN set"</string>
 <string name="pref_summary_pin_lock_unset">"PIN not set"</string>

diff --git a/Calendula/src/main/res/xml/pref_privacy.xml b/Calendula/src/main/res/xml/pref_privacy.xml
@@ -39,4 +39,12 @@
         android:key="@string/prefkey_fingerprint_enabled"
         android:title="@string/pref_fingerprint_enable_title"/>
 
+    <SwitchPreference
+        android:defaultValue="true"
+        android:enabled="true"
+        android:key="@string/prefkey_secure_window"
+        android:title="@string/pref_secure_window_title"
+        android:summary="@string/pref_secure_window_summary"
+        />
+
 </PreferenceScreen>