From d558d396ede8f73218234889ed2a612e6db56fd9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 25 Feb 2021 09:38:30 +0100 Subject: [PATCH] show report when the user enables the Send to F-Droid Metrics pref --- .../org/fdroid/fdroid/views/InstallHistoryActivity.java | 9 ++++++++- .../org/fdroid/fdroid/views/PreferencesFragment.java | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java b/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java index 996fab4f5..d2b0df250 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java @@ -47,6 +47,8 @@ import java.nio.charset.Charset; public class InstallHistoryActivity extends AppCompatActivity { public static final String TAG = "InstallHistoryActivity"; + public static final String EXTRA_SHOW_FDROID_METRICS = "showFDroidMetrics"; + private boolean showingInstallHistory; private Toolbar toolbar; private MenuItem showMenuItem; @@ -65,7 +67,12 @@ public class InstallHistoryActivity extends AppCompatActivity { textView = findViewById(R.id.text); appName = getString(R.string.app_name); - showInstallHistory(); + Intent intent = getIntent(); + if (intent != null && intent.getBooleanExtra(EXTRA_SHOW_FDROID_METRICS, false)) { + showFDroidMetricsReport(); + } else { + showInstallHistory(); + } } private void showInstallHistory() { diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java index efec24dc0..ad10e4669 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java @@ -555,6 +555,9 @@ public class PreferencesFragment extends PreferenceFragmentCompat getContext().getString(R.string.app_name)); Toast.makeText(getContext(), msg, Toast.LENGTH_LONG).show(); installHistoryPref.setTitle(R.string.install_history_and_metrics); + Intent intent = new Intent(getActivity(), InstallHistoryActivity.class); + intent.putExtra(InstallHistoryActivity.EXTRA_SHOW_FDROID_METRICS, true); + startActivity(intent); } else { installHistoryPref.setTitle(R.string.install_history); }