Do not show frequency setting when backups are disabled

Also formatting

Author: farewelltospring

app/src/main/java/org/thoughtcrime/securesms/preferences/BackupFrequencyPickerDialogFragment.kt

@@ -15,7 +15,10 @@ class BackupFrequencyPickerDialogFragment(private val defaultFrequency: BackupFr
 
   override fun onCreateDialog(savedInstance: Bundle?): Dialog {
     val context = requireContext()
-    val localizedFrequencyOptions = frequencyOptions.map { context.getString(it.getResourceId()) }.toTypedArray()
+    val localizedFrequencyOptions = frequencyOptions
+      .map { it.getResourceId() }
+      .map { context.getString(it) }
+      .toTypedArray()
     val defaultIndex = frequencyOptions.indexOf(defaultFrequency)
 
     return MaterialAlertDialogBuilder(context)

app/src/main/java/org/thoughtcrime/securesms/preferences/BackupFrequencyV1.kt

@@ -8,7 +8,7 @@ package org.thoughtcrime.securesms.preferences
 import androidx.annotation.StringRes
 import org.thoughtcrime.securesms.R
 
-enum class BackupFrequencyV1(val days: Int?) {
+enum class BackupFrequencyV1(val days: Int) {
   DAILY(1),
   WEEKLY(7),
   MONTHLY(30),
@@ -25,4 +25,4 @@ enum class BackupFrequencyV1(val days: Int?) {
       NEVER -> R.string.BackupsPreferenceFragment__frequency_label_never
     }
   }
-}
+}

app/src/main/java/org/thoughtcrime/securesms/preferences/BackupsPreferenceFragment.java

@@ -57,10 +57,10 @@ public class BackupsPreferenceFragment extends Fragment {
   private View        create;
   private View        folder;
   private View        verify;
-  private View     timer;
-  private View     frequencyView;
-  private TextView timeLabel;
-  private TextView frequencyLabel;
+  private View        timer;
+  private View        frequencyView;
+  private TextView    timeLabel;
+  private TextView    frequencyLabel;
   private TextView    toggle;
   private TextView    info;
   private TextView    summary;
@@ -344,6 +344,7 @@ private void setBackupsEnabled() {
     create.setVisibility(View.VISIBLE);
     verify.setVisibility(View.VISIBLE);
     timer.setVisibility(View.VISIBLE);
+    frequencyView.setVisibility(View.VISIBLE);
     updateTimeLabel();
     setBackupFolderName();
   }
@@ -354,6 +355,7 @@ private void setBackupsDisabled() {
     folder.setVisibility(View.GONE);
     verify.setVisibility(View.GONE);
     timer.setVisibility(View.GONE);
+    frequencyView.setVisibility(View.GONE);
     AppDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
   }
 }