From e4295fb3fa786259eb0def27e0b2129ae0b9f785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Szcz=C4=99k?= <k_szczek@protonmail.ch>
Date: Fri, 13 Dec 2019 11:48:01 +0100
Subject: [PATCH] Use a dialog option instead of a checkbox

---
 .../giga/ui/fragment/MissionsFragment.java         |  8 ++------
 app/src/main/res/layout/delete_files_checkbox.xml  | 14 --------------
 app/src/main/res/values/strings.xml                |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 app/src/main/res/layout/delete_files_checkbox.xml

diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index edaa01e0f..98231cffe 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -190,14 +190,10 @@ public class MissionsFragment extends Fragment {
                 return true;
             case R.id.clear_list:
                 AlertDialog.Builder prompt = new AlertDialog.Builder(mContext);
-                View checkBoxView = View.inflate(this.getContext(), R.layout.delete_files_checkbox, null);
                 prompt.setTitle(R.string.clear_finished_download);
                 prompt.setMessage(R.string.confirm_prompt);
-                prompt.setView(checkBoxView);
-                prompt.setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                    CheckBox checkBox = checkBoxView.findViewById(R.id.delete_files_checkbox);
-                    mAdapter.clearFinishedDownloads(checkBox.isChecked());
-                });
+                prompt.setPositiveButton(R.string.clear_finished_download, (dialog, which) -> mAdapter.clearFinishedDownloads(false));
+                prompt.setNeutralButton(R.string.delete_downloaded_files, (dialog, which) -> mAdapter.clearFinishedDownloads(true));
                 prompt.setNegativeButton(R.string.cancel, null);
                 prompt.create().show();
                 return true;
diff --git a/app/src/main/res/layout/delete_files_checkbox.xml b/app/src/main/res/layout/delete_files_checkbox.xml
deleted file mode 100644
index cbc6ecd10..000000000
--- a/app/src/main/res/layout/delete_files_checkbox.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="15dp">
-
-    <CheckBox
-        android:id="@+id/delete_files_checkbox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/delete_downloaded_files"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3899583b..94a50972f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -570,7 +570,7 @@
     <string name="error_timeout">Connection timeout</string>
     <string name="error_download_resource_gone">Cannot recover this download</string>
     <string name="clear_finished_download">Clear finished downloads</string>
-    <string name="confirm_prompt">Are you sure?</string>
+    <string name="confirm_prompt">Do you want to clear your download history or delete all downloaded files?</string>
     <string name="stop">Stop</string>
     <string name="max_retry_msg">Maximum retries</string>
     <string name="max_retry_desc">Maximum number of attempts before canceling the download</string>