diff options
author | Robin Lee <rgl@google.com> | 2015-05-14 06:36:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 06:36:24 +0000 |
commit | d806ebb7a681510330fea7958d5be4618b186c69 (patch) | |
tree | 1a61e1d1360d446f939adb0e4d6130e2c8206052 | |
parent | f246829990173b23aa3743b78e2a1cf64d209f0d (diff) | |
parent | 67c838de37d8c3658391a46aba83dca522ab26f8 (diff) | |
download | android_packages_apps_KeyChain-d806ebb7a681510330fea7958d5be4618b186c69.tar.gz android_packages_apps_KeyChain-d806ebb7a681510330fea7958d5be4618b186c69.tar.bz2 android_packages_apps_KeyChain-d806ebb7a681510330fea7958d5be4618b186c69.zip |
am 67c838de: Merge "Replace String host:port/url args with Uri arg" into mnc-dev
* commit '67c838de37d8c3658391a46aba83dca522ab26f8':
Replace String host:port/url args with Uri arg
-rw-r--r-- | src/com/android/keychain/KeyChainActivity.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java index 7b31702..0bb7bba 100644 --- a/src/com/android/keychain/KeyChainActivity.java +++ b/src/com/android/keychain/KeyChainActivity.java @@ -27,6 +27,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.IBinder; @@ -177,14 +178,11 @@ public class KeyChainActivity extends Activity { IDevicePolicyManager devicePolicyManager = IDevicePolicyManager.Stub.asInterface( ServiceManager.getService(Context.DEVICE_POLICY_SERVICE)); - String host = getIntent().getStringExtra(KeyChain.EXTRA_HOST); - int port = getIntent().getIntExtra(KeyChain.EXTRA_PORT, -1); - String url = getIntent().getStringExtra(KeyChain.EXTRA_URL); + Uri uri = getIntent().getParcelableExtra(KeyChain.EXTRA_URI); String alias = getIntent().getStringExtra(KeyChain.EXTRA_ALIAS); - try { int uid = ActivityManagerNative.getDefault().getLaunchedFromUid(getActivityToken()); - devicePolicyManager.choosePrivateKeyAlias(uid, host, port, url, alias, callback); + devicePolicyManager.choosePrivateKeyAlias(uid, uri, alias, callback); } catch (RemoteException e) { Log.e(TAG, "Unable to request alias from DevicePolicyManager", e); // Proceed without a suggested alias. @@ -283,17 +281,11 @@ public class KeyChainActivity extends Activity { } String appMessage = String.format(res.getString(R.string.requesting_application), applicationLabel); - String contextMessage = appMessage; - String host = getIntent().getStringExtra(KeyChain.EXTRA_HOST); - if (host != null) { - String hostString = host; - int port = getIntent().getIntExtra(KeyChain.EXTRA_PORT, -1); - if (port != -1) { - hostString += ":" + port; - } + Uri uri = getIntent().getParcelableExtra(KeyChain.EXTRA_URI); + if (uri != null) { String hostMessage = String.format(res.getString(R.string.requesting_server), - hostString); + uri.getAuthority()); if (contextMessage == null) { contextMessage = hostMessage; } else { |