Convert account, GitLab, GitLabRss, and Picasso into non static

app/build.gradle

@@ -43,7 +43,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.1'
+    testCompile 'org.robolectric:robolectric:3.1.1'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
@@ -67,8 +67,8 @@ dependencies {
     compile 'com.squareup:otto:1.3.8'
     compile 'io.reactivex:rxjava:1.1.7'
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.jakewharton:butterknife:8.2.0'
-    apt 'com.jakewharton:butterknife-compiler:8.2.0'
+    compile 'com.jakewharton:butterknife:8.2.1'
+    apt 'com.jakewharton:butterknife-compiler:8.2.1'
     compile 'com.jakewharton.timber:timber:4.1.2'
     apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
     compile 'com.bluelinelabs:logansquare:1.3.7'
@@ -76,7 +76,7 @@ dependencies {
     compile 'org.parceler:parceler-api:1.1.5'
     apt 'org.parceler:parceler:1.1.5'
     compile 'com.commit451:bypasses:1.0.1'
-    compile 'com.commit451:elasticdragdismisslayout:1.0.2'
+    compile 'com.github.Commit451.ElasticDragDismissLayout:1.0.3'
     compile 'com.github.Commit451:AdapterLayout:1.0.2'
     compile 'com.github.Commit451:Easel:1.0.0'
     compile 'com.github.Commit451:Gimbal:1.0.0'

app/src/main/java/com/commit451/gitlab/App.java

@@ -7,18 +7,28 @@ import android.net.Uri;
 import android.support.annotation.VisibleForTesting;
 import com.bluelinelabs.logansquare.LoganSquare;
+import com.commit451.gitlab.api.GitLab;
+import com.commit451.gitlab.api.GitLabFactory;
+import com.commit451.gitlab.api.GitLabRss;
+import com.commit451.gitlab.api.GitLabRssFactory;
+import com.commit451.gitlab.api.OkHttpClientFactory;
+import com.commit451.gitlab.api.PicassoFactory;
 import com.commit451.gitlab.api.converter.UriTypeConverter;
+import com.commit451.gitlab.model.Account;
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.core.CrashlyticsCore;
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.otto.Bus;
+import com.squareup.picasso.Picasso;
 import net.danlew.android.joda.JodaTimeAndroid;
 import java.util.Locale;
 import io.fabric.sdk.android.Fabric;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
 import timber.log.Timber;
 /**
@@ -34,6 +44,8 @@ public class App extends Application {
     }
     private static Bus sBus;
+    private static App sInstance;
+
     public static Bus bus() {
         if (sBus == null) {
             sBus = new Bus();
@@ -41,11 +53,15 @@ public class App extends Application {
         return sBus;
     }
-    private static App sInstance;
     public static App instance() {
         return sInstance;
     }
+    private Account mAccount;
+    private GitLab mGitLab;
+    private GitLabRss mGitLabRss;
+    private Picasso mPicasso;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -93,4 +109,48 @@ public class App extends Application {
             Timber.e(e, null);
         }
     }
+
+    public GitLab getGitLab() {
+        return mGitLab;
+    }
+
+    public GitLabRss getGitLabRss() {
+        return mGitLabRss;
+    }
+
+    public Picasso getPicasso() {
+        return mPicasso;
+    }
+
+    public Account getAccount() {
+        return mAccount;
+    }
+
+    public void setAccount(Account account) {
+        mAccount = account;
+        initGitLab(account);
+        initGitLabRss(account);
+        initPicasso(account);
+    }
+
+    private void initGitLab(Account account) {
+        OkHttpClient.Builder gitlabClientBuilder = OkHttpClientFactory.create(account);
+        if (BuildConfig.DEBUG) {
+            gitlabClientBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
+        }
+        mGitLab = GitLabFactory.create(account, gitlabClientBuilder.build());
+    }
+
+    private void initGitLabRss(Account account) {
+        OkHttpClient.Builder gitlabRssClientBuilder = OkHttpClientFactory.create(account);
+        if (BuildConfig.DEBUG) {
+            gitlabRssClientBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
+        }
+        mGitLabRss = GitLabRssFactory.create(account, gitlabRssClientBuilder.build());
+    }
+
+    private void initPicasso(Account account) {
+        OkHttpClient.Builder clientBuilder = OkHttpClientFactory.create(account);
+        mPicasso = PicassoFactory.createPicasso(clientBuilder.build());
+    }
 }

app/src/main/java/com/commit451/gitlab/activity/AboutActivity.java

@@ -17,10 +17,10 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitbal.Gimbal;
+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.model.api.Contributor;
 import com.commit451.gitlab.navigation.Navigator;
 import com.commit451.gitlab.transformation.CircleTransformation;
@@ -64,7 +64,7 @@ public class AboutActivity extends BaseActivity {
     @OnClick(R.id.sauce)
     void onSauceClick() {
-        if (getString(R.string.url_gitlab).equals(GitLabClient.getAccount().getServerUrl().toString())) {
+        if (getString(R.string.url_gitlab).equals(App.instance().getAccount().getServerUrl().toString())) {
             Navigator.navigateToProject(AboutActivity.this, REPO_ID);
         } else {
             IntentUtil.openPage(AboutActivity.this, getString(R.string.source_url));
@@ -125,7 +125,7 @@ public class AboutActivity extends BaseActivity {
         mPhysicsLayout.getPhysics().enableFling();
         sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
         gravitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY);
-        GitLabClient.instance().getContributors(REPO_ID).enqueue(mContributorResponseCallback);
+        App.instance().getGitLab().getContributors(REPO_ID).enqueue(mContributorResponseCallback);
         mProgress.setVisibility(View.VISIBLE);
     }
@@ -166,7 +166,7 @@ public class AboutActivity extends BaseActivity {
             }
             Uri url = ImageUtil.getAvatarUrl(contributor.getEmail(), imageSize);
-            GitLabClient.getPicasso()
+            App.instance().getPicasso()
                     .load(url)
                     .transform(new CircleTransformation())
                     .into(imageView);

app/src/main/java/com/commit451/gitlab/activity/ActivityActivity.java

@@ -11,7 +11,6 @@ import android.view.View;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.CloseDrawerEvent;
 import com.commit451.gitlab.fragment.FeedFragment;
 import com.squareup.otto.Subscribe;
@@ -57,7 +56,7 @@ public class ActivityActivity extends BaseActivity {
         FeedFragment feedFragment = (FeedFragment) getSupportFragmentManager().findFragmentByTag(TAG_FEED_FRAGMENT);
         if (feedFragment == null) {
-            Uri feedUri = GitLabClient.getAccount().getServerUrl();
+            Uri feedUri = App.instance().getAccount().getServerUrl();
             feedUri = feedUri.buildUpon()
                     .appendPath("dashboard")

app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.java

@@ -15,13 +15,12 @@ import android.widget.FrameLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.AddIssueLabelAdapter;
 import com.commit451.gitlab.adapter.AssigneeSpinnerAdapter;
 import com.commit451.gitlab.adapter.MilestoneSpinnerAdapter;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.api.exception.NullBodyException;
 import com.commit451.gitlab.event.IssueChangedEvent;
 import com.commit451.gitlab.event.IssueCreatedEvent;
@@ -135,7 +134,7 @@ public class AddIssueActivity extends MorphActivity {
             mMembers.addAll(response);
             if (mProject.belongsToGroup()) {
                 Timber.d("Project belongs to a group, loading those users too");
-                GitLabClient.instance().getGroupMembers(mProject.getNamespace().getId()).enqueue(mGroupMembersCallback);
+                App.instance().getGitLab().getGroupMembers(mProject.getNamespace().getId()).enqueue(mGroupMembersCallback);
             } else {
                 setAssignees();
             }
@@ -250,9 +249,9 @@ public class AddIssueActivity extends MorphActivity {
     }
     private void load() {
-        GitLabClient.instance().getMilestones(mProject.getId(), getString(R.string.milestone_state_value_default)).enqueue(mMilestonesCallback);
-        GitLabClient.instance().getProjectMembers(mProject.getId()).enqueue(mAssigneeCallback);
-        GitLabClient.instance().getLabels(mProject.getId()).enqueue(mLabelCallback);
+        App.instance().getGitLab().getMilestones(mProject.getId(), getString(R.string.milestone_state_value_default)).enqueue(mMilestonesCallback);
+        App.instance().getGitLab().getProjectMembers(mProject.getId()).enqueue(mAssigneeCallback);
+        App.instance().getGitLab().getLabels(mProject.getId()).enqueue(mLabelCallback);
     }
     private void showLoading() {
@@ -337,14 +336,14 @@ public class AddIssueActivity extends MorphActivity {
     private void createOrSaveIssue(String title, String description, Long assigneeId, Long milestoneId) {
         if (mIssue == null) {
-            GitLabClient.instance().createIssue(
+            App.instance().getGitLab().createIssue(
                     mProject.getId(),
                     title,
                     description,
                     assigneeId,
                     milestoneId).enqueue(mIssueCreatedCallback);
         } else {
-            GitLabClient.instance().updateIssue(mProject.getId(),
+            App.instance().getGitLab().updateIssue(mProject.getId(),
                     mIssue.getId(),
                     title,
                     description,

app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.java

@@ -13,9 +13,9 @@ 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.LabelAdapter;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Label;
 import com.commit451.gitlab.viewHolder.LabelViewHolder;
@@ -101,7 +101,7 @@ public class AddLabelActivity extends BaseActivity {
                 }
             }
         });
-        GitLabClient.instance().getLabels(mProjectId).enqueue(new EasyCallback<List<Label>>() {
+        App.instance().getGitLab().getLabels(mProjectId).enqueue(new EasyCallback<List<Label>>() {
             @Override
             public void success(@NonNull List<Label> response) {
                 mSwipeRefreshLayout.setRefreshing(false);

app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.java

@@ -19,7 +19,7 @@ import com.commit451.easel.Easel;
 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.api.GitLabFactory;
 import com.commit451.gitlab.event.MilestoneChangedEvent;
 import com.commit451.gitlab.event.MilestoneCreatedEvent;
 import com.commit451.gitlab.model.api.Milestone;
@@ -176,12 +176,12 @@ public class AddMilestoneActivity extends MorphActivity {
         }
         if (mMilestone == null) {
-            GitLabClient.instance().createMilestone(mProjectId,
+            App.instance().getGitLab().createMilestone(mProjectId,
                     mTitle.getText().toString(),
                     mDescription.getText().toString(),
                     dueDate).enqueue(mMilestoneCallback);
         } else {
-            GitLabClient.instance().editMilestone(mProjectId,
+            App.instance().getGitLab().editMilestone(mProjectId,
                     mMilestone.getId(),
                     mTitle.getText().toString(),
                     mDescription.getText().toString(),

app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.java

@@ -24,7 +24,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.UsersAdapter;
 import com.commit451.gitlab.animation.HideRunnable;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.api.exception.HttpException;
 import com.commit451.gitlab.dialog.AccessDialog;
 import com.commit451.gitlab.event.MemberAddedEvent;
@@ -169,12 +169,12 @@ public class AddUserActivity extends MorphActivity {
         public void onAccessApplied(int accessLevel) {
             mAccessDialog.showLoading();
             if (mGroup == null) {
-                GitLabClient.instance().addProjectMember(
+                App.instance().getGitLab().addProjectMember(
                         mProjectId,
                         mSelectedUser.getId(),
                         accessLevel).enqueue(mAddGroupMemeberCallback);
             } else {
-                GitLabClient.instance().addGroupMember(mGroup.getId(),
+                App.instance().getGitLab().addGroupMember(mGroup.getId(),
                         mSelectedUser.getId(),
                         accessLevel).enqueue(mAddGroupMemeberCallback);
             }
@@ -270,13 +270,13 @@ public class AddUserActivity extends MorphActivity {
         mTeleprinter.hideKeyboard();
         mSwipeRefreshLayout.setRefreshing(true);
         mLoading = true;
-        GitLabClient.instance().searchUsers(mSearchQuery).enqueue(mUserCallback);
+        App.instance().getGitLab().searchUsers(mSearchQuery).enqueue(mUserCallback);
     }
     private void loadMore() {
         mLoading = true;
         mAdapter.setLoading(true);
         Timber.d("loadMore " + mNextPageUrl.toString() + " " + mSearchQuery);
-        GitLabClient.instance().searchUsers(mNextPageUrl.toString(), mSearchQuery).enqueue(mMoreUsersCallback);
+        App.instance().getGitLab().searchUsers(mNextPageUrl.toString(), mSearchQuery).enqueue(mMoreUsersCallback);
     }
 }

app/src/main/java/com/commit451/gitlab/activity/BuildActivity.java

@@ -16,7 +16,7 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.BuildSectionsPagerAdapter;
 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.Build;
 import com.commit451.gitlab.model.api.Project;
@@ -116,15 +116,15 @@ public class BuildActivity extends BaseActivity {
             switch (item.getItemId()) {
                 case R.id.action_retry:
                     mProgress.setVisibility(View.VISIBLE);
-                    GitLabClient.instance().retryBuild(mProject.getId(), mBuild.getId()).enqueue(mRetryCallback);
+                    App.instance().getGitLab().retryBuild(mProject.getId(), mBuild.getId()).enqueue(mRetryCallback);
                     return true;
                 case R.id.action_erase:
                     mProgress.setVisibility(View.VISIBLE);
-                    GitLabClient.instance().eraseBuild(mProject.getId(), mBuild.getId()).enqueue(mEraseCallback);
+                    App.instance().getGitLab().eraseBuild(mProject.getId(), mBuild.getId()).enqueue(mEraseCallback);
                     return true;
                 case R.id.action_cancel:
                     mProgress.setVisibility(View.VISIBLE);
-                    GitLabClient.instance().cancelBuild(mProject.getId(), mBuild.getId()).enqueue(mCancelCallback);
+                    App.instance().getGitLab().cancelBuild(mProject.getId(), mBuild.getId()).enqueue(mCancelCallback);
                     return true;
             }
             return false;

app/src/main/java/com/commit451/gitlab/activity/DiffActivity.java

@@ -12,10 +12,10 @@ 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.DiffAdapter;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Diff;
 import com.commit451.gitlab.model.api.Project;
 import com.commit451.gitlab.model.api.RepositoryCommit;
@@ -116,6 +116,6 @@ public class DiffActivity extends BaseActivity {
             }
             }
         });
-        GitLabClient.instance().getCommitDiff(mProject.getId(), mCommit.getId()).enqueue(mDiffCallback);
+        App.instance().getGitLab().getCommitDiff(mProject.getId(), mCommit.getId()).enqueue(mDiffCallback);
     }
 }
\ No newline at end of file

app/src/main/java/com/commit451/gitlab/activity/FileActivity.java

@@ -21,9 +21,9 @@ import android.view.ViewGroup;
 import android.webkit.MimeTypeMap;
 import android.webkit.WebView;
-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.RepositoryFile;
 import com.commit451.gitlab.observable.DecodeObservableFactory;
@@ -133,7 +133,7 @@ public class FileActivity extends BaseActivity {
     private void loadData() {
         mProgressView.setVisibility(View.VISIBLE);
-        GitLabClient.instance().getFile(mProjectId, mPath, mRef).enqueue(mRepositoryFileCallback);
+        App.instance().getGitLab().getFile(mProjectId, mPath, mRef).enqueue(mRepositoryFileCallback);
     }
     private void bindFile(RepositoryFile repositoryFile) {

app/src/main/java/com/commit451/gitlab/activity/GroupActivity.java

@@ -18,10 +18,10 @@ import android.view.View;
 import android.widget.ImageView;
 import com.commit451.easel.Easel;
+import com.commit451.easycallback.EasyCallback;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupPagerAdapter;
-import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.GroupDetail;
 import com.commit451.gitlab.transformation.PaletteTransformation;
@@ -98,7 +98,7 @@ public class GroupActivity extends BaseActivity {
         } else {
             mProgress.setVisibility(View.VISIBLE);
             long groupId = getIntent().getLongExtra(KEY_GROUP_ID, -1);
-            GitLabClient.instance().getGroup(groupId).enqueue(mGroupCallback);
+            App.instance().getGitLab().getGroup(groupId).enqueue(mGroupCallback);
         }
     }
@@ -108,7 +108,7 @@ public class GroupActivity extends BaseActivity {
     }
     private void bind(Group group) {
-        GitLabClient.getPicasso()
+        App.instance().getPicasso()
                 .load(group.getAvatarUrl())
                 .transform(PaletteTransformation.instance())
                 .into(mBackdrop, new PaletteTransformation.PaletteCallback(mBackdrop) {

app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java

@@ -19,7 +19,7 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupAdapter;
 import com.commit451.easycallback.EasyCallback;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLabFactory;
 import com.commit451.gitlab.event.CloseDrawerEvent;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.navigation.Navigator;
@@ -173,7 +173,7 @@ public class GroupsActivity extends BaseActivity {
         mNextPageUrl = null;
         mLoading = true;
-        GitLabClient.instance().getGroups().enqueue(mGroupsCallback);
+        App.instance().getGitLab().getGroups().enqueue(mGroupsCallback);
     }
     private void loadMore() {
@@ -193,7 +193,7 @@ public class GroupsActivity extends BaseActivity {
         mLoading = true;
         Timber.d("loadMore called for %s", mNextPageUrl);
-        GitLabClient.instance().getGroups(mNextPageUrl.toString()).enqueue(mMoreGroupsCallback);
+        App.instance().getGitLab().getGroups(mNextPageUrl.toString()).enqueue(mMoreGroupsCallback);
     }
     private class EventReceiver {

app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java

@@ -21,7 +21,7 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.IssueDetailsAdapter;
 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.IssueReloadEvent;
 import com.commit451.gitlab.model.api.FileUploadResponse;
@@ -142,7 +142,7 @@ public class IssueActivity extends BaseActivity {
         @Override
         public void success(@NonNull Project response) {
             mProject = response;
-            GitLabClient.instance().getIssuesByIid(mProject.getId(), mIssueIid).enqueue(mIssueCallback);
+            App.instance().getGitLab().getIssuesByIid(mProject.getId(), mIssueIid).enqueue(mIssueCallback);
         }
         @Override
@@ -341,7 +341,7 @@ public class IssueActivity extends BaseActivity {
                     }
                 }
             });
-            GitLabClient.instance().getProject(projectNamespace, projectName).enqueue(mProjectCallback);
+            App.instance().getGitLab().getProject(projectNamespace, projectName).enqueue(mProjectCallback);
         }
     }
@@ -358,7 +358,7 @@ public class IssueActivity extends BaseActivity {
                         ByteArrayOutputStream stream = new ByteArrayOutputStream();
                         bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
                         RequestBody requestBody = RequestBody.create(MediaType.parse("image/jpeg"), stream.toByteArray());
-                        GitLabClient.instance().uploadFile(mProject.getId(), requestBody).enqueue(mUploadImageCallback);
+                        App.instance().getGitLab().uploadFile(mProject.getId(), requestBody).enqueue(mUploadImageCallback);
                     } catch (IOException e) {
                         Timber.e(e, null);
                     }
@@ -394,13 +394,13 @@ public class IssueActivity extends BaseActivity {
             }
         });
         mLoading = true;
-        GitLabClient.instance().getIssueNotes(mProject.getId(), mIssue.getId()).enqueue(mNotesCallback);
+        App.instance().getGitLab().getIssueNotes(mProject.getId(), mIssue.getId()).enqueue(mNotesCallback);
     }
     private void loadMoreNotes() {
         mLoading = true;
         mIssueDetailsAdapter.setLoading(true);
-        GitLabClient.instance().getIssueNotes(mNextPageUrl.toString()).enqueue(mMoreNotesCallback);
+        App.instance().getGitLab().getIssueNotes(mNextPageUrl.toString()).enqueue(mMoreNotesCallback);
     }
     private void postNote(String message) {
@@ -416,16 +416,16 @@ public class IssueActivity extends BaseActivity {
         mTeleprinter.hideKeyboard();
         mSendMessageView.clearText();
-        GitLabClient.instance().addIssueNote(mProject.getId(), mIssue.getId(), message).enqueue(mPostNoteCallback);
+        App.instance().getGitLab().addIssueNote(mProject.getId(), mIssue.getId(), message).enqueue(mPostNoteCallback);
     }
     private void closeOrOpenIssue() {
         mProgress.setVisibility(View.VISIBLE);
         if (mIssue.getState().equals(Issue.STATE_CLOSED)) {
-            GitLabClient.instance().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_REOPEN)
+            App.instance().getGitLab().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_REOPEN)
                     .enqueue(mOpenCloseCallback);
         } else {
-            GitLabClient.instance().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_CLOSE)
+            App.instance().getGitLab().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_CLOSE)
                     .enqueue(mOpenCloseCallback);
         }
     }

app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.java

@@ -8,9 +8,9 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
-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.Build;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.model.api.Milestone;
@@ -98,19 +98,19 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
             switch (mLoadType) {
                 case LOAD_TYPE_DIFF:
                     String sha = getIntent().getStringExtra(EXTRA_COMMIT_SHA);
-                    GitLabClient.instance().getCommit(response.getId(), sha).enqueue(mCommitCallback);
+                    App.instance().getGitLab().getCommit(response.getId(), sha).enqueue(mCommitCallback);
                     return;
                 case LOAD_TYPE_MERGE_REQUEST:
                     String mergeRequestId = getIntent().getStringExtra(EXTRA_MERGE_REQUEST);
-                    GitLabClient.instance().getMergeRequestsByIid(response.getId(), mergeRequestId).enqueue(mMergeRequestCallback);
+                    App.instance().getGitLab().getMergeRequestsByIid(response.getId(), mergeRequestId).enqueue(mMergeRequestCallback);
                     return;
                 case LOAD_TYPE_BUILD:
                     long buildId = getIntent().getLongExtra(EXTRA_BUILD_ID, -1);
-                    GitLabClient.instance().getBuild(response.getId(), buildId).enqueue(mBuildCallback);
+                    App.instance().getGitLab().getBuild(response.getId(), buildId).enqueue(mBuildCallback);
                     return;
                 case LOAD_TYPE_MILESTONE:
                     String milestoneId = getIntent().getStringExtra(EXTRA_MILESTONE_ID);
-                    GitLabClient.instance().getMilestonesByIid(response.getId(), milestoneId).enqueue(mMilestoneCallback);
+                    App.instance().getGitLab().getMilestonesByIid(response.getId(), milestoneId).enqueue(mMilestoneCallback);
                     return;
             }
@@ -203,7 +203,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
             case LOAD_TYPE_MILESTONE:
                 String namespace = getIntent().getStringExtra(EXTRA_PROJECT_NAMESPACE);
                 String project = getIntent().getStringExtra(EXTRA_PROJECT_NAME);
-                GitLabClient.instance().getProject(namespace, project).enqueue(mProjectCallback);
+                App.instance().getGitLab().getProject(namespace, project).enqueue(mProjectCallback);
                 break;
         }
     }

app/src/main/java/com/commit451/gitlab/activity/LoginActivity.java

@@ -27,8 +27,11 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import com.commit451.gitlab.App;
+import com.commit451.gitlab.BuildConfig;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.api.GitLab;
+import com.commit451.gitlab.api.GitLabFactory;
+import com.commit451.gitlab.api.OkHttpClientFactory;
 import com.commit451.gitlab.data.Prefs;
 import com.commit451.gitlab.dialog.HttpLoginDialog;
 import com.commit451.gitlab.event.LoginEvent;
@@ -61,6 +64,8 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import okhttp3.Credentials;
 import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -203,7 +208,7 @@ public class LoginActivity extends BaseActivity {
     private void login() {
         // This seems useless - But believe me, it makes everything work! Don't remove it.
-        // (OkHttpClientProvider caches the clients and needs a new account to recreate them)
+        // (OkHttpClientFactory caches the clients and needs a new account to recreate them)
         Account newAccount = new Account();
         newAccount.setServerUrl(mAccount.getServerUrl());
@@ -290,7 +295,7 @@ public class LoginActivity extends BaseActivity {
             mAccount.setUser(response.body());
             mAccount.setLastUsed(new Date());
             Prefs.addAccount(LoginActivity.this, mAccount);
-            GitLabClient.setAccount(mAccount);
+            App.instance().setAccount(mAccount);
             App.bus().post(new LoginEvent(mAccount));
             //This is mostly for if projects already exists, then we will reload the data
             App.bus().post(new ReloadDataEvent());
@@ -360,10 +365,15 @@ public class LoginActivity extends BaseActivity {
     }
     private void connectByAuth() {
+        OkHttpClient.Builder gitlabClientBuilder = OkHttpClientFactory.create(mAccount);
+        if (BuildConfig.DEBUG) {
+            gitlabClientBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
+        }
+        GitLab gitLab = GitLabFactory.create(mAccount, gitlabClientBuilder.build());
         if (mUserInput.getText().toString().contains("@")) {
-            GitLabClient.create(mAccount).loginWithEmail(mUserInput.getText().toString(), mPasswordInput.getText().toString()).enqueue(mLoginCallback);
+            gitLab.loginWithEmail(mUserInput.getText().toString(), mPasswordInput.getText().toString()).enqueue(mLoginCallback);
         } else {
-            GitLabClient.create(mAccount).loginWithUsername(mUserInput.getText().toString(), mPasswordInput.getText().toString()).enqueue(mLoginCallback);
+            gitLab.loginWithUsername(mUserInput.getText().toString(), mPasswordInput.getText().toString()).enqueue(mLoginCallback);
         }
     }
@@ -373,7 +383,12 @@ public class LoginActivity extends BaseActivity {
     }
     private void loadUser() {
-        GitLabClient.create(mAccount).getThisUser().enqueue(mTestUserCallback);
+        OkHttpClient.Builder gitlabClientBuilder = OkHttpClientFactory.create(mAccount);
+        if (BuildConfig.DEBUG) {
+            gitlabClientBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
+        }
+        GitLab gitLab = GitLabFactory.create(mAccount, gitlabClientBuilder.build());
+        gitLab.getThisUser().enqueue(mTestUserCallback);
     }
     private void handleConnectionError(Throwable t) {

app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.java

@@ -16,7 +16,7 @@ import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.MergeRequestSectionsPagerAdapter;
 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;
@@ -80,7 +80,7 @@ public class MergeRequestActivity extends BaseActivity {
             switch (item.getItemId()) {
                 case R.id.action_merge:
                     mProgress.setVisibility(View.VISIBLE);
-                    GitLabClient.instance().acceptMergeRequest(mProject.getId(), mMergeRequest.getId()).enqueue(mMergeRequestCallback);
+                    App.instance().getGitLab().acceptMergeRequest(mProject.getId(), mMergeRequest.getId()).enqueue(mMergeRequestCallback);
                     return true;
             }
             return false;

app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.java

@@ -20,7 +20,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.MilestoneIssuesAdapter;
 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.model.api.Issue;
 import com.commit451.gitlab.model.api.Milestone;
@@ -237,7 +237,7 @@ public class MilestoneActivity extends BaseActivity {
                 }
             }
         });
-        GitLabClient.instance().getMilestoneIssues(mProject.getId(), mMilestone.getId()).enqueue(mIssuesCallback);
+        App.instance().getGitLab().getMilestoneIssues(mProject.getId(), mMilestone.getId()).enqueue(mIssuesCallback);
     }
     private void loadMore() {
@@ -249,16 +249,16 @@ public class MilestoneActivity extends BaseActivity {
         mLoading = true;
         Timber.d("loadMore called for %s", mNextPageUrl);
-        GitLabClient.instance().getMilestoneIssues(mNextPageUrl.toString()).enqueue(mMoreIssuesCallback);
+        App.instance().getGitLab().getMilestoneIssues(mNextPageUrl.toString()).enqueue(mMoreIssuesCallback);
     }
     private void closeOrOpenIssue() {
         mProgress.setVisibility(View.VISIBLE);
         if (mMilestone.getState().equals(Milestone.STATE_ACTIVE)) {
-            GitLabClient.instance().updateMilestoneStatus(mProject.getId(), mMilestone.getId(), Milestone.STATE_EVENT_CLOSE)
+            App.instance().getGitLab().updateMilestoneStatus(mProject.getId(), mMilestone.getId(), Milestone.STATE_EVENT_CLOSE)
                     .enqueue(mOpenCloseCallback);
         } else {
-            GitLabClient.instance().updateMilestoneStatus(mProject.getId(), mMilestone.getId(), Milestone.STATE_EVENT_ACTIVATE)
+            App.instance().getGitLab().updateMilestoneStatus(mProject.getId(), mMilestone.getId(), Milestone.STATE_EVENT_ACTIVATE)
                     .enqueue(mOpenCloseCallback);
         }
     }

app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.java

@@ -25,7 +25,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.SectionsPagerAdapter;
 import com.commit451.gitlab.animation.HideRunnable;
 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.fragment.BaseFragment;
 import com.commit451.gitlab.model.api.Branch;
@@ -210,14 +210,14 @@ public class ProjectActivity extends BaseActivity {
         mProgress.setAlpha(0.0f);
         mProgress.setVisibility(View.VISIBLE);
         mProgress.animate().alpha(1.0f);
-        GitLabClient.instance().getProject(projectId).enqueue(mProjectCallback);
+        App.instance().getGitLab().getProject(projectId).enqueue(mProjectCallback);
     }
     private void loadBranches() {
         mProgress.setAlpha(0.0f);
         mProgress.setVisibility(View.VISIBLE);
         mProgress.animate().alpha(1.0f);
-        GitLabClient.instance().getBranches(mProject.getId()).enqueue(mBranchesCallback);
+        App.instance().getGitLab().getBranches(mProject.getId()).enqueue(mBranchesCallback);
     }
     private void broadcastLoad() {

app/src/main/java/com/commit451/gitlab/activity/RoutingActivity.java

@@ -6,8 +6,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.widget.Toast;
+import com.commit451.gitlab.App;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.Account;
 import com.commit451.gitlab.navigation.DeepLinker;
 import com.commit451.gitlab.navigation.Navigator;
@@ -114,7 +114,7 @@ public class RoutingActivity extends Activity {
         //okay so last thing, if the user has followed a link, but the user
         //is not actually signed in, we want to direct them to signin
-        if (GitLabClient.getAccount() == null && Account.getAccounts(this).isEmpty()) {
+        if (App.instance().getAccount() == null && Account.getAccounts(this).isEmpty()) {
             Navigator.navigateToLogin(this);
             finish();
             return;