Make sending of statistics into a setting

Counterpart of chatmail/core#6851

Author: Hocuri

jni/deltachat-core-rust

@@ -73,6 +73,7 @@ public class DcHelper {
     public static final String CONFIG_VERIFIED_ONE_ON_ONE_CHATS = "verified_one_on_one_chats";
     public static final String CONFIG_WEBXDC_REALTIME_ENABLED = "webxdc_realtime_enabled";
     public static final String CONFIG_PRIVATE_TAG = "private_tag";
+    public static final String CONFIG_SELF_REPORTING = "self_reporting";
 
     public static DcContext getContext(@NonNull Context context) {
         return ApplicationContext.getInstance(context).dcContext;

src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java

@@ -5,6 +5,7 @@
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_BCC_SELF;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MVBOX_MOVE;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ONLY_FETCH_MVBOX;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SELF_REPORTING;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SENTBOX_WATCH;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SHOW_EMAILS;
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_WEBXDC_REALTIME_ENABLED;
@@ -20,6 +21,7 @@
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -39,6 +41,7 @@
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
+import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.StreamUtil;
@@ -59,6 +62,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
 
   private ListPreference showEmails;
   CheckBoxPreference sentboxWatchCheckbox;
+  CheckBoxPreference selfReportingCheckbox;
   CheckBoxPreference bccSelfCheckbox;
   CheckBoxPreference mvboxMoveCheckbox;
   CheckBoxPreference onlyFetchMvboxCheckbox;
@@ -212,22 +216,21 @@ public void onCreate(Bundle paramBundle) {
       });
     }
 
-    Preference selfReporting = this.findPreference("pref_self_reporting");
-    if (selfReporting != null) {
-      selfReporting.setOnPreferenceClickListener(((preference) -> {
-        try {
-          int chatId = getRpc(requireActivity()).draftSelfReport(dcContext.getAccountId());
-
-          Intent intent = new Intent(requireActivity(), ConversationActivity.class);
-          intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
-          intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-          requireActivity().startActivity(intent);
-        } catch (RpcException e) {
-          Log.e(TAG, "Error calling rpc.draftSelfReport()", e);
-        }
+    selfReportingCheckbox = this.findPreference("pref_self_reporting");
+    if (selfReportingCheckbox != null) {
+      selfReportingCheckbox.setOnPreferenceChangeListener((preference, newValue) -> {
+        boolean enabled = (Boolean) newValue;
+        dcContext.setConfigInt(CONFIG_SELF_REPORTING, enabled? 1 : 0);
 
+        if (enabled) {
+          new AlertDialog.Builder(getActivity())
+                  .setMessage(R.string.send_stats_thanks)
+                  .setPositiveButton(android.R.string.ok, null)
+                  .setNegativeButton(R.string.more_info_desktop, (_d, _w) -> IntentUtils.showInBrowser(getContext(), "TODO[blog post]"))
+                  .show();
+        }
         return true;
-      }));
+      });
     }
 
     Preference proxySettings = this.findPreference("proxy_settings_button");
@@ -274,6 +277,7 @@ public void onResume() {
     updateListSummary(showEmails, value);
 
     sentboxWatchCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_SENTBOX_WATCH));
+    selfReportingCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_SELF_REPORTING));
     bccSelfCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_BCC_SELF));
     mvboxMoveCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_MVBOX_MOVE));
     onlyFetchMvboxCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_ONLY_FETCH_MVBOX));

src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java

@@ -823,7 +823,8 @@
     <string name="disable_imap_idle">Disable IMAP IDLE</string>
     <string name="disable_imap_idle_explain">Do not use IMAP IDLE extension even if the server supports it. Enabling this option will delay message retrieval, enable it only for testing.</string>
     <string name="send_stats_to_devs">Send statistics to Delta Chat\'s developers</string>
-
+    <string name="send_stats_to_devs_explanation">Send statistics about how you are using Delta Chat. They help us improve the security of Delta Chat. You can see exactly what data is being sent.</string>
+    <string name="send_stats_thanks">Thank you for sending statistics about your Delta Chat usage!</string>
 
     <!-- Emoji picker and categories -->
     <string name="emoji_search_results">Search Results</string>

src/main/res/values/strings.xml

@@ -11,8 +11,11 @@
         android:summary="@string/enable_realtime_explain"
         android:title="@string/enable_realtime"/>
 
-    <Preference android:key="pref_self_reporting"
-        android:title="@string/send_stats_to_devs"/>
+    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="pref_self_reporting"
+        android:title="@string/send_stats_to_devs"
+        android:summary="@string/send_stats_to_devs_explanation"/>
 
     <PreferenceCategory android:title="@string/pref_experimental_features">