Commit d1d1fc2d authored by Unknown's avatar Unknown

Merge branch 'Improve_Account_Manager_Setup' into eelo-0.1

parents c3928f03 90822288
......@@ -28,7 +28,6 @@ public class EAccountManagerActivity extends SubBaseActivity {
public static final String TAG = EAccountManagerActivity.class.getSimpleName();
private static boolean isInit = false;
private AccountManager accountManager = null;
@Override
......@@ -63,12 +62,15 @@ public class EAccountManagerActivity extends SubBaseActivity {
}
private void launchAccountManagerSetup() {
isInit = true;
try {
accountManager = AccountManager.get(this);
accountManager.addAccount("bitfire.at.davdroid.eelo", null, null, null, this, null, null);
accountManager.addAccount("bitfire.at.davdroid.eelo", null, null, null, this, new AccountManagerCallback<Bundle>() {
@Override
public void run(AccountManagerFuture<Bundle> future) {
// An eelo account has been added, continue to the next screen
onNavigateNext();
}
}, null);
}
catch (Exception e) {}
finally {}
......@@ -78,26 +80,4 @@ public class EAccountManagerActivity extends SubBaseActivity {
protected int getSubactivityNextTransition() {
return TRANSITION_ID_SLIDE;
}
@Override
protected void onResume() {
super.onResume();
if (isInit == false)
return;
try {
Account[] accounts = accountManager.getAccounts();
if (accounts != null) {
// An eelo account has been created, goto the next screen
onNavigateNext();
}
}
catch (Exception e) {
onNavigateNext();
}
finally {}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment