Use new UrlHelper to prefix url host to path

niftynei · niftynei · commit 01f28b2d7ddd · 2016-10-19T17:08:31.000-04:00
diff --git a/app/src/main/java/com/zulip/android/models/Message.java b/app/src/main/java/com/zulip/android/models/Message.java
@@ -21,6 +21,7 @@
 import com.zulip.android.R;
 import com.zulip.android.ZulipApp;
 import com.zulip.android.util.CustomHtmlToSpannedConverter;
+import com.zulip.android.util.UrlHelper;
 import com.zulip.android.util.ZLog;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -763,7 +764,7 @@ public String extractImageUrl(ZulipApp zulipApp) {
         match = match.substring(0, match.indexOf("\""));
 
         if(match.indexOf("/") == 0) {
-            return zulipApp.getServerURI().substring(0, zulipApp.getServerURI().indexOf("/api")) + match;
+            return UrlHelper.addHost(match);
         }
         return match;
     }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import com.zulip.android.R;`
`22`	`22`	`import com.zulip.android.ZulipApp;`
`23`	`23`	`import com.zulip.android.util.CustomHtmlToSpannedConverter;`
	`24`	`+import com.zulip.android.util.UrlHelper;`
`24`	`25`	`import com.zulip.android.util.ZLog;`
`25`	`26`
`26`	`27`	`import org.apache.commons.lang.builder.EqualsBuilder;`
`@@ -763,7 +764,7 @@ public String extractImageUrl(ZulipApp zulipApp) {`
`763`	`764`	`match = match.substring(0, match.indexOf("\""));`
`764`	`765`
`765`	`766`	`if(match.indexOf("/") == 0) {`
`766`		`- return zulipApp.getServerURI().substring(0, zulipApp.getServerURI().indexOf("/api")) + match;`
	`767`	`+ return UrlHelper.addHost(match);`
`767`	`768`	`}`
`768`	`769`	`return match;`
`769`	`770`	`}`