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

Allow editing POP3 folder properties

Browse Source
pull/189/head
M66B 5 years ago
parent 051f2eb124
commit b05ef291e5
3 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -531,8 +531,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (!folder.read_only) if (!folder.read_only)
popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_rules, order++, R.string.title_edit_rules); popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_rules, order++, R.string.title_edit_rules);
popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_properties, order++, R.string.title_edit_properties); }
popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_properties, order++, R.string.title_edit_properties);
if (folder.account != null && folder.accountProtocol == EntityAccount.TYPE_IMAP) {
if (folder.notify && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (folder.notify && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
String channelId = EntityFolder.getNotificationChannelId(folder.id); String channelId = EntityFolder.getNotificationChannelId(folder.id);
NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@ -771,7 +774,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast( lbm.sendBroadcast(
new Intent(ActivityView.ACTION_EDIT_FOLDER) new Intent(ActivityView.ACTION_EDIT_FOLDER)
.putExtra("id", folder.id)); .putExtra("id", folder.id)
.putExtra("imap", folder.accountProtocol == EntityAccount.TYPE_IMAP));
} }
@RequiresApi(api = Build.VERSION_CODES.O) @RequiresApi(api = Build.VERSION_CODES.O)

48
app/src/main/java/eu/faircode/email/FragmentFolder.java
Unescape View File

@ -78,11 +78,13 @@ public class FragmentFolder extends FragmentBase {
private ContentLoadingProgressBar pbSave; private ContentLoadingProgressBar pbSave;
private TextView tvInboxRootHint; private TextView tvInboxRootHint;
private ContentLoadingProgressBar pbWait; private ContentLoadingProgressBar pbWait;
private Group grpImap;
private Group grpParent; private Group grpParent;
private Group grpPoll; private Group grpPoll;
private Group grpAutoDelete; private Group grpAutoDelete;
private long id = -1; private long id = -1;
private boolean imap = true;
private long account = -1; private long account = -1;
private String parent = null; private String parent = null;
private boolean saving = false; private boolean saving = false;
@ -99,6 +101,7 @@ public class FragmentFolder extends FragmentBase {
// Get arguments // Get arguments
Bundle args = getArguments(); Bundle args = getArguments();
id = args.getLong("id", -1); id = args.getLong("id", -1);
imap = args.getBoolean("imap", true);
account = args.getLong("account", -1); account = args.getLong("account", -1);
parent = args.getString("parent"); parent = args.getString("parent");
} }
@ -135,6 +138,7 @@ public class FragmentFolder extends FragmentBase {
pbSave = view.findViewById(R.id.pbSave); pbSave = view.findViewById(R.id.pbSave);
tvInboxRootHint = view.findViewById(R.id.tvInboxRootHint); tvInboxRootHint = view.findViewById(R.id.tvInboxRootHint);
pbWait = view.findViewById(R.id.pbWait); pbWait = view.findViewById(R.id.pbWait);
grpImap = view.findViewById(R.id.grpImap);
grpParent = view.findViewById(R.id.grpParent); grpParent = view.findViewById(R.id.grpParent);
grpPoll = view.findViewById(R.id.grpPoll); grpPoll = view.findViewById(R.id.grpPoll);
grpAutoDelete = view.findViewById(R.id.grpAutoDelete); grpAutoDelete = view.findViewById(R.id.grpAutoDelete);
@ -160,14 +164,14 @@ public class FragmentFolder extends FragmentBase {
cbPoll.setEnabled(isChecked); cbPoll.setEnabled(isChecked);
etPoll.setEnabled(isChecked); etPoll.setEnabled(isChecked);
tvPoll.setEnabled(isChecked); tvPoll.setEnabled(isChecked);
grpPoll.setVisibility(isChecked && cbPoll.isChecked() ? View.VISIBLE : View.GONE); grpPoll.setVisibility(imap && isChecked && cbPoll.isChecked() ? View.VISIBLE : View.GONE);
} }
}); });
cbPoll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbPoll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
grpPoll.setVisibility(cbPoll.isEnabled() && isChecked ? View.VISIBLE : View.GONE); grpPoll.setVisibility(imap && cbPoll.isEnabled() && isChecked ? View.VISIBLE : View.GONE);
} }
}); });
@ -207,9 +211,10 @@ public class FragmentFolder extends FragmentBase {
}); });
// Initialize // Initialize
Helper.setViewsEnabled(view, false);
grpImap.setVisibility(imap ? View.VISIBLE : View.GONE);
tvParent.setText(parent); tvParent.setText(parent);
grpParent.setVisibility(parent == null ? View.GONE : View.VISIBLE); grpParent.setVisibility(parent == null ? View.GONE : View.VISIBLE);
Helper.setViewsEnabled(view, false);
grpAutoDelete.setVisibility(View.GONE); grpAutoDelete.setVisibility(View.GONE);
btnSave.setEnabled(false); btnSave.setEnabled(false);
pbSave.setVisibility(View.GONE); pbSave.setVisibility(View.GONE);
@ -286,7 +291,7 @@ public class FragmentFolder extends FragmentBase {
else else
etKeepDays.setText(Integer.toString(folder == null ? EntityFolder.DEFAULT_KEEP : folder.keep_days)); etKeepDays.setText(Integer.toString(folder == null ? EntityFolder.DEFAULT_KEEP : folder.keep_days));
if (folder != null && folder.read_only) if (!imap || (folder != null && folder.read_only))
grpAutoDelete.setVisibility(View.GONE); grpAutoDelete.setVisibility(View.GONE);
else { else {
cbAutoDelete.setText(folder != null && EntityFolder.TRASH.equals(folder.type) cbAutoDelete.setText(folder != null && EntityFolder.TRASH.equals(folder.type)
@ -306,7 +311,7 @@ public class FragmentFolder extends FragmentBase {
cbPoll.setEnabled(cbSynchronize.isChecked() && always); cbPoll.setEnabled(cbSynchronize.isChecked() && always);
etPoll.setEnabled(cbSynchronize.isChecked() && always); etPoll.setEnabled(cbSynchronize.isChecked() && always);
tvPoll.setEnabled(cbSynchronize.isChecked() && always); tvPoll.setEnabled(cbSynchronize.isChecked() && always);
grpPoll.setVisibility(cbPoll.isEnabled() && cbPoll.isChecked() ? View.VISIBLE : View.GONE); grpPoll.setVisibility(imap && cbPoll.isEnabled() && cbPoll.isChecked() ? View.VISIBLE : View.GONE);
etKeepDays.setEnabled(!cbKeepAll.isChecked()); etKeepDays.setEnabled(!cbKeepAll.isChecked());
cbAutoDelete.setEnabled(!cbKeepAll.isChecked()); cbAutoDelete.setEnabled(!cbKeepAll.isChecked());
btnSave.setEnabled(true); btnSave.setEnabled(true);
@ -416,6 +421,7 @@ public class FragmentFolder extends FragmentBase {
: etKeepDays.getText().toString()); : etKeepDays.getText().toString());
args.putBoolean("auto_delete", cbAutoDelete.isChecked()); args.putBoolean("auto_delete", cbAutoDelete.isChecked());
args.putBoolean("imap", imap);
args.putBoolean("should", should); args.putBoolean("should", should);
new SimpleTask<Boolean>() { new SimpleTask<Boolean>() {
@ -456,6 +462,7 @@ public class FragmentFolder extends FragmentBase {
boolean auto_delete = args.getBoolean("auto_delete"); boolean auto_delete = args.getBoolean("auto_delete");
boolean pro = ActivityBilling.isPro(context); boolean pro = ActivityBilling.isPro(context);
boolean imap = args.getBoolean("imap");
boolean should = args.getBoolean("should"); boolean should = args.getBoolean("should");
if (color == Color.TRANSPARENT || !pro) if (color == Color.TRANSPARENT || !pro)
@ -467,6 +474,11 @@ public class FragmentFolder extends FragmentBase {
int keep_days = (TextUtils.isEmpty(keep) ? EntityFolder.DEFAULT_KEEP : Integer.parseInt(keep)); int keep_days = (TextUtils.isEmpty(keep) ? EntityFolder.DEFAULT_KEEP : Integer.parseInt(keep));
if (keep_days < sync_days) if (keep_days < sync_days)
keep_days = sync_days; keep_days = sync_days;
if (!imap) {
sync_days = Integer.MAX_VALUE;
keep_days = Integer.MAX_VALUE;
}
int poll_factor = (TextUtils.isEmpty(factor) ? 1 : Integer.parseInt(factor)); int poll_factor = (TextUtils.isEmpty(factor) ? 1 : Integer.parseInt(factor));
if (poll_factor < 1) if (poll_factor < 1)
poll_factor = 1; poll_factor = 1;
@ -498,18 +510,20 @@ public class FragmentFolder extends FragmentBase {
return true; return true;
if (!Objects.equals(folder.synchronize, synchronize)) if (!Objects.equals(folder.synchronize, synchronize))
return true; return true;
if (!Objects.equals(folder.poll, poll)) if (imap) {
return true; if (!Objects.equals(folder.poll, poll))
if (!Objects.equals(folder.poll_factor, poll_factor)) return true;
return true; if (!Objects.equals(folder.poll_factor, poll_factor))
if (!Objects.equals(folder.download, download)) return true;
return true; if (!Objects.equals(folder.download, download))
if (!Objects.equals(folder.sync_days, sync_days)) return true;
return true; if (!Objects.equals(folder.sync_days, sync_days))
if (!Objects.equals(folder.keep_days, keep_days)) return true;
return true; if (!Objects.equals(folder.keep_days, keep_days))
if (!Objects.equals(folder.auto_delete, auto_delete)) return true;
return true; if (!Objects.equals(folder.auto_delete, auto_delete))
return true;
}
return false; return false;
} }

9
app/src/main/res/layout/fragment_folder.xml
Unescape View File

@ -350,6 +350,15 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpImap"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="
cbSynchronize,cbPoll,cbDownload,
tvSyncDays,tvSyncDaysRemark,btnInfo,etSyncDays,
tvKeepDays,tvKeepDaysRemark,etKeepDays,cbKeepAll" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpParent" android:id="@+id/grpParent"
android:layout_width="0dp" android:layout_width="0dp"

Write Preview
Loading…
Cancel
Save