commit 29cdfe85770a694d003218e0a18edb35781fe348
author Maarten Derks <maarten@fairphone.com> Tue Jul 19 10:24:44 2022 +0200
committer Maarten Derks <maarten@fairphone.com> Tue Jul 19 10:24:44 2022 +0200
tree 9c17fdd3707d7fb31d524a4a016b329cb0b7fabd
parent b72e6f6f30a27f1d5d04d7493976eff2224faee7
parent f5afadd367bebd75a827fd51c232dbd04dc9a45c

Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  Encode authority part of uri before showing in UI

Change-Id: If3373e5b6014af64ce6ee3e797e520f18ab3cbc7

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index f8cb0d3..e8bc1e7 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -372,7 +372,7 @@
         Uri uri = getIntent().getParcelableExtra(KeyChain.EXTRA_URI);
         if (uri != null) {
             String hostMessage = String.format(res.getString(R.string.requesting_server),
-                                               uri.getAuthority());
+                    Uri.encode(uri.getAuthority(), "$,;:@&=+"));
             if (contextMessage == null) {
                 contextMessage = hostMessage;
             } else {