Merge branch 'develop' of https://gitlab.com/Commit451/LabCoat into develop

app/src/main/java/com/commit451/gitlab/api/AuthenticationRequestInterceptor.java

@@ -31,7 +31,14 @@ public class AuthenticationRequestInterceptor implements Interceptor {
         Request request = chain.request();
         HttpUrl url = request.httpUrl();
-        if (url.toString().startsWith(mAccount.getServerUrl().toString())) {
+
+        String cleanUrl = url.toString();
+        cleanUrl = cleanUrl.substring(cleanUrl.indexOf(':'));
+
+        String cleanServerUrl = mAccount.getServerUrl().toString();
+        cleanServerUrl = cleanServerUrl.substring(cleanServerUrl.indexOf(':'));
+
+        if (cleanUrl.startsWith(cleanServerUrl)) {
             String authorizationHeader = mAccount.getAuthorizationHeader();
             if (authorizationHeader != null) {
                 request = request.newBuilder()

app/src/main/java/com/commit451/gitlab/api/GitLab.java

@@ -16,6 +16,7 @@ import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
 import com.commit451.gitlab.model.api.RepositoryFile;
 import com.commit451.gitlab.model.api.RepositoryTreeObject;
+import com.commit451.gitlab.model.api.User;
 import com.commit451.gitlab.model.api.UserBasic;
 import com.commit451.gitlab.model.api.UserFull;
 import com.commit451.gitlab.model.api.UserLogin;
@@ -73,7 +74,7 @@ public interface GitLab {
     Call<List<UserBasic>> searchUsers(@Url String url, @Query("search") String query);
     @GET(API_VERSION + "/users/{id}")
-    Call<UserBasic> getUser(@Path("id") long userId);
+    Call<User> getUser(@Path("id") long userId);
     /* --- GROUPS --- */