msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Added option to disable partial words search after FTS"

Browse Source 
This reverts commit c9b0d0ae4a.
pull/213/head
M66B 1 year ago
parent e8be216da2
commit 89f473821e
5 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File

15
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
Unescape View File

@ -108,8 +108,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
interface IBoundaryCallbackMessages {
void onLoading();
void onScan();
void onLoaded(int found);
void onWarning(String message);
@ -327,19 +325,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
db.endTransaction();
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean fts_fallback = prefs.getBoolean("fts_fallback", true);
if (!fts_fallback || state.ids.size() > 0 || state.matches != null)
if (state.ids.size() > 0)
return found;
else
ApplicationEx.getMainHandler().post(new Runnable() {
@Override
public void run() {
if (intf != null)
intf.onScan();
}
});
}
while (found < pageSize && !state.destroyed) {

25
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -365,7 +365,6 @@ public class FragmentMessages extends FragmentBase
private boolean reset = false;
private boolean initialized = false;
private boolean loading = false;
private boolean scan = false;
private boolean swiping = false;
private boolean scrolling = false;
private boolean navigating = false;
@ -6863,7 +6862,6 @@ public class FragmentMessages extends FragmentBase
initialized = false;
loading = false;
scan = false;
vmodel.setCallback(getViewLifecycleOwner(), callback);
vmodel.setObserver(getViewLifecycleOwner(), observer);
}
@ -6872,15 +6870,9 @@ public class FragmentMessages extends FragmentBase
@Override
public void onLoading() {
loading = true;
scan = false;
updateListState("Loading", SimpleTask.getCount(), adapter == null ? 0 : adapter.getItemCount());
}
public void onScan() {
scan = true;
updateListState("Scan", SimpleTask.getCount(), adapter == null ? 0 : adapter.getItemCount());
}
@Override
public void onLoaded(int found) {
loading = false;
@ -6996,18 +6988,12 @@ public class FragmentMessages extends FragmentBase
(language_detection && !TextUtils.isEmpty(filter_language) && !outbox));
boolean none = (items == 0 && initialized);
boolean partial = (viewType == AdapterMessage.ViewType.SEARCH && !server && loading && scan && items == 0);
boolean searching = (viewType == AdapterMessage.ViewType.SEARCH && server && (!initialized || loading) && items == 0);
boolean filtered = (filter_active && viewType != AdapterMessage.ViewType.SEARCH);
pbWait.setVisibility(loading || tasks > 0 ? View.VISIBLE : View.GONE);
if (partial)
tvNoEmail.setText(R.string.title_search_device_scan);
else if (searching)
tvNoEmail.setText(R.string.title_search_server_wait);
else
tvNoEmail.setText(R.string.title_no_messages);
tvNoEmail.setVisibility(none || scan || searching ? View.VISIBLE : View.GONE);
tvNoEmail.setText(searching ? R.string.title_search_server_wait : R.string.title_no_messages);
tvNoEmail.setVisibility(none || searching ? View.VISIBLE : View.GONE);
tvNoEmailHint.setVisibility(none && filtered ? View.VISIBLE : View.GONE);
if (BuildConfig.DEBUG)
@ -7015,11 +7001,8 @@ public class FragmentMessages extends FragmentBase
Log.i("List state who=" + Helper.getWho(this) + "" +
" reason=" + reason +
" tasks=" + tasks +
" initialized=" + initialized +
" loading=" + loading +
" scan=" + scan +
" items=" + items +
" tasks=" + tasks + " loading=" + loading +
" items=" + items + " initialized=" + initialized +
" wait=" + (pbWait.getVisibility() == View.VISIBLE) +
" no=" + (tvNoEmail.getVisibility() == View.VISIBLE));
}

14
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
Unescape View File

@ -115,7 +115,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
private SwitchCompat swExternalAnswer;
private SwitchCompat swShortcuts;
private SwitchCompat swFts;
private SwitchCompat swFtsFallback;
private SwitchCompat swClassification;
private TextView tvClassMinProbability;
private SeekBar sbClassMinProbability;
@ -280,7 +279,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
private static final long MIN_FILE_SIZE = 1024 * 1024L;
private final static String[] RESET_OPTIONS = new String[]{
"sort_answers", "shortcuts", "fts", "fts_fallback",
"sort_answers", "shortcuts", "fts",
"classification", "class_min_probability", "class_min_difference",
"show_filtered",
"language",
@ -369,7 +368,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swExternalAnswer = view.findViewById(R.id.swExternalAnswer);
swShortcuts = view.findViewById(R.id.swShortcuts);
swFts = view.findViewById(R.id.swFts);
swFtsFallback = view.findViewById(R.id.swFtsFallback);
swClassification = view.findViewById(R.id.swClassification);
ibClassification = view.findViewById(R.id.ibClassification);
tvClassMinProbability = view.findViewById(R.id.tvClassMinProbability);
@ -588,7 +586,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("fts", checked).apply();
swFtsFallback.setEnabled(checked);
WorkerFts.init(getContext(), true);
@ -622,13 +619,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
}
});
swFtsFallback.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("fts_fallback", checked).apply();
}
});
Helper.linkPro(tvFtsPro);
swClassification.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@ -2487,8 +2477,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swExternalAnswer.setChecked(Helper.isComponentEnabled(getContext(), ActivityAnswer.class));
swShortcuts.setChecked(prefs.getBoolean("shortcuts", true));
swFts.setChecked(prefs.getBoolean("fts", false));
swFtsFallback.setChecked(prefs.getBoolean("fts_fallback", true));
swFtsFallback.setEnabled(swFts.isChecked());
swClassification.setChecked(prefs.getBoolean("classification", false));

16
app/src/main/res/layout/fragment_options_misc.xml
Unescape View File

@ -179,30 +179,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swFts" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swFtsFallback"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_fts_fallback"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvFtsHint"
app:switchPadding="12dp" />
<TextView
android:id="@+id/tvFtsIndexed"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="48dp"
android:text="@string/title_advanced_fts_indexed"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swFtsFallback" />
app:layout_constraintTop_toBottomOf="@id/tvFtsHint" />
<TextView
android:id="@+id/tvFtsPro"

2
app/src/main/res/values/strings.xml
Unescape View File

@ -811,7 +811,6 @@
<string name="title_advanced_external_answer" translatable="false">Provide reply templates to other apps</string>
<string name="title_advanced_shortcuts">Show frequently used contacts in Android share menu</string>
<string name="title_advanced_fts">Build search index</string>
<string name="title_advanced_fts_fallback">Continue with partial word search</string>
<string name="title_advanced_fts_indexed">%1$d / %2$d messages indexed (%3$s)</string>
<string name="title_advanced_classification">Classify messages</string>
<string name="title_advanced_class_min_chance">Minimum class probability: %1$s %%</string>
@ -1805,7 +1804,6 @@
<string name="title_search_flag_size">size &gt; %1$s</string>
<string name="title_search_device">Search on device</string>
<string name="title_search_device_scan">Searching with partial words</string>
<string name="title_search_server">Search on server</string>
<string name="title_search_server_wait">Waiting for server</string>
<string name="title_search_in">Search in</string>

Write Preview
Loading…
Cancel
Save