mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made search index a pro feature

This commit is contained in:
M66B 2020-01-16 18:21:03 +01:00
parent e8a7920dca
commit 6b67e3cf63
7 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PLAYSTORE.txt
View File

@ -73,7 +73,7 @@ All pro features are convenience or advanced features.
* Reply templates
* Accept/decline calendar invitations
* Filter rules
* Search on server
* Search indexing, search on server
* Keyword management
* S/MIME sign/encrypt
* Biometric authentication

2
README.md
View File

@ -92,7 +92,7 @@ All pro features are convenience or advanced features.
* Reply templates
* Accept/decline calendar invitations
* Filter rules ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq71))
* Search on server ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq13))
* Search indexing, search on server ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq13))
* Keyword management
* S/MIME sign/encrypt
* Biometric authentication ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq113))

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

@ -187,7 +187,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean fts = prefs.getBoolean("fts", false);
if (fts && seen == null && flagged == null && snoozed == null && encrypted == null) {
boolean pro = ActivityBilling.isPro(context);
if (fts && pro && seen == null && flagged == null && snoozed == null && encrypted == null) {
if (state.ids == null) {
SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
state.ids = FtsDbHelper.match(sdb, folder, query);

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

@ -52,6 +52,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
private SwitchCompat swExternalSearch;
private SwitchCompat swFts;
private TextView tvFtsIndexed;
private TextView tvFtsPro;
private SwitchCompat swEnglish;
private SwitchCompat swWatchdog;
private SwitchCompat swUpdates;
@ -95,6 +96,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swExternalSearch = view.findViewById(R.id.swExternalSearch);
swFts = view.findViewById(R.id.swFts);
tvFtsIndexed = view.findViewById(R.id.tvFtsIndexed);
tvFtsPro = view.findViewById(R.id.tvFtsPro);
swEnglish = view.findViewById(R.id.swEnglish);
swWatchdog = view.findViewById(R.id.swWatchdog);
swUpdates = view.findViewById(R.id.swUpdates);
@ -165,6 +167,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
}
});
Helper.linkPro(tvFtsPro);
swEnglish.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {

3
app/src/main/java/eu/faircode/email/WorkerFts.java
View File

@ -110,7 +110,8 @@ public class WorkerFts extends Worker {
try {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean fts = prefs.getBoolean("fts", true);
if (fts) {
boolean pro = ActivityBilling.isPro(context);
if (fts && pro) {
Log.i("Queuing " + getName());
OneTimeWorkRequest.Builder builder = new OneTimeWorkRequest.Builder(WorkerFts.class);

13
app/src/main/res/layout/fragment_options_misc.xml
View File

@ -60,6 +60,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvFtsHint" />
<TextView
android:id="@+id/tvFtsPro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_pro_feature"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvFtsIndexed" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swEnglish"
android:layout_width="0dp"
@ -68,7 +79,7 @@
android:text="@string/title_advanced_english"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvFtsIndexed"
app:layout_constraintTop_toBottomOf="@id/tvFtsPro"
app:switchPadding="12dp" />
<TextView

2
metadata/en-US/full_description.txt
View File

@ -73,7 +73,7 @@ All pro features are convenience or advanced features.
* Reply templates
* Accept/decline calendar invitations
* Filter rules
* Search on server
* Search indexing, search on server
* Keyword management
* S/MIME sign/encrypt
* Biometric authentication