Fixed rebuilding URIs

This commit is contained in:
M66B 2019-04-18 07:48:03 +02:00
parent 7c2e141394
commit 5af0dd9708
1 changed files with 12 additions and 10 deletions

View File

@ -1781,25 +1781,27 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (!TextUtils.isEmpty(scheme)) if (!TextUtils.isEmpty(scheme))
builder.scheme(scheme); builder.scheme(scheme);
String authority = uri.getAuthority(); String authority = uri.getEncodedAuthority();
if (!TextUtils.isEmpty(authority)) if (!TextUtils.isEmpty(authority))
builder.authority(authority); builder.encodedAuthority(authority);
String path = uri.getPath(); String path = uri.getEncodedPath();
if (!TextUtils.isEmpty(path)) if (!TextUtils.isEmpty(path))
builder.path(path); builder.encodedPath(path);
for (String key : uri.getQueryParameterNames()) { for (String key : uri.getQueryParameterNames())
Log.i("Query " + key + "=" + uri.getQueryParameter(key));
if (!PARANOID_QUERY.contains(key.toLowerCase())) if (!PARANOID_QUERY.contains(key.toLowerCase()))
builder.appendQueryParameter(key, uri.getQueryParameter(key)); for (String value : uri.getQueryParameters(key))
} builder.appendQueryParameter(key, value);
String fragment = uri.getFragment(); String fragment = uri.getEncodedFragment();
if (!TextUtils.isEmpty(fragment)) if (!TextUtils.isEmpty(fragment))
builder.fragment(fragment); builder.encodedFragment(fragment);
_uri = builder.build(); _uri = builder.build();
Log.i("Source uri=" + uri);
Log.i("Target uri=" + _uri);
} else } else
_uri = uri; _uri = uri;