Merge branch 'master' into fdroid

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/commit451/gitlab/App.java

app/src/main/java/com/commit451/gitlab/api/rss/DateTransform.java

+package com.commit451.gitlab.api.rss;
+
+import com.commit451.gitlab.util.ConversionUtil;
+
+import org.simpleframework.xml.transform.Transform;
+
+import java.util.Date;
+
+/**
+ * Transforms dates!
+ */
+public class DateTransform implements Transform<Date> {
+
+    public DateTransform() {
+    }
+
+    @Override
+    public Date read(String value) throws Exception {
+        return ConversionUtil.toDate(value);
+    }
+
+    @Override
+    public String write(Date value) throws Exception {
+        return ConversionUtil.fromDate(value);
+    }
+}

app/src/main/java/com/commit451/gitlab/provider/SimpleXmlProvider.java → app/src/main/java/com/commit451/gitlab/api/rss/SimpleXmlPersisterFactory.java

-package com.commit451.gitlab.provider;
+package com.commit451.gitlab.api.rss;
+
+import android.net.Uri;
 import com.commit451.gitlab.model.Account;
-import com.commit451.gitlab.util.ConversionUtil;
 import org.simpleframework.xml.core.Persister;
 import org.simpleframework.xml.transform.Matcher;
 import org.simpleframework.xml.transform.Transform;
-import android.net.Uri;
-
 import java.util.Date;
-public final class SimpleXmlProvider {
-    private static Persister sPersister;
-
-    private SimpleXmlProvider() {}
-
-    public static Persister getPersister() {
-        if (sPersister == null) {
-            sPersister = createPersister(null);
-        }
-        return sPersister;
-    }
+public final class SimpleXmlPersisterFactory {
     public static Persister createPersister(final Account account) {
         return new Persister(new Matcher() {
             @Override
             public Transform match(Class type) throws Exception {
                 if (Date.class.isAssignableFrom(type)) {
-                    return new DateTransform(account);
+                    return new DateTransform();
                 } else if (Uri.class.isAssignableFrom(type)) {
                     return new UriTransform(account);
                 }
@@ -37,40 +26,4 @@ public final class SimpleXmlProvider {
             }
         });
     }
-
-    private static class DateTransform implements Transform<Date> {
-        private final Account mAccount;
-
-        public DateTransform(Account account) {
-            mAccount = account;
-        }
-
-        @Override
-        public Date read(String value) throws Exception {
-            return ConversionUtil.toDate(value);
-        }
-
-        @Override
-        public String write(Date value) throws Exception {
-            return ConversionUtil.fromDate(value);
-        }
-    }
-
-    private static class UriTransform implements Transform<Uri> {
-        private final Account mAccount;
-
-        public UriTransform(Account account) {
-            mAccount = account;
-        }
-
-        @Override
-        public Uri read(String value) throws Exception {
-            return ConversionUtil.toUri(mAccount, value);
-        }
-
-        @Override
-        public String write(Uri value) throws Exception {
-            return ConversionUtil.fromUri(value);
-        }
-    }
 }

app/src/main/java/com/commit451/gitlab/api/rss/UriTransform.java

+package com.commit451.gitlab.api.rss;
+
+import android.net.Uri;
+
+import com.commit451.gitlab.model.Account;
+import com.commit451.gitlab.util.ConversionUtil;
+
+import org.simpleframework.xml.transform.Transform;
+
+/**
+ * Uri Transformer
+ */
+public class UriTransform implements Transform<Uri> {
+    private final Account mAccount;
+
+    public UriTransform(Account account) {
+        mAccount = account;
+    }
+
+    @Override
+    public Uri read(String value) throws Exception {
+        return ConversionUtil.toUri(mAccount, value);
+    }
+
+    @Override
+    public String write(Uri value) throws Exception {
+        return ConversionUtil.fromUri(value);
+    }
+}

app/src/main/java/com/commit451/gitlab/dialog/AccessDialog.java

@@ -8,9 +8,9 @@ import android.widget.Toast;
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
-import com.commit451.gitlab.R;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.App;
+import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Member;
@@ -121,10 +121,10 @@ public class AccessDialog extends MaterialDialog {
         if (mGroup != null) {
             showLoading();
-            GitLabClient.instance().editGroupMember(mGroup.getId(), mMember.getId(), accessLevel).enqueue(mEditUserCallback);
+            App.instance().getGitLab().editGroupMember(mGroup.getId(), mMember.getId(), accessLevel).enqueue(mEditUserCallback);
         } else if (mProjectId != -1) {
             showLoading();
-            GitLabClient.instance().editProjectMember(mProjectId, mMember.getId(), accessLevel).enqueue(mEditUserCallback);
+            App.instance().getGitLab().editProjectMember(mProjectId, mMember.getId(), accessLevel).enqueue(mEditUserCallback);
         } else if (mAccessAppliedListener != null) {
             mAccessAppliedListener.onAccessApplied(accessLevel);
         } else {

app/src/main/java/com/commit451/gitlab/fragment/BuildArtifactsFragment.java

@@ -16,7 +16,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.BuildArtifactsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.model.api.Artifact;
 import com.commit451.gitlab.model.api.Build;
@@ -165,7 +165,7 @@ public class BuildArtifactsFragment extends ButterKnifeFragment {
             }
         });
-        GitLabClient.instance().getBuildArtifacts(mProject.getId(), mBuild.getId()).enqueue(mCommitsCallback);
+        App.instance().getGitLab().getBuildArtifacts(mProject.getId(), mBuild.getId()).enqueue(mCommitsCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/BuildDescriptionFragment.java

@@ -13,13 +13,12 @@ import android.widget.TextView;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.model.api.Build;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
 import com.commit451.gitlab.model.api.Runner;
-import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.DateUtil;
 import com.squareup.otto.Subscribe;
 import org.parceler.Parcels;
@@ -119,7 +118,7 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
     }
     private void load() {
-        GitLabClient.instance().getBuild(mProject.getId(), mBuild.getId()).enqueue(mLoadBuildCallback);
+        App.instance().getGitLab().getBuild(mProject.getId(), mBuild.getId()).enqueue(mLoadBuildCallback);
     }
     private void bindBuild(Build build) {
@@ -127,13 +126,13 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
         if (finishedTime == null) {
             finishedTime = new Date();
         }
-        String timeTaken = DateUtils.getTimeTaken(build.getStartedAt(), finishedTime);
+        String timeTaken = DateUtil.getTimeTaken(build.getStartedAt(), finishedTime);
         String duration = String.format(getString(R.string.build_duration), timeTaken);
         mTextDuration.setText(duration);
-        String created = String.format(getString(R.string.build_created), DateUtils.getRelativeTimeSpanString(getActivity(), build.getCreatedAt()));
+        String created = String.format(getString(R.string.build_created), DateUtil.getRelativeTimeSpanString(getActivity(), build.getCreatedAt()));
         mTextCreated.setText(created);
         if (build.getFinishedAt() != null) {
-            String finished = String.format(getString(R.string.build_finished), DateUtils.getRelativeTimeSpanString(getActivity(), build.getFinishedAt()));
+            String finished = String.format(getString(R.string.build_finished), DateUtil.getRelativeTimeSpanString(getActivity(), build.getFinishedAt()));
             mTextFinished.setText(finished);
             mTextFinished.setVisibility(View.VISIBLE);
         } else {

app/src/main/java/com/commit451/gitlab/fragment/BuildsFragment.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.BuildsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Build;
@@ -222,7 +222,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         });
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getBuilds(mProject.getId(), mScope).enqueue(mLoadCallback);
+        App.instance().getGitLab().getBuilds(mProject.getId(), mScope).enqueue(mLoadCallback);
     }
     private void loadMore() {
@@ -238,7 +238,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         mLoading = true;
         Timber.d("loadMore called for %s", mNextPageUrl);
-        GitLabClient.instance().getBuilds(mNextPageUrl.toString(), mScope).enqueue(mMoreCallback);
+        App.instance().getGitLab().getBuilds(mNextPageUrl.toString(), mScope).enqueue(mMoreCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/CommitsFragment.java

@@ -17,7 +17,7 @@ import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.CommitsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
@@ -192,7 +192,7 @@ public class CommitsFragment extends ButterKnifeFragment {
         mPage = 0;
         mLoading = true;
-        GitLabClient.instance().getCommits(mProject.getId(), mBranchName, mPage).enqueue(mCommitsCallback);
+        App.instance().getGitLab().getCommits(mProject.getId(), mBranchName, mPage).enqueue(mCommitsCallback);
     }
     private void loadMore() {
@@ -209,7 +209,7 @@ public class CommitsFragment extends ButterKnifeFragment {
         mCommitsAdapter.setLoading(true);
         Timber.d("loadMore called for %s", mPage);
-        GitLabClient.instance().getCommits(mProject.getId(), mBranchName, mPage).enqueue(mMoreCommitsCallback);
+        App.instance().getGitLab().getCommits(mProject.getId(), mBranchName, mPage).enqueue(mMoreCommitsCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/FeedFragment.java

@@ -11,12 +11,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.FeedAdapter;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.rss.Entry;
 import com.commit451.gitlab.model.rss.Feed;
 import com.commit451.gitlab.navigation.Navigator;
@@ -85,7 +84,7 @@ public class FeedFragment extends ButterKnifeFragment {
     private final FeedAdapter.Listener mFeedAdapterListener = new FeedAdapter.Listener() {
         @Override
         public void onFeedEntryClicked(Entry entry) {
-            Navigator.navigateToUrl(getActivity(), entry.getLink().getHref(), GitLabClient.getAccount());
+            Navigator.navigateToUrl(getActivity(), entry.getLink().getHref(), App.instance().getAccount());
         }
     };
@@ -161,7 +160,7 @@ public class FeedFragment extends ButterKnifeFragment {
                 }
             }
         });
-        GitLabClient.rssInstance().getFeed(mFeedUrl.toString()).enqueue(mUserFeedCallback);
+        App.instance().getGitLabRss().getFeed(mFeedUrl.toString()).enqueue(mUserFeedCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/FilesFragment.java

@@ -22,7 +22,7 @@ import com.commit451.gitlab.adapter.BreadcrumbAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.FilesAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryTreeObject;
@@ -198,7 +198,7 @@ public class FilesFragment extends ButterKnifeFragment {
             }
         });
-        GitLabClient.instance().getTree(mProject.getId(), mBranchName, newPath).enqueue(new FilesCallback(newPath));
+        App.instance().getGitLab().getTree(mProject.getId(), mBranchName, newPath).enqueue(new FilesCallback(newPath));
     }
     @Override

app/src/main/java/com/commit451/gitlab/fragment/GroupMembersFragment.java

@@ -4,23 +4,22 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupMembersAdapter;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.dialog.AccessDialog;
 import com.commit451.gitlab.event.MemberAddedEvent;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Member;
 import com.commit451.gitlab.navigation.Navigator;
+import com.commit451.gitlab.util.DynamicGridLayoutManager;
 import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder;
 import com.squareup.otto.Subscribe;
@@ -121,7 +120,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
         @Override
         public void onUserRemoveClicked(Member member) {
             mMember = member;
-            GitLabClient.instance().removeGroupMember(mGroup.getId(), member.getId()).enqueue(mRemoveMemberCallback);
+            App.instance().getGitLab().removeGroupMember(mGroup.getId(), member.getId()).enqueue(mRemoveMemberCallback);
         }
         @Override
@@ -151,7 +150,9 @@ public class GroupMembersFragment extends ButterKnifeFragment {
         App.bus().register(mEventReceiver);
         mGroupMembersAdapter = new GroupMembersAdapter(mListener);
-        mRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
+        DynamicGridLayoutManager dynamicGridLayoutManager = new DynamicGridLayoutManager(getActivity());
+        dynamicGridLayoutManager.setMinimumWidthDimension(R.dimen.user_list_image_size);
+        mRecyclerView.setLayoutManager(dynamicGridLayoutManager);
         mRecyclerView.setAdapter(mGroupMembersAdapter);
         mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -192,7 +193,7 @@ public class GroupMembersFragment extends ButterKnifeFragment {
                 }
             }
         });
-        GitLabClient.instance().getGroupMembers(mGroup.getId()).enqueue(mGroupMembersCallback);
+        App.instance().getGitLab().getGroupMembers(mGroup.getId()).enqueue(mGroupMembersCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/IssuesFragment.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.IssuesAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.IssueChangedEvent;
 import com.commit451.gitlab.event.IssueCreatedEvent;
 import com.commit451.gitlab.event.IssueReloadEvent;
@@ -231,7 +231,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         });
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getIssues(mProject.getId(), mState).enqueue(mIssuesCallback);
+        App.instance().getGitLab().getIssues(mProject.getId(), mState).enqueue(mIssuesCallback);
     }
     private void loadMore() {
@@ -247,7 +247,7 @@ public class IssuesFragment extends ButterKnifeFragment {
         mLoading = true;
         Timber.d("loadMore called for " + mNextPageUrl);
-        GitLabClient.instance().getIssues(mNextPageUrl.toString()).enqueue(mMoreIssuesCallback);
+        App.instance().getGitLab().getIssues(mNextPageUrl.toString()).enqueue(mMoreIssuesCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestCommitsFragment.java

@@ -16,7 +16,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.CommitsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.MergeRequestChangedEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Project;
@@ -194,7 +194,7 @@ public class MergeRequestCommitsFragment extends ButterKnifeFragment {
         mPage = 0;
         mLoading = true;
-        GitLabClient.instance().getMergeRequestCommits(mProject.getId(), mMergeRequest.getId()).enqueue(mCommitsCallback);
+        App.instance().getGitLab().getMergeRequestCommits(mProject.getId(), mMergeRequest.getId()).enqueue(mCommitsCallback);
     }
     private void loadMore() {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestDiscussionFragment.java

@@ -16,7 +16,7 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.MergeRequestDetailAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.MergeRequestChangedEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Note;
@@ -228,12 +228,12 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
                 }
             }
         });
-        GitLabClient.instance().getMergeRequestNotes(mProject.getId(), mMergeRequest.getId()).enqueue(mNotesCallback);
+        App.instance().getGitLab().getMergeRequestNotes(mProject.getId(), mMergeRequest.getId()).enqueue(mNotesCallback);
     }
     private void loadMoreNotes() {
         mMergeRequestDetailAdapter.setLoading(true);
-        GitLabClient.instance().getMergeRequestNotes(mNextPageUrl.toString()).enqueue(mMoreNotesCallback);
+        App.instance().getGitLab().getMergeRequestNotes(mNextPageUrl.toString()).enqueue(mMoreNotesCallback);
     }
     private void postNote(String message) {
@@ -249,7 +249,7 @@ public class MergeRequestDiscussionFragment extends ButterKnifeFragment {
         mTeleprinter.hideKeyboard();
         mSendMessageView.clearText();
-        GitLabClient.instance().addMergeRequestNote(mProject.getId(), mMergeRequest.getId(), message).enqueue(mPostNoteCallback);
+        App.instance().getGitLab().addMergeRequestNote(mProject.getId(), mMergeRequest.getId(), message).enqueue(mPostNoteCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestsFragment.java

@@ -20,7 +20,7 @@ import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.MergeRequestAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Project;
@@ -204,7 +204,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
         });
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getMergeRequests(mProject.getId(), mState).enqueue(mCallback);
+        App.instance().getGitLab().getMergeRequests(mProject.getId(), mState).enqueue(mCallback);
     }
     private void loadMore() {
@@ -217,7 +217,7 @@ public class MergeRequestsFragment extends ButterKnifeFragment {
         mMergeRequestAdapter.setLoading(true);
         mLoading = true;
         Timber.d("loadMore called for " + mNextPageUrl);
-        GitLabClient.instance().getMergeRequests(mNextPageUrl.toString(), mState).enqueue(mMoreIssuesCallback);
+        App.instance().getGitLab().getMergeRequests(mNextPageUrl.toString(), mState).enqueue(mMoreIssuesCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/MilestonesFragment.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.MilestoneAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.MilestoneChangedEvent;
 import com.commit451.gitlab.event.MilestoneCreatedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
@@ -225,7 +225,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         });
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getMilestones(mProject.getId(), mState).enqueue(mCallback);
+        App.instance().getGitLab().getMilestones(mProject.getId(), mState).enqueue(mCallback);
     }
     private void loadMore() {
@@ -241,7 +241,7 @@ public class MilestonesFragment extends ButterKnifeFragment {
         mMilestoneAdapter.setLoading(true);
         Timber.d("loadMore called for " + mNextPageUrl);
-        GitLabClient.instance().getMilestones(mNextPageUrl.toString()).enqueue(mMoreMilestonesCallback);
+        App.instance().getGitLab().getMilestones(mNextPageUrl.toString()).enqueue(mMoreMilestonesCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/fragment/ProjectFragment.java

@@ -16,12 +16,11 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import com.commit451.bypasspicassoimagegetter.BypassPicassoImageGetter;
+import com.commit451.easycallback.EasyCallback;
+import com.commit451.easycallback.HttpException;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
-import com.commit451.gitlab.api.exception.HttpException;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryFile;
@@ -90,7 +89,7 @@ public class ProjectFragment extends ButterKnifeFragment {
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            GitLabClient.instance().forkProject(mProject.getId()).enqueue(mForkCallback);
+                            App.instance().getGitLab().forkProject(mProject.getId()).enqueue(mForkCallback);
                         }
                     })
                     .show();
@@ -100,7 +99,7 @@ public class ProjectFragment extends ButterKnifeFragment {
     @OnClick(R.id.root_star)
     void onStarClicked() {
         if (mProject != null) {
-            GitLabClient.instance().starProject(mProject.getId()).enqueue(mStarCallback);
+            App.instance().getGitLab().starProject(mProject.getId()).enqueue(mStarCallback);
         }
     }
@@ -112,7 +111,7 @@ public class ProjectFragment extends ButterKnifeFragment {
             }
             for (RepositoryTreeObject treeItem : response) {
                 if (getReadmeType(treeItem.getName()) != README_TYPE_UNKNOWN) {
-                    GitLabClient.instance().getFile(mProject.getId(), treeItem.getName(), mBranchName).enqueue(mFileCallback);
+                    App.instance().getGitLab().getFile(mProject.getId(), treeItem.getName(), mBranchName).enqueue(mFileCallback);
                     return;
                 }
             }
@@ -161,7 +160,7 @@ public class ProjectFragment extends ButterKnifeFragment {
                                 switch (getReadmeType(response.getFileName())) {
                                     case README_TYPE_MARKDOWN:
                                         mOverviewVew.setText(mBypass.markdownToSpannable(text,
-                                                new BypassPicassoImageGetter(mOverviewVew, GitLabClient.getPicasso())));
+                                                new BypassPicassoImageGetter(mOverviewVew, App.instance().getPicasso())));
                                         break;
                                     case README_TYPE_HTML:
                                         mOverviewVew.setText(Html.fromHtml(text));
@@ -230,7 +229,7 @@ public class ProjectFragment extends ButterKnifeFragment {
                             .setAction(R.string.project_unstar, new View.OnClickListener() {
                                 @Override
                                 public void onClick(View v) {
-                                    GitLabClient.instance().unstarProject(mProject.getId()).enqueue(mUnstarProjectCallback);
+                                    App.instance().getGitLab().unstarProject(mProject.getId()).enqueue(mUnstarProjectCallback);
                                 }
                             })
                             .show();
@@ -326,7 +325,7 @@ public class ProjectFragment extends ButterKnifeFragment {
             }
         });
-        GitLabClient.instance().getTree(mProject.getId(), mBranchName, null).enqueue(mFilesCallback);
+        App.instance().getGitLab().getTree(mProject.getId(), mBranchName, null).enqueue(mFilesCallback);
     }
     private void bindProject(Project project) {

app/src/main/java/com/commit451/gitlab/fragment/ProjectMembersFragment.java

@@ -18,7 +18,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.MemberAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.dialog.AccessDialog;
 import com.commit451.gitlab.event.MemberAddedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
@@ -84,7 +84,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         @Override
         public void onRemoveMember(Member member) {
             mMember = member;
-            GitLabClient.instance().removeProjectMember(mProject.getId(), member.getId()).enqueue(mRemoveMemberCallback);
+            App.instance().getGitLab().removeProjectMember(mProject.getId(), member.getId()).enqueue(mRemoveMemberCallback);
         }
         @Override
@@ -233,7 +233,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getProjectMembers(mProject.getId()).enqueue(mProjectMembersCallback);
+        App.instance().getGitLab().getProjectMembers(mProject.getId()).enqueue(mProjectMembersCallback);
     }
     private void loadMore() {
@@ -257,7 +257,7 @@ public class ProjectMembersFragment extends ButterKnifeFragment {
         mLoading = true;
         Timber.d("loadMore called for " + mNextPageUrl);
-        GitLabClient.instance().getProjectMembers(mNextPageUrl.toString()).enqueue(mProjectMembersCallback);
+        App.instance().getGitLab().getProjectMembers(mNextPageUrl.toString()).enqueue(mProjectMembersCallback);
     }
     private void setNamespace() {

app/src/main/java/com/commit451/gitlab/fragment/ProjectsFragment.java

@@ -11,11 +11,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.commit451.easycallback.EasyCallback;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.ProjectsAdapter;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.navigation.Navigator;
@@ -201,20 +201,20 @@ public class ProjectsFragment extends ButterKnifeFragment {
         switch (mMode) {
             case MODE_ALL:
                 showLoading();
-                GitLabClient.instance().getAllProjects().enqueue(mProjectsCallback);
+                App.instance().getGitLab().getAllProjects().enqueue(mProjectsCallback);
                 break;
             case MODE_MINE:
                 showLoading();
-                GitLabClient.instance().getMyProjects().enqueue(mProjectsCallback);
+                App.instance().getGitLab().getMyProjects().enqueue(mProjectsCallback);
                 break;
             case MODE_STARRED:
                 showLoading();
-                GitLabClient.instance().getStarredProjects().enqueue(mProjectsCallback);
+                App.instance().getGitLab().getStarredProjects().enqueue(mProjectsCallback);
                 break;
             case MODE_SEARCH:
                 if (mQuery != null) {
                     showLoading();
-                    GitLabClient.instance().searchAllProjects(mQuery).enqueue(mProjectsCallback);
+                    App.instance().getGitLab().searchAllProjects(mQuery).enqueue(mProjectsCallback);
                 }
                 break;
             case MODE_GROUP:
@@ -223,7 +223,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
                 if (group == null) {
                     throw new IllegalStateException("You must also pass a group if you want to show a groups projects");
                 }
-                GitLabClient.instance().getGroupProjects(group.getId()).enqueue(mProjectsCallback);
+                App.instance().getGitLab().getGroupProjects(group.getId()).enqueue(mProjectsCallback);
                 break;
             default:
                 throw new IllegalStateException(mMode + " is not defined");
@@ -241,7 +241,7 @@ public class ProjectsFragment extends ButterKnifeFragment {
         mLoading = true;
         mProjectsAdapter.setLoading(true);
         Timber.d("loadMore called for " + mNextPageUrl);
-        GitLabClient.instance().getProjects(mNextPageUrl.toString()).enqueue(mMoreProjectsCallback);
+        App.instance().getGitLab().getProjects(mNextPageUrl.toString()).enqueue(mMoreProjectsCallback);
     }
     private void showLoading() {

app/src/main/java/com/commit451/gitlab/fragment/SnippetsFragment.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.SnippetAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.Snippet;
@@ -224,7 +224,7 @@ public class SnippetsFragment extends ButterKnifeFragment {
         });
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getSnippets(mProject.getId()).enqueue(mCallback);
+        App.instance().getGitLab().getSnippets(mProject.getId()).enqueue(mCallback);
     }
     private void loadMore() {
@@ -240,7 +240,7 @@ public class SnippetsFragment extends ButterKnifeFragment {
         mSnippetAdapter.setLoading(true);
         Timber.d("loadMore called for %s", mNextPageUrl);
-        GitLabClient.instance().getSnippets(mNextPageUrl.toString()).enqueue(mMoreMilestonesCallback);
+        App.instance().getGitLab().getSnippets(mNextPageUrl.toString()).enqueue(mMoreMilestonesCallback);
     }
     private class EventReceiver {