Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 08:33:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tokens are auto managed

Browse Source
This commit is contained in:
M66B
2020-10-26 18:47:05 +01:00
parent 177609ae25
commit 874b8c245e
5 changed files with 7 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -47,7 +47,6 @@ import android.widget.RadioGroup;
import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -72,7 +71,6 @@ import javax.mail.Folder;
import static android.app.Activity.RESULT_OK;
import static com.google.android.material.textfield.TextInputLayout.END_ICON_NONE;
import static com.google.android.material.textfield.TextInputLayout.END_ICON_PASSWORD_TOGGLE;
import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_GMAIL;
import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_OAUTH;
import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_PASSWORD;
@@ -96,7 +94,6 @@ public class FragmentAccount extends FragmentBase {
private TextView tvCharacters;
private Button btnCertificate;
private TextView tvCertificate;
private Button btnOAuth;
private EditText etRealm;
private EditText etName;
@@ -201,7 +198,6 @@ public class FragmentAccount extends FragmentBase {
tvCharacters = view.findViewById(R.id.tvCharacters);
btnCertificate = view.findViewById(R.id.btnCertificate);
tvCertificate = view.findViewById(R.id.tvCertificate);
btnOAuth = view.findViewById(R.id.btnOAuth);
etRealm = view.findViewById(R.id.etRealm);
etName = view.findViewById(R.id.etName);
@@ -289,7 +285,6 @@ public class FragmentAccount extends FragmentBase {
tilPassword.getEditText().setText(null);
certificate = null;
tvCertificate.setText(R.string.title_optional);
btnOAuth.setEnabled(false);
etRealm.setText(null);
cbTrust.setChecked(false);
@@ -363,13 +358,6 @@ public class FragmentAccount extends FragmentBase {
}
});
btnOAuth.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onAuth();
}
});
btnColor.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -1309,49 +1297,6 @@ public class FragmentAccount extends FragmentBase {
}.execute(this, args, "account:save");
}
private void onAuth() {
Bundle args = new Bundle();
args.putLong("id", id);
new SimpleTask<String>() {
@Override
protected void onPreExecute(Bundle args) {
btnOAuth.setEnabled(false);
}
@Override
protected void onPostExecute(Bundle args) {
btnOAuth.setEnabled(true);
}
@Override
protected String onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityAccount account = db.account().getAccount(id);
if (account == null)
return null;
GmailState state = GmailState.jsonDeserialize(account.password);
state.refresh(context, account.user, true);
return state.jsonSerializeString();
}
@Override
protected void onExecuted(Bundle args, String token) {
ToastEx.makeText(getContext(), R.string.title_completed, Toast.LENGTH_LONG).show();
tilPassword.getEditText().setText(token);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex, false);
}
}.execute(this, args, "account:oauth");
}
private void showError(Throwable ex) {
tvError.setText(Log.formatThrowable(ex, false));
grpError.setVisibility(View.VISIBLE);
@@ -1550,9 +1495,6 @@ public class FragmentAccount extends FragmentBase {
btnCertificate.setEnabled(false);
}
if (account == null || account.auth_type != AUTH_TYPE_GMAIL)
Helper.hide((btnOAuth));
cbOnDemand.setEnabled(cbSynchronize.isChecked());
cbPrimary.setEnabled(cbSynchronize.isChecked());