move conversion of relative URLs to absolute to Picasso request transformer

Author: or-else

app/src/main/java/co/tinode/tindroid/MembersAdapter.java

@@ -169,10 +169,14 @@ static class Member {
         Member(int position, String unique, String displayName, String avatar, boolean removable) {
             this.position = position;
             this.unique = unique;
+            this.removable = removable;
             this.displayName = displayName;
             this.avatarBitmap = null;
-            this.avatarUri = avatar != null ? Uri.parse(avatar) : null;
-            this.removable = removable;
+            if (avatar != null) {
+                this.avatarUri = Uri.parse(avatar);
+            } else {
+                this.avatarUri = null;
+            }
         }
 
         Member(int position, String unique, VxCard pub, boolean removable) {

app/src/main/java/co/tinode/tindroid/TindroidApp.java

@@ -22,6 +22,7 @@
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
@@ -36,6 +37,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Date;
 import java.util.Map;
 
@@ -55,6 +57,7 @@
 import co.tinode.tinodesdk.Tinode;
 import co.tinode.tinodesdk.model.MsgServerData;
 import co.tinode.tinodesdk.model.MsgServerInfo;
+
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
@@ -267,10 +270,11 @@ public void onInfoMessage(MsgServerInfo info) {
         OkHttpClient client = new OkHttpClient.Builder()
                 .cache(new okhttp3.Cache(createDefaultCacheDir(this), PICASSO_CACHE_SIZE))
                 .addInterceptor(chain -> {
+                    Tinode tinode = Cache.getTinode();
                     Request picassoReq = chain.request();
                     Map<String, String> headers;
-                    if (Cache.getTinode().isTrustedURL(picassoReq.url().url()) &&
-                            (headers = Cache.getTinode().getRequestHeaders()) != null) {
+                    if (tinode.isTrustedURL(picassoReq.url().url())) {
+                        headers = tinode.getRequestHeaders();
                         Request.Builder builder = picassoReq.newBuilder();
                         for (Map.Entry<String, String> el : headers.entrySet()) {
                             builder = builder.addHeader(el.getKey(), el.getValue());
@@ -282,6 +286,16 @@ public void onInfoMessage(MsgServerInfo info) {
                 })
                 .build();
         Picasso.setSingletonInstance(new Picasso.Builder(this)
+                .requestTransformer(request -> {
+                    // Rewrite relative URIs to absolute.
+                    if (request.uri != null && Tinode.isUrlRelative(request.uri.toString())) {
+                        URL url = Cache.getTinode().toAbsoluteURL(request.uri.toString());
+                        if (url != null) {
+                            return request.buildUpon().setUri(Uri.parse(url.toString())).build();
+                        }
+                    }
+                    return Picasso.RequestTransformer.IDENTITY.transformRequest(request);
+                })
                 .downloader(new OkHttp3Downloader(client))
                 .build());
 

app/src/main/java/co/tinode/tindroid/UiUtils.java

@@ -239,8 +239,8 @@ private static void constructToolbarLogo(final Activity activity, final VxCard p
             Drawable placeholder = bmp != null ?
                     (new RoundImageDrawable(res, bmp)) :
                     ResourcesCompat.getDrawable(res, R.drawable.disk, null);
-            layers.setUrlByLayerId(res, LOGO_LAYER_AVATAR, Cache.getTinode().toAbsoluteURL(ref).toString(),
-                placeholder, R.drawable.ic_broken_image_round);
+            layers.setUrlByLayerId(res, LOGO_LAYER_AVATAR, ref, placeholder,
+                    R.drawable.ic_broken_image_round);
         }
 
         if (online != null) {
@@ -732,19 +732,19 @@ static void acceptAvatar(final Activity activity, final ImageView avatarContaine
     // Construct avatar from VxCard and set it to the provided ImageView.
     static void setAvatar(ImageView avatarView, VxCard pub, String address, boolean disabled) {
         Bitmap avatar = null;
-        URL ref = null;
+        String ref = null;
         String fullName = null;
         if (pub != null) {
             avatar = pub.getBitmap();
             fullName = pub.fn;
-            ref = Cache.getTinode().toAbsoluteURL(pub.getPhotoRef());
+            ref = pub.getPhotoRef();
         }
 
         Drawable local = avatarDrawable(avatarView.getContext(), avatar, fullName, address, disabled);
         if (ref != null) {
             Picasso
                     .get()
-                    .load(ref.toString())
+                    .load(ref)
                     .resize(UiUtils.MAX_AVATAR_SIZE, UiUtils.MAX_AVATAR_SIZE)
                     .placeholder(local)
                     .error(R.drawable.ic_broken_image_round)
@@ -837,11 +837,11 @@ public static Bitmap avatarBitmap(Context context, VxCard pub, Topic.TopicType t
         String fullName = null;
         if (pub != null) {
             fullName = pub.fn;
-            URL ref = Cache.getTinode().toAbsoluteURL(pub.getPhotoRef());
+            String ref = pub.getPhotoRef();
             if (ref != null) {
                 try {
                     bitmap = Picasso.get()
-                            .load(ref.toString())
+                            .load(ref)
                             .resize(size, size).get();
                 } catch (IOException ex) {
                     Log.w(TAG, "Failed to load avatar", ex);

app/src/main/java/co/tinode/tindroid/account/ContactOperations.java

@@ -223,7 +223,7 @@ ContactOperations addAvatar(byte[] avatar, final Tinode tinode, final String ref
         if (ref != null) {
             try {
                 avatar = UiUtils.bitmapToBytes(Picasso.get()
-                        .load(tinode.toAbsoluteURL(ref).toString())
+                        .load(ref)
                         .resize(UiUtils.MAX_AVATAR_SIZE, UiUtils.MAX_AVATAR_SIZE).centerCrop()
                         .get(), mimeType);
             } catch (IOException ex) {

app/src/main/java/co/tinode/tindroid/format/ThumbnailTransformer.java

@@ -60,7 +60,7 @@ public Drafty.Node transform(Drafty.Node node) {
                 components = new LinkedList<>();
             }
             components.add(done);
-            Picasso.get().load(Cache.getTinode().toAbsoluteURL((String) val).toString()).into(new Target() {
+            Picasso.get().load((String) val).into(new Target() {
                 @Override
                 public void onBitmapLoaded(Bitmap bmp, Picasso.LoadedFrom from) {
                     bmp = UiUtils.scaleSquareBitmap(bmp, UiUtils.REPLY_THUMBNAIL_DIM);

tinodesdk/src/main/java/co/tinode/tinodesdk/Tinode.java

@@ -41,6 +41,7 @@
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Pattern;
 
 import co.tinode.tinodesdk.model.AuthScheme;
 import co.tinode.tinodesdk.model.ClientMessage;
@@ -2191,20 +2192,34 @@ protected ServerMessage parseServerMessageFromJson(String jsonMessage) {
         return msg.isValid() ? msg : null;
     }
 
+
+    /**
+     * Checks if URL is a relative url, i.e. has no 'scheme://', including the case of missing scheme '//'.
+     * The scheme is expected to be RFC-compliant, e.g. [a-z][a-z0-9+.-]*
+     * example.html - ok
+     * https:example.com - not ok.
+     * http:/example.com - not ok.
+     * ↲ https://example.com' - not ok. (↲ means carriage return)
+     */
+    public static boolean isUrlRelative(@NotNull String url) {
+        Pattern re = Pattern.compile("^\\s*([a-z][a-z0-9+.-]*:|//)",
+                Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+        return !re.matcher(url).matches();
+    }
+
     /**
      * Convert relative URL to absolute URL using Tinode server address as base.
      * If the URL is already absolute it's left unchanged.
      *
      * @param origUrl possibly relative URL to convert to absolute.
      * @return absolute URL or {@code null} if origUrl is invalid.
      */
-    public URL toAbsoluteURL(String origUrl) {
+    public @Nullable URL toAbsoluteURL(@NotNull String origUrl) {
         URL url = null;
         try {
             url = new URL(getBaseUrl(), origUrl);
         } catch (MalformedURLException ignored) {
         }
-
         return url;
     }
 
@@ -2224,7 +2239,7 @@ public boolean isTrustedURL(@NotNull URL url) {
      *
      * @return Map with API key, authentication headers and User agent.
      */
-    public Map<String, String> getRequestHeaders() {
+    public @NotNull Map<String, String> getRequestHeaders() {
         HashMap<String, String> headers = new HashMap<>();
         if (mApiKey != null) {
             headers.put("X-Tinode-APIKey", mApiKey);