From feb422c48e0ca57f5fc7b2b44e2099698d634be5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 10 Jan 2021 14:43:52 +0100
Subject: [PATCH] Classifier: changed default, refactoring

---
 .../faircode/email/FragmentOptionsMisc.java   | 20 +++++++++----------
 .../eu/faircode/email/MessageClassifier.java  |  2 +-
 .../main/res/layout/fragment_options_misc.xml |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 50e9efd61d..f8e14f0c5d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -84,8 +84,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private SwitchCompat swShortcuts;
     private SwitchCompat swFts;
     private SwitchCompat swClassification;
-    private TextView tvClassMinChance;
-    private SeekBar sbClassMinChance;
+    private TextView tvClassMinProbability;
+    private SeekBar sbClassMinProbability;
     private TextView tvClassMinDifference;
     private SeekBar sbClassMinDifference;
     private ImageButton ibClassification;
@@ -129,7 +129,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
     private final static String[] RESET_OPTIONS = new String[]{
             "shortcuts", "fts",
-            "classification", "class_min_chance", "class_min_difference",
+            "classification", "class_min_probability", "class_min_difference",
             "language", "watchdog", "updates",
             "experiments", "query_threads", "crash_reports", "cleanup_attachments",
             "protocol", "debug", "auth_plain", "auth_login", "auth_sasl"
@@ -175,8 +175,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         swFts = view.findViewById(R.id.swFts);
         swClassification = view.findViewById(R.id.swClassification);
         ibClassification = view.findViewById(R.id.ibClassification);
-        tvClassMinChance = view.findViewById(R.id.tvClassMinChance);
-        sbClassMinChance = view.findViewById(R.id.sbClassMinChance);
+        tvClassMinProbability = view.findViewById(R.id.tvClassMinProbability);
+        sbClassMinProbability = view.findViewById(R.id.sbClassMinProbability);
         tvClassMinDifference = view.findViewById(R.id.tvClassMinDifference);
         sbClassMinDifference = view.findViewById(R.id.sbClassMinDifference);
         tvFtsIndexed = view.findViewById(R.id.tvFtsIndexed);
@@ -296,10 +296,10 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             }
         });
 
-        sbClassMinChance.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        sbClassMinProbability.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                prefs.edit().putInt("class_min_chance", progress).apply();
+                prefs.edit().putInt("class_min_probability", progress).apply();
             }
 
             @Override
@@ -800,9 +800,9 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
         swClassification.setChecked(prefs.getBoolean("classification", false));
 
-        int class_min_chance = prefs.getInt("class_min_chance", 20);
-        tvClassMinChance.setText(getString(R.string.title_advanced_class_min_chance, NF.format(class_min_chance)));
-        sbClassMinChance.setProgress(class_min_chance);
+        int class_min_chance = prefs.getInt("class_min_probability", 50);
+        tvClassMinProbability.setText(getString(R.string.title_advanced_class_min_chance, NF.format(class_min_chance)));
+        sbClassMinProbability.setProgress(class_min_chance);
 
         int class_min_difference = prefs.getInt("class_min_difference", 50);
         tvClassMinDifference.setText(getString(R.string.title_advanced_class_min_difference, NF.format(class_min_difference)));
diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index cb3faf852c..90c3839225 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -255,7 +255,7 @@ public class MessageClassifier {
         });
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        double class_min_chance = prefs.getInt("class_min_chance", 20) / 100.0;
+        double class_min_chance = prefs.getInt("class_min_probability", 50) / 100.0;
         double class_min_difference = prefs.getInt("class_min_difference", 50) / 100.0;
 
         // Select best class
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 8a92365346..cd6682e8dd 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -134,7 +134,7 @@
             app:srcCompat="@drawable/twotone_info_24" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvClassMinChance"
+            android:id="@+id/tvClassMinProbability"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -146,7 +146,7 @@
             app:layout_constraintTop_toBottomOf="@id/ibClassification" />
 
         <SeekBar
-            android:id="@+id/sbClassMinChance"
+            android:id="@+id/sbClassMinProbability"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:max="100"
@@ -154,7 +154,7 @@
             android:progress="20"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvClassMinChance" />
+            app:layout_constraintTop_toBottomOf="@id/tvClassMinProbability" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvClassMinDifference"
@@ -166,7 +166,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sbClassMinChance" />
+            app:layout_constraintTop_toBottomOf="@id/sbClassMinProbability" />
 
         <SeekBar
             android:id="@+id/sbClassMinDifference"