Show a different title when wait for account ready timed out

Bug: 30805764

Change-Id: I7d8a9b2c7892fe51d1c0de677a7d7cd4a08048d0
(cherry picked from commit 16edc882c52689b595f2b1a8be5d965cd4863aa1)

Author: alexchau-google

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

@@ -26,6 +26,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.support.annotation.StringRes;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
@@ -54,7 +55,7 @@ public class EnableProfileActivity extends Activity implements NavigationBar.Nav
     private Button mFinishButton;
     private SetupWizardLayout mSetupWizardLayout;
 
-    private boolean mEnableProfileNow;
+    private CheckInState mCheckinState;
 
     public static final String EXTRA_ENABLE_PROFILE_NOW = "enable_profile_now";
     private static final IntentFilter sIntentFilter =
@@ -64,9 +65,11 @@ public class EnableProfileActivity extends Activity implements NavigationBar.Nav
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mEnableProfileNow = getIntent().getBooleanExtra(EXTRA_ENABLE_PROFILE_NOW, false);
+
+        mCheckinState = new CheckInState(this);
         if (savedInstanceState == null) {
-            if (mEnableProfileNow) {
+            if (getIntent().getBooleanExtra(EXTRA_ENABLE_PROFILE_NOW, false)) {
+                mCheckinState.setFirstAccountState(CheckInState.FIRST_ACCOUNT_STATE_READY);
                 ProvisioningUtil.enableProfile(this);
             } else {
                 // Set up an alarm to enable profile in case we do not receive first account ready
@@ -120,8 +123,7 @@ protected void onResume() {
         LocalBroadcastManager.getInstance(this).registerReceiver(mCheckInStateReceiver,
                 sIntentFilter);
         // In case the broadcast is sent before we register the receiver.
-        CheckInState checkInState = new CheckInState(this);
-        refreshUi(mEnableProfileNow || checkInState.isFirstAccountReady() /* enableFinish */);
+        refreshUi();
     }
 
     @Override
@@ -140,16 +142,30 @@ private boolean isAccountMigrated(String addedAccount) {
         return false;
     }
 
-    private void refreshUi(boolean enableFinish) {
+    private void refreshUi() {
+        boolean enableFinish;
+        @StringRes int headerTextResId;
+        switch (mCheckinState.getFirstAccountState()) {
+            case CheckInState.FIRST_ACCOUNT_STATE_READY:
+                enableFinish = true;
+                headerTextResId = R.string.finish_setup;
+                break;
+            case CheckInState.FIRST_ACCOUNT_STATE_TIMEOUT:
+                enableFinish = true;
+                headerTextResId = R.string.finish_setup_account_not_ready;
+                break;
+            case CheckInState.FIRST_ACCOUNT_STATE_PENDING:
+            default:
+                enableFinish = false;
+                headerTextResId = R.string.waiting_for_first_account_check_in;
+                break;
+        }
         if (enableFinish) {
             mSetupWizardLayout.hideProgressBar();
         } else {
             mSetupWizardLayout.showProgressBar();
         }
-        mSetupWizardLayout.setHeaderText(
-                (enableFinish)
-                        ? R.string.finish_setup
-                        : R.string.waiting_for_first_account_check_in);
+        mSetupWizardLayout.setHeaderText(headerTextResId);
         mFinishButton.setEnabled(enableFinish);
     }
 
@@ -167,7 +183,7 @@ class CheckInStateReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             // Processed the first check-in broadcast, allow user to tap the finish button.
-            refreshUi(true);
+            refreshUi();
         }
     }
 }

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

@@ -51,8 +51,14 @@ public void onReceive(Context context, Intent intent) {
         if (FIRST_ACCOUNT_READY_ACTION.equals(action) ||
                 FIRST_ACCOUNT_READY_TIMEOUT_ACTION.equals(action)) {
             CheckInState checkInState = new CheckInState(context);
-            if (!checkInState.isFirstAccountReady()) {
-                checkInState.setFirstAccountReady();
+            if (checkInState.getFirstAccountState() == CheckInState.FIRST_ACCOUNT_STATE_PENDING) {
+                int nextState;
+                if (FIRST_ACCOUNT_READY_ACTION.equals(action)) {
+                    nextState = CheckInState.FIRST_ACCOUNT_STATE_READY;
+                } else {
+                    nextState = CheckInState.FIRST_ACCOUNT_STATE_TIMEOUT;
+                }
+                checkInState.setFirstAccountState(nextState);
                 ProvisioningUtil.enableProfile(context);
             }
             // This receiver is disabled in ProvisioningUtil.enableProfile, no more code should

app/src/main/java/com/afwsamples/testdpc/provision/CheckInState.java

@@ -26,7 +26,12 @@ public class CheckInState {
     private SharedPreferences mSharedPreferences;
     private Context mContext;
 
-    private static final String KEY_FIRST_ACCOUNT_READY = "first_account_ready";
+    public static final int FIRST_ACCOUNT_STATE_PENDING = 0;
+    public static final int FIRST_ACCOUNT_STATE_READY = 1;
+    public static final int FIRST_ACCOUNT_STATE_TIMEOUT = 2;
+
+    private static final String KEY_FIRST_ACCOUNT_STATE = "first_account_state";
+
     /**
      * Broadcast Action: FIRST_ACCOUNT_READY broadcast is processed.
      */
@@ -38,13 +43,15 @@ public CheckInState(Context context) {
         mContext = context.getApplicationContext();
     }
 
-    public boolean isFirstAccountReady() {
-        return mSharedPreferences.getBoolean(KEY_FIRST_ACCOUNT_READY, false);
+    public int getFirstAccountState() {
+        return mSharedPreferences.getInt(KEY_FIRST_ACCOUNT_STATE, FIRST_ACCOUNT_STATE_PENDING);
     }
 
-    public void setFirstAccountReady() {
-        mSharedPreferences.edit().putBoolean(KEY_FIRST_ACCOUNT_READY, true).apply();
-        LocalBroadcastManager.getInstance(mContext).sendBroadcast(
-                new Intent(FIRST_ACCOUNT_READY_PROCESSED_ACTION));
+    public void setFirstAccountState(int state) {
+        mSharedPreferences.edit().putInt(KEY_FIRST_ACCOUNT_STATE, state).apply();
+        if (state != FIRST_ACCOUNT_STATE_PENDING) {
+            LocalBroadcastManager.getInstance(mContext).sendBroadcast(
+                    new Intent(FIRST_ACCOUNT_READY_PROCESSED_ACTION));
+        }
     }
 }

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

@@ -33,6 +33,7 @@
     <string name="setup_label">Set up</string>
     <string name="profile_name">Sample Managed Profile</string>
     <string name="finish_setup">Finish setup</string>
+    <string name="finish_setup_account_not_ready">Finish setup but account might not be ready</string>
     <string name="setup_finished">Setup finished</string>
     <string name="click_finish_to_complete">Click Finish to complete setup.</string>
     <string name="waiting_for_first_account_check_in">Putting finishing touches</string>