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

Import/export saved searches

Browse Source
pull/210/head
M66B 2 years ago
parent 3373771682
commit bc19d5ddea
5 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File

26
app/src/main/java/eu/faircode/email/ActivitySetup.java
Unescape View File

@ -138,6 +138,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
private boolean import_rules;
private boolean import_contacts;
private boolean import_answers;
private boolean import_searches;
private boolean import_settings;
static final int REQUEST_SOUND_INBOUND = 1;
@ -364,6 +365,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
import_rules = savedInstanceState.getBoolean("fair:import_rules");
import_contacts = savedInstanceState.getBoolean("fair:import_contacts");
import_answers = savedInstanceState.getBoolean("fair:import_answers");
import_searches = savedInstanceState.getBoolean("fair:import_searches");
import_settings = savedInstanceState.getBoolean("fair:import_settings");
}
@ -386,6 +388,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
outState.putBoolean("fair:import_rules", import_rules);
outState.putBoolean("fair:import_contacts", import_contacts);
outState.putBoolean("fair:import_answers", import_answers);
outState.putBoolean("fair:import_searches", import_searches);
outState.putBoolean("fair:import_settings", import_settings);
super.onSaveInstanceState(outState);
}
@ -777,6 +780,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
for (EntityAnswer answer : db.answer().getAnswers(true))
janswers.put(answer.toJSON());
// Searches
JSONArray jsearches = new JSONArray();
for (EntitySearch search : db.search().getSearches())
jsearches.put(search.toJSON());
// Certificates
JSONArray jcertificates = new JSONArray();
for (EntityCertificate certificate : db.certificate().getCertificates())
@ -815,6 +823,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
JSONObject jexport = new JSONObject();
jexport.put("accounts", jaccounts);
jexport.put("answers", janswers);
jexport.put("searches", jsearches);
jexport.put("certificates", jcertificates);
jexport.put("settings", jsettings);
@ -970,6 +979,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
args.putBoolean("import_rules", this.import_rules);
args.putBoolean("import_contacts", this.import_contacts);
args.putBoolean("import_answers", this.import_answers);
args.putBoolean("import_searches", this.import_searches);
args.putBoolean("import_settings", this.import_settings);
new SimpleTask<Void>() {
@ -995,6 +1005,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
boolean import_rules = args.getBoolean("import_rules");
boolean import_contacts = args.getBoolean("import_contacts");
boolean import_answers = args.getBoolean("import_answers");
boolean import_searches = args.getBoolean("import_searches");
boolean import_settings = args.getBoolean("import_settings");
EntityLog.log(context, "Importing " + uri +
" accounts=" + import_accounts +
@ -1002,6 +1013,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
" rules=" + import_rules +
" contacts=" + import_contacts +
" answers=" + import_answers +
" searches=" + import_searches +
" settings=" + import_settings);
NoStreamException.check(uri, context);
@ -1099,6 +1111,18 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
}
if (import_searches && jimport.has("searches")) {
postProgress(context.getString(R.string.title_setup_import_searches), null);
JSONArray jsearches = jimport.getJSONArray("searches");
for (int s = 0; s < jsearches.length(); s++) {
JSONObject jsearch = (JSONObject) jsearches.get(s);
EntitySearch search = EntitySearch.fromJSON(jsearch);
search.id = null;
db.search().insertSearch(search);
}
}
if (import_accounts) {
EntityAccount primary = db.account().getPrimaryAccount();
@ -2056,6 +2080,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
CheckBox cbRules = dview.findViewById(R.id.cbRules);
CheckBox cbContacts = dview.findViewById(R.id.cbContacts);
CheckBox cbAnswers = dview.findViewById(R.id.cbAnswers);
CheckBox cbSearches = dview.findViewById(R.id.cbSearches);
CheckBox cbSettings = dview.findViewById(R.id.cbSettings);
cbAccounts.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@ -2089,6 +2114,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
activity.import_rules = cbRules.isChecked();
activity.import_contacts = cbContacts.isChecked();
activity.import_answers = cbAnswers.isChecked();
activity.import_searches = cbSearches.isChecked();
activity.import_settings = cbSettings.isChecked();
getActivity().startActivityForResult(
Helper.getChooser(context, getIntentImport()), REQUEST_IMPORT);

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

@ -33,6 +33,9 @@ public interface DaoSearch {
" ORDER BY `order`, name COLLATE NOCASE")
LiveData<List<EntitySearch>> liveSearch();
@Query("SELECT * FROM search")
List<EntitySearch> getSearches();
@Insert
long insertSearch(EntitySearch search);

26
app/src/main/java/eu/faircode/email/EntitySearch.java
Unescape View File

@ -23,6 +23,9 @@ import androidx.annotation.NonNull;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.Objects;
@Entity(
@ -44,6 +47,29 @@ public class EntitySearch {
@NonNull
public String data;
public JSONObject toJSON() throws JSONException {
JSONObject json = new JSONObject();
json.put("id", id);
json.put("name", name);
json.put("order", order);
json.put("color", color);
json.put("data", data);
return json;
}
public static EntitySearch fromJSON(JSONObject json) throws JSONException {
EntitySearch search = new EntitySearch();
// id
search.name = json.getString("name");
if (json.has("order"))
search.order = json.getInt("order");
if (json.has("color"))
search.order = json.getInt("color");
search.data = json.getString("data");
return search;
}
@Override
public boolean equals(Object obj) {
if (obj instanceof EntitySearch) {

13
app/src/main/res/layout/dialog_import.xml
Unescape View File

@ -119,6 +119,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbContacts" />
<CheckBox
android:id="@+id/cbSearches"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_setup_import_searches"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbAnswers" />
<CheckBox
android:id="@+id/cbSettings"
android:layout_width="0dp"
@ -128,6 +139,6 @@
android:text="@string/title_setup_import_settings"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbAnswers" />
app:layout_constraintTop_toBottomOf="@id/cbSearches" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>

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

@ -304,6 +304,7 @@
<string name="title_setup_import_rules">Import filter rules</string>
<string name="title_setup_import_contacts">Import local contacts</string>
<string name="title_setup_import_answers">Import reply templates</string>
<string name="title_setup_import_searches">Import saved searches</string>
<string name="title_setup_import_settings">Import options</string>
<string name="title_setup_exported">Settings exported</string>
<string name="title_setup_imported">Settings imported</string>

Write Preview
Loading…
Cancel
Save