From bc6c3169659a42fbddfe8a1ce7a4cf9c0663db51 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Thu, 22 Sep 2022 22:31:08 +0200 Subject: [PATCH] Fix wrong paid features docs URL --- .../activities/MainActivity.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java index cf59a8bd..d35ba8e9 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java +++ b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java @@ -110,10 +110,10 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig public static final String DOCS_URL = "https://emanuele-f.github.io/PCAPdroid"; public static final String PRIVACY_POLICY_URL = DOCS_URL + "/privacy"; public static final String DONATE_URL = "https://emanuele-f.github.io/PCAPdroid/donate"; - public static final String PAID_FEATURES_URL = DOCS_URL + "/paid_features"; - public static final String FIREWALL_DOCS_URL = DOCS_URL + PAID_FEATURES_URL + "#51-firewall"; - public static final String MALWARE_DETECTION_DOCS_URL = DOCS_URL + PAID_FEATURES_URL + "#52-malware-detection"; public static final String TLS_DECRYPTION_DOCS_URL = DOCS_URL + "/tls_decryption"; + public static final String PAID_FEATURES_URL = DOCS_URL + "/paid_features"; + public static final String FIREWALL_DOCS_URL = PAID_FEATURES_URL + "#51-firewall"; + public static final String MALWARE_DETECTION_DOCS_URL = PAID_FEATURES_URL + "#52-malware-detection"; private final ActivityResultLauncher pcapFileLauncher = registerForActivityResult(new StartActivityForResult(), this::pcapFileResult); @@ -213,8 +213,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig Menu navMenu = mNavView.getMenu(); navMenu.findItem(R.id.open_root_log).setVisible(Prefs.isRootCaptureEnabled(mPrefs)); - navMenu.findItem(R.id.malware_detection).setVisible(Prefs.isMalwareDetectionEnabled(this, mPrefs)); - navMenu.findItem(R.id.firewall).setVisible(mIab.isFirewallVisible()); + checkPaidDrawerEntries(); } private void setupNavigationDrawer() { @@ -245,6 +244,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig }); } + // keep this in a separate function, used by play billing code + private void checkPaidDrawerEntries() { + if(mNavView == null) + return; + Menu navMenu = mNavView.getMenu(); + navMenu.findItem(R.id.malware_detection).setVisible(Prefs.isMalwareDetectionEnabled(this, mPrefs)); + navMenu.findItem(R.id.firewall).setVisible(mIab.isFirewallVisible()); + } + @Override public void onBackPressed() { if(mDrawer.isDrawerOpen(GravityCompat.START))