Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-28 00:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplification

Browse Source 
This reverts commit 104fa6f8c4.
This commit is contained in:
M66B
2019-05-23 15:24:44 +02:00
parent a7ce90c2db
commit 6703cb80ac
4 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@@ -121,7 +121,6 @@ public class FragmentIdentity extends FragmentBase {
private Group grpAdvanced;
private long id = -1;
private long account = -1;
private boolean saving = false;
private int auth_type = ConnectionHelper.AUTH_TYPE_PASSWORD;
private int color = Color.TRANSPARENT;
@@ -134,7 +133,6 @@ public class FragmentIdentity extends FragmentBase {
// Get arguments
Bundle args = getArguments();
id = args.getLong("id", -1);
account = args.getLong("account", -1);
}
@Override
@@ -214,11 +212,9 @@ public class FragmentIdentity extends FragmentBase {
auth_type = account.auth_type;
// Select associated provider
if (position == 0) {
if (position == 0)
spProvider.setSelection(0);
etHost.setText(account.host.replace("imap", "smtp"));
etPort.setText(null);
} else {
else {
boolean found = false;
for (int pos = 1; pos < spProvider.getAdapter().getCount(); pos++) {
EmailProvider provider = (EmailProvider) spProvider.getItemAtPosition(pos);
@@ -896,7 +892,7 @@ public class FragmentIdentity extends FragmentBase {
spAccount.setSelection(0);
for (int pos = 0; pos < accounts.size(); pos++) {
EntityAccount account = accounts.get(pos);
if (account.id.equals(identity == null ? FragmentIdentity.this.account : identity.account)) {
if (account.id.equals((identity == null ? -1 : identity.account))) {
spAccount.setTag(pos);
spAccount.setSelection(pos);
// OAuth token could be updated