Skip to content

Commit c2f0c7f

Browse files
committed
Error handling in AddAccountActivity in TestDPC
Change-Id: I876b7fe23a3fb8538effd8394769b3d96a808f6d Bug: 29382125
1 parent be1cc57 commit c2f0c7f

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

app/src/main/java/com/afwsamples/testdpc/AddAccountActivity.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import android.view.View;
3232
import android.widget.EditText;
3333
import android.widget.RadioGroup;
34+
import android.widget.Toast;
3435

3536
import com.android.setupwizardlib.SetupWizardLayout;
3637
import com.android.setupwizardlib.view.NavigationBar;
@@ -58,6 +59,8 @@ protected void onCreate(Bundle savedInstanceState) {
5859
setContentView(R.layout.activity_add_account);
5960
SetupWizardLayout layout = (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
6061
layout.getNavigationBar().setNavigationBarListener(this);
62+
NavigationBar navigationBar = layout.getNavigationBar();
63+
navigationBar.getBackButton().setEnabled(false);
6164

6265
Bundle extras = getIntent().getExtras();
6366
if (extras != null) {
@@ -92,6 +95,9 @@ public void run(AccountManagerFuture<Bundle> accountManagerFuture) {
9295
} catch (OperationCanceledException | AuthenticatorException
9396
| IOException e) {
9497
Log.e(TAG, "addAccount - failed", e);
98+
Toast.makeText(AddAccountActivity.this,
99+
R.string.fail_to_add_account, Toast.LENGTH_LONG).show();
100+
return;
95101
}
96102
Log.d(TAG, "addAccount - isAccountAdded: " + isAccountAdded
97103
+ ", accountNameAdded: " + accountNameAdded);
@@ -134,7 +140,5 @@ public void onClick(DialogInterface dialogInterface, int i) {
134140
}
135141

136142
@Override
137-
public void onNavigateBack() {
138-
onBackPressed();
139-
}
143+
public void onNavigateBack() {}
140144
}

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<string name="add_account_with_name">Add account with name</string>
5151
<string name="add_account_skip">Skip</string>
5252
<string name="add_account_dialog_title">Account name:</string>
53+
<string name="fail_to_add_account">Fail to add account</string>
5354
<string name="icon">Icon</string>
5455
<string name="manage_apps">Manage applications</string>
5556
<string name="reset">Reset</string>

0 commit comments

Comments
 (0)