diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index 496e5429b..bbd32977d 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -588,9 +588,7 @@ public void onRefresh() { // Handle intent checkExtras(getIntent()); - // Warn about disabled blocking if ADB logging is on - if (!Util.isPlayStoreInstall() && prefs.getBoolean("log_logcat", false)) - Toast.makeText(this, R.string.msg_log_logcat, Toast.LENGTH_SHORT).show(); + updateResearchModeNotice(); } @Override @@ -657,6 +655,7 @@ protected void onResume() { vpnEnabled && Util.isPrivateDnsBlocked(this) ? View.VISIBLE : View.GONE); } refreshPrivateDnsBypassBanner(); + updateResearchModeNotice(); super.onResume(); } @@ -687,9 +686,22 @@ public void onConfigurationChanged(Configuration newConfig) { updateHorizontalPadding(findViewById(R.id.tvLocalNetwork), horizontalPadding); updateHorizontalPadding(findViewById(R.id.tvPrivateDns), horizontalPadding); updateHorizontalPadding(findViewById(R.id.tvPrivateDnsBypass), horizontalPadding); + updateResearchModeNotice(); updatePrivateDnsBypassBanner(); } + private void updateResearchModeNotice() { + TextView notice = findViewById(R.id.tvResearchMode); + if (notice == null) + return; + updateHorizontalPadding(notice, Math.max( + getResources().getDimensionPixelSize(R.dimen.activity_horizontal_margin), + Math.round(16 * getResources().getDisplayMetrics().density))); + notice.setVisibility(PreferenceManager.getDefaultSharedPreferences(this) + .getBoolean("log_logcat", false) ? View.VISIBLE : View.GONE); + notice.setOnClickListener(view -> startActivity(new Intent(this, ActivitySettings.class))); + } + private void updatePrivateDnsBypassBanner() { TextView tvPrivateDnsBypass = findViewById(R.id.tvPrivateDnsBypass); if (tvPrivateDnsBypass == null) @@ -1001,6 +1013,9 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String name) { updatePrivateDnsBypassBanner(); + } else if ("log_logcat".equals(name)) { + updateResearchModeNotice(); + } else if ("block_dot".equals(name) || "log".equals(name)) { refreshPrivateDnsBypassBanner(); diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index dbd83bc56..b26c1eb6d 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -24,6 +24,25 @@ app:titleTextColor="@android:color/white" /> + +