Merge pull request #240 from RocketChat/fix/npe-on-url

Url improvements

app/src/main/java/chat/rocket/android/fragment/chatroom/RocketChatAbsoluteUrl.java

@@ -18,7 +18,7 @@ public class RocketChatAbsoluteUrl implements AbsoluteUrl {
   }
 
   @Override
-  public String getAbsolute(String url) {
+  public String from(String url) {
     return url.startsWith("/") ? baseUrl + url + "?rc_uid=" + userId + "&rc_token=" + token : url;
   }
 }

app/src/main/java/chat/rocket/android/helper/Avatar.java

@@ -72,7 +72,11 @@ public class Avatar {
     //from Rocket.Chat:packages/rocketchat-ui/lib/avatar.coffee
     //REMARK! this is often SVG image! (see: Rocket.Chat:server/startup/avatar.coffee)
     try {
-      return absoluteUrl.getAbsolute("/avatar/" + URLEncoder.encode(username, "UTF-8") + ".jpg");
+      final String avatarUrl = "/avatar/" + URLEncoder.encode(username, "UTF-8") + ".jpg";
+      if (absoluteUrl == null) {
+        return avatarUrl;
+      }
+      return absoluteUrl.from(avatarUrl);
     } catch (UnsupportedEncodingException exception) {
       RCLog.e(exception, "failed to get URL for user: %s", username);
       return null;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/AbsoluteUrl.java

@@ -2,5 +2,5 @@ package chat.rocket.android.widget;
 
 public interface AbsoluteUrl {
 
-  String getAbsolute(String url);
+  String from(String url);
 }

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/RocketChatMessageAttachmentsLayout.java

@@ -239,7 +239,10 @@ public class RocketChatMessageAttachmentsLayout extends LinearLayout {
   }
 
   private String absolutize(String url) {
-    return absoluteUrl.getAbsolute(url);
+    if (absoluteUrl == null) {
+      return url;
+    }
+    return absoluteUrl.from(url);
   }
 
   private void loadImage(final String url, final SimpleDraweeView drawee, final View load,