awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

streamline oauth2 start an remove update-provider-info side-effect

Browse Source
This commit is contained in:
B. Petersen
2020-01-31 22:55:00 +01:00
parent 11b0cf1d8b
commit be462abccf
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/RegistrationActivity.java
+19 -4
View File
@@ -217,12 +217,14 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
@Override
public void onSuccess(Boolean oauth2started) {
if(!oauth2started) {
updateProviderInfo();
onLogin();
}
}
@Override
public void onFailure(ExecutionException e) {
updateProviderInfo();
onLogin();
}
});
@@ -247,12 +249,25 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
}
private void focusListener(View view, boolean focused, VerificationType type) {
if (!focused) {
TextInputEditText inputEditText = (TextInputEditText) view;
switch (type) {
case EMAIL:
verifyEmail(inputEditText);
checkOauth2start();
checkOauth2start().addListener(new ListenableFuture.Listener<Boolean>() {
@Override
public void onSuccess(Boolean oauth2started) {
if(!oauth2started) {
updateProviderInfo();
}
}
@Override
public void onFailure(ExecutionException e) {
updateProviderInfo();
}
});
break;
case SERVER:
verifyServer(inputEditText);
@@ -266,6 +281,9 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
private long oauth2Requested = 0;
// this function checks if oauth2 is available for a given email address
// and and asks the user if one wants to start oauth2.
// the function returns the future "true" if oauth2 was started and "false" otherwise.
private ListenableFuture<Boolean> checkOauth2start() {
SettableFuture<Boolean> oauth2started = new SettableFuture<>();
@@ -282,7 +300,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
.setTitle(R.string.login_info_oauth2_title)
.setMessage(R.string.login_info_oauth2_text)
.setNegativeButton(R.string.cancel, (dialog, which)->{
updateProviderInfo();
oauth2started.set(false);
})
.setPositiveButton(R.string.perm_continue, (dialog, which)-> {
@@ -294,12 +311,10 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
.setCancelable(false)
.show();
} else {
updateProviderInfo();
oauth2started.set(false);
}
}
else {
updateProviderInfo();
oauth2started.set(false);
}