Merge pull request #91 from kaczmarkiewiczp/crash-reporting

patrykcoding · web-flow · commit 2472d140d4a1 · 2018-06-01T15:31:31.000-06:00
Add option to disable anonymous crash reports
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
         android:resource="@drawable/ic_notification" />
     <meta-data android:name="com.google.firebase.messaging.default_notification_color"
         android:resource="@color/white" />
+    <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/MainActivity.java
@@ -55,6 +55,7 @@
 import ca.pkay.rcloneexplorer.Fragments.RemotesFragment;
 import ca.pkay.rcloneexplorer.Items.RemoteItem;
 import es.dmoral.toasty.Toasty;
+import io.fabric.sdk.android.Fabric;
 
 public class MainActivity extends AppCompatActivity
         implements  NavigationView.OnNavigationItemSelectedListener,
@@ -78,13 +79,18 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean enableCrashReports = sharedPreferences.getBoolean(getString(R.string.pref_key_crash_reports), true);
+        if (enableCrashReports) {
+            Fabric.with(this, new Crashlytics());
+        }
+
         applyTheme();
         context = this;
         setContentView(R.layout.activity_main);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/SettingsActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/SettingsActivity.java
@@ -16,10 +16,12 @@
 import android.widget.ImageView;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.firebase.messaging.FirebaseMessaging;
 
 import ca.pkay.rcloneexplorer.Dialogs.ColorPickerDialog;
+import es.dmoral.toasty.Toasty;
 
 public class SettingsActivity extends AppCompatActivity {
 
@@ -36,6 +38,8 @@ public class SettingsActivity extends AppCompatActivity {
     private Switch useLogsSwitch;
     private View useLogsElement;
     private Switch appUpdatesSwitch;
+    private View crashReportsElement;
+    private Switch crashReportsSwitch;
     private boolean isDarkTheme;
     private boolean themeHasChanged;
 
@@ -105,17 +109,21 @@ private void getViews() {
         appUpdatesSwitch = findViewById(R.id.app_updates_switch);
         useLogsSwitch = findViewById(R.id.use_logs_switch);
         useLogsElement = findViewById(R.id.use_logs);
+        crashReportsElement = findViewById(R.id.crash_reporting);
+        crashReportsSwitch = findViewById(R.id.crash_reporting_switch);
     }
 
     private void setDefaultStates() {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         boolean isDarkTheme = sharedPreferences.getBoolean(getString(R.string.pref_key_dark_theme), false);
         boolean useLogs = sharedPreferences.getBoolean(getString(R.string.pref_key_logs), false);
         boolean appUpdates = sharedPreferences.getBoolean(getString(R.string.pref_key_app_updates), true);
+        boolean crashReports = sharedPreferences.getBoolean(getString(R.string.pref_key_crash_reports), true);
 
         darkThemeSwitch.setChecked(isDarkTheme);
         useLogsSwitch.setChecked(useLogs);
         appUpdatesSwitch.setChecked(appUpdates);
+        crashReportsSwitch.setChecked(crashReports);
     }
 
     private void setClickListeners() {
@@ -147,16 +155,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 onDarkThemeClicked(isChecked);
             }
         });
-        useLogsElement.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (useLogsSwitch.isChecked()) {
-                    useLogsSwitch.setChecked(false);
-                } else {
-                    useLogsSwitch.setChecked(true);
-                }
-            }
-        });
         notificationsElement.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -179,12 +177,38 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 onAppUpdatesClicked(isChecked);
             }
         });
+        useLogsElement.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (useLogsSwitch.isChecked()) {
+                    useLogsSwitch.setChecked(false);
+                } else {
+                    useLogsSwitch.setChecked(true);
+                }
+            }
+        });
         useLogsSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 onUseLogsClicked(isChecked);
             }
         });
+        crashReportsElement.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (crashReportsSwitch.isChecked()) {
+                    crashReportsSwitch.setChecked(false);
+                } else {
+                    crashReportsSwitch.setChecked(true);
+                }
+            }
+        });
+        crashReportsSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                crashReportsClicked(isChecked);
+            }
+        });
     }
 
     private void showPrimaryColorPicker() {
@@ -294,4 +318,13 @@ private void onUseLogsClicked(boolean isChecked) {
         editor.putBoolean(getString(R.string.pref_key_logs), isChecked);
         editor.apply();
     }
+
+    private void crashReportsClicked(boolean isChecked) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putBoolean(getString(R.string.pref_key_crash_reports), isChecked);
+        editor.apply();
+
+        Toasty.info(this, getString(R.string.restart_required), Toast.LENGTH_SHORT, true).show();
+    }
 }
diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml
@@ -318,6 +318,45 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/crash_reporting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingTop="24dp"
+            android:paddingBottom="24dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?selectableItemBackground" >
+
+            <ImageView
+                android:id="@+id/crash_reporting_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_centerVertical="true"
+                android:tint="?attr/iconTint"
+                android:src="@drawable/ic_bug_report"
+                android:contentDescription="@string/crash_reporting_icon_content_description" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="32dp"
+                android:paddingEnd="0dp"
+                android:layout_toEndOf="@id/crash_reporting_icon"
+                android:textColor="?attr/textColorPrimary"
+                android:textStyle="bold"
+                android:text="@string/send_anonymous_crash_reports"/>
+
+            <Switch
+                android:id="@+id/crash_reporting_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true" />
+
+        </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -128,7 +128,7 @@
     <string name="pref_primary_color_title">Primary Color</string>
     <string name="pref_accent_color_title">Accent Color</string>
     <string name="pref_header_look_and_feel">Look and Feel</string>
-    <string name="restart_required">App restart may be required</string>
+    <string name="restart_required">App restart is required</string>
     <string name="select_primary_color">Select a primary color</string>
     <string name="select_accent_color">Select an accent color</string>
     <string name="title_activity_about_libs">AboutLibsActivity</string>
@@ -142,6 +142,7 @@
     <string name="pref_key_color_accent">pref_key_color_accent</string>
     <string name="pref_key_dark_theme">pref_key_dark_theme</string>
     <string name="pref_key_app_updates">pref_key_app_updates</string>
+    <string name="pref_key_crash_reports">pref_key_crash_reports</string>
     <string name="pref_key_version_code">pref_key_version_code</string>
     <string name="look_and_feel">Look and Feel</string>
     <string name="primary_color_content_desc">Primary color</string>
@@ -293,4 +294,6 @@
     <string name="selected_cache_expiry">Cache expiry time: %1$s</string>
     <string name="cache_size">Cache size</string>
     <string name="selected_cache_size">Cache size: %1$s</string>
+    <string name="crash_reporting_icon_content_description">Crash reporting icon</string>
+    <string name="send_anonymous_crash_reports">Send anonymous crash reports</string>
 </resources>
