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

Added optional local contacts / filter rules import

Browse Source
pull/200/head
M66B 3 years ago
parent 2ff598509c
commit c845ebc549
3 changed files with 89 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -43,6 +43,7 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -115,6 +116,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
private boolean hasAccount; private boolean hasAccount;
private String password; private String password;
private boolean import_accounts; private boolean import_accounts;
private boolean import_rules;
private boolean import_contacts;
private boolean import_answers; private boolean import_answers;
private boolean import_settings; private boolean import_settings;
@ -313,6 +316,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle")); drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle"));
password = savedInstanceState.getString("fair:password"); password = savedInstanceState.getString("fair:password");
import_accounts = savedInstanceState.getBoolean("fair:import_accounts"); import_accounts = savedInstanceState.getBoolean("fair:import_accounts");
import_rules = savedInstanceState.getBoolean("fair:import_rules");
import_contacts = savedInstanceState.getBoolean("fair:import_contacts");
import_answers = savedInstanceState.getBoolean("fair:import_answers"); import_answers = savedInstanceState.getBoolean("fair:import_answers");
import_settings = savedInstanceState.getBoolean("fair:import_settings"); import_settings = savedInstanceState.getBoolean("fair:import_settings");
} }
@ -332,6 +337,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled()); outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
outState.putString("fair:password", password); outState.putString("fair:password", password);
outState.putBoolean("fair:import_accounts", import_accounts); outState.putBoolean("fair:import_accounts", import_accounts);
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_answers", import_answers);
outState.putBoolean("fair:import_settings", import_settings); outState.putBoolean("fair:import_settings", import_settings);
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
@ -744,6 +751,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
args.putParcelable("uri", data.getData()); args.putParcelable("uri", data.getData());
args.putString("password", this.password); args.putString("password", this.password);
args.putBoolean("import_accounts", this.import_accounts); args.putBoolean("import_accounts", this.import_accounts);
args.putBoolean("import_rules", this.import_rules);
args.putBoolean("import_contacts", this.import_contacts);
args.putBoolean("import_answers", this.import_answers); args.putBoolean("import_answers", this.import_answers);
args.putBoolean("import_settings", this.import_settings); args.putBoolean("import_settings", this.import_settings);
@ -758,6 +767,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
Uri uri = args.getParcelable("uri"); Uri uri = args.getParcelable("uri");
String password = args.getString("password"); String password = args.getString("password");
boolean import_accounts = args.getBoolean("import_accounts"); boolean import_accounts = args.getBoolean("import_accounts");
boolean import_rules = args.getBoolean("import_rules");
boolean import_contacts = args.getBoolean("import_contacts");
boolean import_answers = args.getBoolean("import_answers"); boolean import_answers = args.getBoolean("import_answers");
boolean import_settings = args.getBoolean("import_settings"); boolean import_settings = args.getBoolean("import_settings");
@ -947,52 +958,55 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
Log.i("Imported folder=" + folder.name + " id=" + folder.id + " (" + id + ")"); Log.i("Imported folder=" + folder.name + " id=" + folder.id + " (" + id + ")");
} }
// Contacts if (import_contacts) {
if (jaccount.has("contacts")) { // Contacts
JSONArray jcontacts = jaccount.getJSONArray("contacts"); if (jaccount.has("contacts")) {
for (int c = 0; c < jcontacts.length(); c++) { JSONArray jcontacts = jaccount.getJSONArray("contacts");
JSONObject jcontact = (JSONObject) jcontacts.get(c); for (int c = 0; c < jcontacts.length(); c++) {
EntityContact contact = EntityContact.fromJSON(jcontact); JSONObject jcontact = (JSONObject) jcontacts.get(c);
contact.account = account.id; EntityContact contact = EntityContact.fromJSON(jcontact);
if (db.contact().getContact(contact.account, contact.type, contact.email) == null) contact.account = account.id;
contact.id = db.contact().insertContact(contact); if (db.contact().getContact(contact.account, contact.type, contact.email) == null)
contact.id = db.contact().insertContact(contact);
}
Log.i("Imported contacts=" + jcontacts.length());
} }
Log.i("Imported contacts=" + jcontacts.length());
} }
// Update swipe left/right // Update swipe left/right
db.account().updateAccount(account); db.account().updateAccount(account);
} }
for (EntityRule rule : rules) { if (import_rules)
try { for (EntityRule rule : rules) {
JSONObject jaction = new JSONObject(rule.action); try {
JSONObject jaction = new JSONObject(rule.action);
int type = jaction.getInt("type");
switch (type) { int type = jaction.getInt("type");
case EntityRule.TYPE_MOVE: switch (type) {
case EntityRule.TYPE_COPY: case EntityRule.TYPE_MOVE:
long target = jaction.getLong("target"); case EntityRule.TYPE_COPY:
Log.i("XLAT target " + target + " > " + xFolder.get(target)); long target = jaction.getLong("target");
jaction.put("target", xFolder.get(target)); Log.i("XLAT target " + target + " > " + xFolder.get(target));
break; jaction.put("target", xFolder.get(target));
case EntityRule.TYPE_ANSWER: break;
long identity = jaction.getLong("identity"); case EntityRule.TYPE_ANSWER:
long answer = jaction.getLong("answer"); long identity = jaction.getLong("identity");
Log.i("XLAT identity " + identity + " > " + xIdentity.get(identity)); long answer = jaction.getLong("answer");
Log.i("XLAT answer " + answer + " > " + xAnswer.get(answer)); Log.i("XLAT identity " + identity + " > " + xIdentity.get(identity));
jaction.put("identity", xIdentity.get(identity)); Log.i("XLAT answer " + answer + " > " + xAnswer.get(answer));
jaction.put("answer", xAnswer.get(answer)); jaction.put("identity", xIdentity.get(identity));
break; jaction.put("answer", xAnswer.get(answer));
break;
}
rule.action = jaction.toString();
} catch (JSONException ex) {
Log.e(ex);
} }
rule.action = jaction.toString(); db.rule().insertRule(rule);
} catch (JSONException ex) {
Log.e(ex);
} }
db.rule().insertRule(rule);
}
} }
if (import_settings) { if (import_settings) {
@ -1405,9 +1419,19 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_import, null); View dview = LayoutInflater.from(context).inflate(R.layout.dialog_import, null);
etPassword1 = dview.findViewById(R.id.tilPassword1); etPassword1 = dview.findViewById(R.id.tilPassword1);
CheckBox cbAccounts = dview.findViewById(R.id.cbAccounts); CheckBox cbAccounts = dview.findViewById(R.id.cbAccounts);
CheckBox cbRules = dview.findViewById(R.id.cbRules);
CheckBox cbContacts = dview.findViewById(R.id.cbContacts);
CheckBox cbAnswers = dview.findViewById(R.id.cbAnswers); CheckBox cbAnswers = dview.findViewById(R.id.cbAnswers);
CheckBox cbSettings = dview.findViewById(R.id.cbSettings); CheckBox cbSettings = dview.findViewById(R.id.cbSettings);
cbAccounts.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
cbRules.setEnabled(checked);
cbContacts.setEnabled(checked);
}
});
if (savedInstanceState != null) if (savedInstanceState != null)
etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1")); etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1"));
@ -1424,6 +1448,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
ActivitySetup activity = (ActivitySetup) getActivity(); ActivitySetup activity = (ActivitySetup) getActivity();
activity.password = password1; activity.password = password1;
activity.import_accounts = cbAccounts.isChecked(); activity.import_accounts = cbAccounts.isChecked();
activity.import_rules = cbRules.isChecked();
activity.import_contacts = cbContacts.isChecked();
activity.import_answers = cbAnswers.isChecked(); activity.import_answers = cbAnswers.isChecked();
activity.import_settings = cbSettings.isChecked(); activity.import_settings = cbSettings.isChecked();
getActivity().startActivityForResult( getActivity().startActivityForResult(

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

@ -87,6 +87,28 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImportHint" /> app:layout_constraintTop_toBottomOf="@id/tvImportHint" />
<CheckBox
android:id="@+id/cbRules"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_setup_import_contacts"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImportGmail" />
<CheckBox
android:id="@+id/cbContacts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_setup_import_rules"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbRules" />
<CheckBox <CheckBox
android:id="@+id/cbAnswers" android:id="@+id/cbAnswers"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -95,7 +117,7 @@
android:checked="true" android:checked="true"
android:text="@string/title_setup_import_answers" android:text="@string/title_setup_import_answers"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImportGmail" /> app:layout_constraintTop_toBottomOf="@id/cbContacts" />
<CheckBox <CheckBox
android:id="@+id/cbSettings" android:id="@+id/cbSettings"

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

@ -251,9 +251,11 @@
<string name="title_setup_password_missing">Password missing</string> <string name="title_setup_password_missing">Password missing</string>
<string name="title_setup_password_different">Passwords don\'t match</string> <string name="title_setup_password_different">Passwords don\'t match</string>
<string name="title_setup_password_invalid">Password invalid</string> <string name="title_setup_password_invalid">Password invalid</string>
<string name="title_setup_import_accounts">Import accounts</string> <string name="title_setup_import_accounts">Import accounts and identities</string>
<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_answers">Import reply templates</string>
<string name="title_setup_import_settings">Import settings</string> <string name="title_setup_import_settings">Import options</string>
<string name="title_setup_exported">Settings exported</string> <string name="title_setup_exported">Settings exported</string>
<string name="title_setup_imported">Settings imported</string> <string name="title_setup_imported">Settings imported</string>
<string name="title_setup_import_invalid">Invalid settings file</string> <string name="title_setup_import_invalid">Invalid settings file</string>

Write Preview
Loading…
Cancel
Save