am 477d2ea4: Merge "Add dialog when installing HS 2.0 credentials while wifi is off." into mnc-dev

* commit '477d2ea4810dea406ffb285f778186e40e871018':
  Add dialog when installing HS 2.0 credentials while wifi is off.

4 files changed, 19 insertions, 4 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e148628..cc02a95 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <permission android:name="com.android.certinstaller.INSTALL_AS_USER"
                 android:protectionLevel="signature" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application android:label="@string/app_name"
                  android:allowBackup="false">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6aca7a6..e1d909c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -105,4 +105,7 @@
     <string name="wifi_installer_detail">Install Wi-Fi credentials to connect to networks available via <xliff:g id="name">%1$s</xliff:g>&#46;</string>
     <string name="wifi_installer_download_error">Downloaded file has problems and can\'t be installed&#46; Make sure you downloaded the file from the correct source&#46;</string>
     <string name="wifi_installer_fail">Can\'t install Wi-Fi credentials&#46; Try downloading the file again&#46;</string>
+    <string name="wifi_installer_fail_no_wifi_title">Installation cancelled</string>
+    <string name="wifi_installer_fail_title">Installation Failed</string>
+    <string name="wifi_installer_fail_no_wifi">Turn on Wi-Fi and try again&#46;</string>
 </resources>
diff --git a/src/com/android/certinstaller/CredentialsInstallDialog.java b/src/com/android/certinstaller/CredentialsInstallDialog.java
index 3c86469..53a44ec 100644
--- a/src/com/android/certinstaller/CredentialsInstallDialog.java
+++ b/src/com/android/certinstaller/CredentialsInstallDialog.java
@@ -48,12 +48,16 @@ public class CredentialsInstallDialog extends Activity {
         Bundle bundle = getIntent().getExtras();
         int installState = getIntent().getIntExtra(INSTALL_STATE, 0);
         TextView text = (TextView) layout.findViewById(R.id.credential_installed_content);
-        if (installState == 1) {
+        if (installState == WiFiInstaller.INSTALL_SUCCESS) {
             String networkName = bundle.getString(NETWORK_NAME);
             text.setText(String.format(getResources().getString(R.string.install_done), networkName));
             builder.setTitle(getResources().getString(R.string.install_done_title));
-        } else {
+        } else if (installState == WiFiInstaller.INSTALL_FAIL){
             text.setText(getResources().getString(R.string.wifi_installer_fail));
+            builder.setTitle(R.string.wifi_installer_fail_title);
+        } else if (installState == WiFiInstaller.INSTALL_FAIL_NO_WIFI) {
+            text.setText(getResources().getString(R.string.wifi_installer_fail_no_wifi));
+            builder.setTitle(R.string.wifi_installer_fail_no_wifi_title);
         }
         builder.setPositiveButton(R.string.done_label, new DialogInterface.OnClickListener() {
             @Override
diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java
index aa58c22..ee74cda 100644
--- a/src/com/android/certinstaller/WiFiInstaller.java
+++ b/src/com/android/certinstaller/WiFiInstaller.java
@@ -27,6 +27,9 @@ public class WiFiInstaller extends Activity {
     private static final String TAG = "WifiInstaller";
     private static final String NETWORK_NAME = "network_name";
     private static final String INSTALL_STATE = "install_state";
+    public static final int INSTALL_SUCCESS = 2;
+    public static final int INSTALL_FAIL = 1;
+    public static final int INSTALL_FAIL_NO_WIFI = 0;
     WifiConfiguration mWifiConfiguration;
     WifiManager mWifiManager;
     boolean doNotInstall;
@@ -102,12 +105,16 @@ public class WiFiInstaller extends Activity {
                         Intent intent = new Intent(getApplicationContext(),
                                 CredentialsInstallDialog.class);
                         intent.putExtra(NETWORK_NAME, mWifiConfiguration.providerFriendlyName);
-                        intent.putExtra(INSTALL_STATE, 1);
+                        intent.putExtra(INSTALL_STATE, INSTALL_SUCCESS);
                         startActivity(intent);
                     } else {
                         Intent intent = new Intent(getApplicationContext(),
                                 CredentialsInstallDialog.class);
-                        intent.putExtra(INSTALL_STATE, 0);
+                        if (!mWifiManager.isWifiEnabled()) {
+                            intent.putExtra(INSTALL_STATE, INSTALL_FAIL_NO_WIFI);
+                        } else {
+                            intent.putExtra(INSTALL_STATE, INSTALL_FAIL);
+                        }
                         startActivity(intent);
                     }
                     dialog.dismiss();