diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java index 1518959..e792437 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java @@ -682,8 +682,7 @@ public class GenerateFragment extends Fragment { } }); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + if (Helper.preventScreenshot()) { ledgerDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java index e5c7403..86219e2 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java @@ -622,8 +622,8 @@ public class GenerateReviewFragment extends Fragment { return false; } }); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + + if (Helper.preventScreenshot()) { openDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java index 45188e0..c6c0bef 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java @@ -506,8 +506,8 @@ public class NodeFragment extends Fragment }); } }); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + + if (Helper.preventScreenshot()) { editDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java index ca00e98..63a0c26 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java @@ -21,6 +21,7 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; +import com.m2049r.xmrwallet.util.Helper; import com.m2049r.xmrwallet.util.LocaleHelper; import static android.view.WindowManager.LayoutParams; @@ -30,8 +31,7 @@ public abstract class SecureActivity extends AppCompatActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + if (Helper.preventScreenshot()) { 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 696656f..e742bc4 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java +++ b/app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java @@ -28,6 +28,7 @@ import android.widget.TextView; import com.m2049r.xmrwallet.BuildConfig; import com.m2049r.xmrwallet.R; +import com.m2049r.xmrwallet.util.Helper; import java.util.Locale; @@ -76,8 +77,7 @@ 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"))) { + if (Helper.preventScreenshot()) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } } diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java index f3d29f5..e518b3e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java @@ -437,8 +437,8 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements return false; } }); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + + if (Helper.preventScreenshot()) { passwordDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java index f04df15..cd0b1e1 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java @@ -324,8 +324,8 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen return false; } }); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + + if (Helper.preventScreenshot()) { passwordDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } 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 fd47035..6e611f5 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java @@ -601,8 +601,7 @@ public class Helper { } }); - // set FLAG_SECURE to prevent screenshots in Release Mode - if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) { + if (Helper.preventScreenshot()) { openDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } @@ -642,4 +641,8 @@ public class Helper { StrictMode.setThreadPolicy(currentPolicy); } } + + static public boolean preventScreenshot() { + return !(BuildConfig.DEBUG || BuildConfig.FLAVOR_type.equals("alpha")); + } }