From 8d95de828b4186d7d798b432b4245a8fb1806c3e Mon Sep 17 00:00:00 2001
From: m2049r <miner2049er@women-at-work.org>
Date: Sat, 2 Mar 2019 09:31:06 +0100
Subject: [PATCH] prevent screenshots on dialogs (#543)

---
 app/src/main/AndroidManifest.xml                         | 2 +-
 .../main/java/com/m2049r/xmrwallet/SecureActivity.java   | 2 +-
 .../java/com/m2049r/xmrwallet/dialog/ProgressDialog.java | 9 +++++++--
 .../m2049r/xmrwallet/ledger/LedgerProgressDialog.java    | 1 -
 app/src/main/java/com/m2049r/xmrwallet/util/Helper.java  | 5 +++++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 508e852..948520d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.m2049r.xmrwallet.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
index c3e9b4c..ca00e98 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
@@ -31,7 +31,7 @@ public abstract class SecureActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!BuildConfig.DEBUG && !BuildConfig.FLAVOR_type.equals("alpha")) {
+        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
             getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
         }
     }
diff --git a/app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java b/app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java
index 73713b0..9c63432 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java
@@ -22,11 +22,11 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
+import android.view.WindowManager;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
 
 import java.util.Locale;
@@ -78,6 +78,11 @@ public class ProgressDialog extends AlertDialog {
         }
 
         super.onCreate(savedInstanceState);
+
+        // set FLAG_SECURE to prevent screenshots in Release Mode
+        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+        }
     }
 
     public void setProgress(int value, int max) {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/ledger/LedgerProgressDialog.java b/app/src/main/java/com/m2049r/xmrwallet/ledger/LedgerProgressDialog.java
index 6730d3e..8642956 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/ledger/LedgerProgressDialog.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ledger/LedgerProgressDialog.java
@@ -6,7 +6,6 @@ import android.os.Looper;
 
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.dialog.ProgressDialog;
-import com.m2049r.xmrwallet.model.WalletManager;
 
 import timber.log.Timber;
 
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java
index cb7bd7f..bc86e02 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java
@@ -587,6 +587,11 @@ public class Helper {
             }
         });
 
+        // set FLAG_SECURE to prevent screenshots in Release Mode
+        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+            openDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+        }
+
         Helper.showKeyboard(openDialog);
         openDialog.show();
     }