Update dependencies

app/build.gradle

@@ -67,71 +67,74 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.1.2'
+    testCompile 'org.robolectric:robolectric:3.1.4'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.android.support:design:25.0.0'
-    compile 'com.android.support:recyclerview-v7:25.0.0'
-    compile 'com.android.support:cardview-v7:25.0.0'
-    compile 'com.android.support:palette-v7:25.0.0'
-    compile 'com.android.support:customtabs:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:design:25.0.1'
+    compile 'com.android.support:recyclerview-v7:25.0.1'
+    compile 'com.android.support:cardview-v7:25.0.1'
+    compile 'com.android.support:palette-v7:25.0.1'
+    compile 'com.android.support:customtabs:25.0.1'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
         exclude group: 'xpp3', module: 'xpp3'
         exclude group: 'stax', module: 'stax-api'
         exclude group: 'stax', module: 'stax'
     }
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
     compile 'com.squareup.retrofit2:converter-scalars:2.1.0'
     compile 'com.github.aurae.retrofit2:converter-logansquare:1.4.1'
     compile 'com.github.Commit451:RetrofitProguardRules:2.1.0.0'
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+    compile 'com.squareup.okhttp3:okhttp:3.4.2'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.4.2'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'io.reactivex:rxjava:1.2.1'
-    compile 'com.artemzin.rxjava:proguard-rules:1.2.1.0'
+    compile 'io.reactivex:rxjava:1.2.2'
+    compile 'com.artemzin.rxjava:proguard-rules:1.2.2.0'
     compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'com.trello:rxlifecycle-components:1.0'
     compile 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
     compile 'com.jakewharton.timber:timber:4.3.1'
     annotationProcessor 'com.bluelinelabs:logansquare-compiler:1.3.7'
     compile 'com.bluelinelabs:logansquare:1.3.7'
-    compile 'net.danlew:android.joda:2.9.4.2'
-    compile 'org.parceler:parceler-api:1.1.5'
-    annotationProcessor 'org.parceler:parceler:1.1.5'
+    compile 'net.danlew:android.joda:2.9.5'
+    compile 'org.parceler:parceler-api:1.1.6'
+    annotationProcessor 'org.parceler:parceler:1.1.6'
     compile 'com.github.Commit451:bypasses:1.0.4'
     compile 'com.github.Commit451:ElasticDragDismissLayout:1.0.4'
-    compile 'com.github.Commit451.AdapterLayout:adapterlayout:1.0.3'
-    compile 'com.github.Commit451.AdapterLayout:adapterflowlayout:1.0.3'
-    compile 'com.github.Commit451:Easel:1.0.0'
+    compile 'com.github.Commit451.AdapterLayout:adapterlayout:1.1.0'
+    compile 'com.github.Commit451.AdapterLayout:adapterflowlayout:1.1.0'
+    compile 'com.github.Commit451.Easel:easel:2.1.1@aar'
     compile 'com.github.Commit451:Gimbal:2.0.2'
     compile 'com.github.Commit451:Teleprinter:1.0.2'
     compile 'com.github.Commit451:BypassPicassoImageGetter:1.1.0'
     compile 'com.github.Commit451:Jounce:1.0.1'
     compile 'com.github.Commit451:EasyCallback:2.1.1'
-    compile 'com.github.Commit451:ForegroundViews:2.2.1'
+    compile 'com.github.Commit451:ForegroundViews:2.3.1'
     compile 'com.github.Commit451:MorphTransitions:2.0.0'
-    compile 'me.zhanghai.android.materialprogressbar:library:1.1.7'
+    compile 'com.github.Commit451:Alakazam:0.0.1'
+    compile 'me.zhanghai.android.materialprogressbar:library:1.3.0'
     compile 'com.github.Jawnnypoo:PhysicsLayout:2.1.0'
-    compile 'com.alexgwyn.recyclerviewsquire:recyclerviewsquire:0.0.5'
+    compile 'com.alexgwyn.recyclerviewsquire:recyclerviewsquire:0.0.6'
     compile 'com.github.ivbaranov:materiallettericon:0.2.2'
     compile 'com.github.johnkil.android-robototextview:robototextview:2.5.1'
     compile 'com.github.alorma:diff-textview:1.3.0'
     compile 'com.wdullaer:materialdatetimepicker:2.5.0'
     compile 'com.wefika:flowlayout:0.4.1'
     compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.3-rc1'
-    compile 'com.afollestad.material-dialogs:core:0.9.0.2'
-    compile 'com.afollestad.material-dialogs:commons:0.9.0.2'
+    compile 'com.afollestad.material-dialogs:core:0.9.1.0'
+    compile 'com.afollestad.material-dialogs:commons:0.9.1.0'
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile ('com.vdurmont:emoji-java:3.1.3') {
         exclude group: 'org.json', module: 'json'
     }
-    compile 'com.github.jkwiecien:EasyImage:1.3.1'
+    compile 'com.github.jkwiecien:EasyImage:1.4.0'
     compile ('com.github.ozodrukh:CircularReveal:2.0.1@aar') {
         transitive = true;
     }

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

@@ -38,7 +38,7 @@ import timber.log.Timber;
 public class App extends Application {
     /**
-     * Register our type converters on our singleton LoganSquare instance. Needs to be set here
+     * Register our type converters on our singleton LoganSquare get. Needs to be set here
      * since we are fetching accounts immediately with LoganSquare
      */
     static {
@@ -55,7 +55,7 @@ public class App extends Application {
         return sBus;
     }
-    public static App instance() {
+    public static App get() {
         return sInstance;
     }
@@ -77,6 +77,7 @@ public class App extends Application {
         sInstance = this;
         mPrefs = new Prefs(this);
+        //So that we don't get weird half translations
         forceLocale(Locale.ENGLISH);
         setupCrashReporting();

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

@@ -64,7 +64,7 @@ public class AboutActivity extends BaseActivity {
     @OnClick(R.id.sauce)
     void onSauceClick() {
-        if (getString(R.string.url_gitlab).equals(App.instance().getAccount().getServerUrl().toString())) {
+        if (getString(R.string.url_gitlab).equals(App.get().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);
-        App.instance().getGitLab().getContributors(REPO_ID).enqueue(mContributorResponseCallback);
+        App.get().getGitLab().getContributors(REPO_ID).enqueue(mContributorResponseCallback);
         mProgress.setVisibility(View.VISIBLE);
     }
@@ -159,7 +159,7 @@ public class AboutActivity extends BaseActivity {
             mPhysicsLayout.addView(imageView);
             Uri url = ImageUtil.getAvatarUrl(contributor.getEmail(), imageSize);
-            App.instance().getPicasso()
+            App.get().getPicasso()
                     .load(url)
                     .into(imageView);
         }

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

@@ -57,7 +57,7 @@ public class ActivityActivity extends BaseActivity {
         FeedFragment feedFragment = (FeedFragment) getSupportFragmentManager().findFragmentByTag(TAG_FEED_FRAGMENT);
         if (feedFragment == null) {
-            Uri feedUri = App.instance().getAccount().getServerUrl();
+            Uri feedUri = App.get().getAccount().getServerUrl();
             feedUri = feedUri.buildUpon()
                     .appendPath("dashboard")

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

@@ -129,7 +129,7 @@ public class AddIssueActivity extends MorphActivity {
             mMembers.addAll(response);
             if (mProject.belongsToGroup()) {
                 Timber.d("Project belongs to a group, loading those users too");
-                App.instance().getGitLab().getGroupMembers(mProject.getNamespace().getId()).enqueue(mGroupMembersCallback);
+                App.get().getGitLab().getGroupMembers(mProject.getNamespace().getId()).enqueue(mGroupMembersCallback);
             } else {
                 setAssignees();
             }
@@ -269,9 +269,9 @@ public class AddIssueActivity extends MorphActivity {
     }
     private void load() {
-        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);
+        App.get().getGitLab().getMilestones(mProject.getId(), getString(R.string.milestone_state_value_default)).enqueue(mMilestonesCallback);
+        App.get().getGitLab().getProjectMembers(mProject.getId()).enqueue(mAssigneeCallback);
+        App.get().getGitLab().getLabels(mProject.getId()).enqueue(mLabelCallback);
     }
     private void showLoading() {
@@ -395,7 +395,7 @@ public class AddIssueActivity extends MorphActivity {
     private void createOrSaveIssue(String title, String description, @Nullable Long assigneeId,
                                    @Nullable Long milestoneId, @Nullable String labels) {
         if (mIssue == null) {
-            App.instance().getGitLab().createIssue(
+            App.get().getGitLab().createIssue(
                     mProject.getId(),
                     title,
                     description,
@@ -403,7 +403,7 @@ public class AddIssueActivity extends MorphActivity {
                     milestoneId,
                     labels).enqueue(mIssueCreatedCallback);
         } else {
-            App.instance().getGitLab().updateIssue(mProject.getId(),
+            App.get().getGitLab().updateIssue(mProject.getId(),
                     mIssue.getId(),
                     title,
                     description,

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

@@ -118,7 +118,7 @@ public class AddLabelActivity extends BaseActivity {
                 }
             }
         });
-        App.instance().getGitLab().getLabels(mProjectId).enqueue(new EasyCallback<List<Label>>() {
+        App.get().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

@@ -175,12 +175,12 @@ public class AddMilestoneActivity extends MorphActivity {
         }
         if (mMilestone == null) {
-            App.instance().getGitLab().createMilestone(mProjectId,
+            App.get().getGitLab().createMilestone(mProjectId,
                     mTitle.getText().toString(),
                     mDescription.getText().toString(),
                     dueDate).enqueue(mMilestoneCallback);
         } else {
-            App.instance().getGitLab().editMilestone(mProjectId,
+            App.get().getGitLab().editMilestone(mProjectId,
                     mMilestone.getId(),
                     mTitle.getText().toString(),
                     mDescription.getText().toString(),

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

@@ -152,7 +152,7 @@ public class AddNewLabelActivity extends BaseActivity implements ColorChooserDia
             mProgress.setVisibility(View.VISIBLE);
             mProgress.setAlpha(0.0f);
             mProgress.animate().alpha(1.0f);
-            App.instance().getGitLab().createLabel(getProjectId(), title, color, description)
+            App.get().getGitLab().createLabel(getProjectId(), title, color, description)
                     .enqueue(mCreateLabelCallback);
         }
     }

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

@@ -168,12 +168,12 @@ public class AddUserActivity extends MorphActivity {
         public void onAccessApplied(int accessLevel) {
             mAccessDialog.showLoading();
             if (mGroup == null) {
-                App.instance().getGitLab().addProjectMember(
+                App.get().getGitLab().addProjectMember(
                         mProjectId,
                         mSelectedUser.getId(),
                         accessLevel).enqueue(mAddGroupMemeberCallback);
             } else {
-                App.instance().getGitLab().addGroupMember(mGroup.getId(),
+                App.get().getGitLab().addGroupMember(mGroup.getId(),
                         mSelectedUser.getId(),
                         accessLevel).enqueue(mAddGroupMemeberCallback);
             }
@@ -275,13 +275,13 @@ public class AddUserActivity extends MorphActivity {
         mTeleprinter.hideKeyboard();
         mSwipeRefreshLayout.setRefreshing(true);
         mLoading = true;
-        App.instance().getGitLab().searchUsers(mSearchQuery).enqueue(mUserCallback);
+        App.get().getGitLab().searchUsers(mSearchQuery).enqueue(mUserCallback);
     }
     private void loadMore() {
         mLoading = true;
         mAdapter.setLoading(true);
         Timber.d("loadMore " + mNextPageUrl.toString() + " " + mSearchQuery);
-        App.instance().getGitLab().searchUsers(mNextPageUrl.toString(), mSearchQuery).enqueue(mMoreUsersCallback);
+        App.get().getGitLab().searchUsers(mNextPageUrl.toString(), mSearchQuery).enqueue(mMoreUsersCallback);
     }
 }

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

@@ -21,6 +21,7 @@ import com.commit451.gitlab.observable.FileObservableFactory;
 import org.parceler.Parcels;
 import java.io.File;
+import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -81,7 +82,7 @@ public class AttachActivity extends BaseActivity {
     @OnClick(R.id.button_choose_photo)
     void onChoosePhotoClicked() {
-        EasyImage.openGallery(this, 0);
+        EasyImage.openGallery(this, 0, false);
     }
     @OnClick(R.id.button_take_photo)
@@ -129,9 +130,8 @@ public class AttachActivity extends BaseActivity {
             }
             @Override
-            public void onImagePicked(File imageFile, EasyImage.ImageSource source, int type) {
-                //Handle the image
-                onPhotoReturned(imageFile);
+            public void onImagesPicked(List<File> imageFiles, EasyImage.ImageSource source, int type) {
+                onPhotoReturned(imageFiles.get(0));
             }
             @Override
@@ -163,7 +163,7 @@ public class AttachActivity extends BaseActivity {
                 .subscribe(new Action1<MultipartBody.Part>() {
                     @Override
                     public void call(MultipartBody.Part part) {
-                        App.instance().getGitLab().uploadFile(mProject.getId(), part).enqueue(mUploadCallback);
+                        App.get().getGitLab().uploadFile(mProject.getId(), part).enqueue(mUploadCallback);
                     }
                 });
     }

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

 package com.commit451.gitlab.activity;
-import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import com.commit451.gitlab.R;
+import com.trello.rxlifecycle.components.support.RxAppCompatActivity;
 /**
  * Base activity for others to derive from
  */
-public class BaseActivity extends AppCompatActivity {
+public class BaseActivity extends RxAppCompatActivity {
     public boolean hasEmptyFields(TextInputLayout... textInputLayouts) {
         boolean hasEmptyField = false;

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

@@ -126,15 +126,15 @@ public class BuildActivity extends BaseActivity {
             switch (item.getItemId()) {
                 case R.id.action_retry:
                     mProgress.setVisibility(View.VISIBLE);
-                    App.instance().getGitLab().retryBuild(mProject.getId(), mBuild.getId()).enqueue(mRetryCallback);
+                    App.get().getGitLab().retryBuild(mProject.getId(), mBuild.getId()).enqueue(mRetryCallback);
                     return true;
                 case R.id.action_erase:
                     mProgress.setVisibility(View.VISIBLE);
-                    App.instance().getGitLab().eraseBuild(mProject.getId(), mBuild.getId()).enqueue(mEraseCallback);
+                    App.get().getGitLab().eraseBuild(mProject.getId(), mBuild.getId()).enqueue(mEraseCallback);
                     return true;
                 case R.id.action_cancel:
                     mProgress.setVisibility(View.VISIBLE);
-                    App.instance().getGitLab().cancelBuild(mProject.getId(), mBuild.getId()).enqueue(mCancelCallback);
+                    App.get().getGitLab().cancelBuild(mProject.getId(), mBuild.getId()).enqueue(mCancelCallback);
                     return true;
                 case R.id.action_download:
                     checkDownloadBuild();
@@ -201,8 +201,8 @@ public class BuildActivity extends BaseActivity {
     }
     private void downloadBuild() {
-        Account account = App.instance().getAccount();
-        String downloadUrl = BuildUtil.getDownloadBuildUrl(App.instance().getAccount().getServerUrl(), mProject, mBuild);
+        Account account = App.get().getAccount();
+        String downloadUrl = BuildUtil.getDownloadBuildUrl(App.get().getAccount().getServerUrl(), mProject, mBuild);
         Timber.d("Downloading build: " + downloadUrl);
         DownloadUtil.download(BuildActivity.this, account, downloadUrl, mBuild.getArtifactsFile().getFileName());
     }

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

@@ -116,6 +116,6 @@ public class DiffActivity extends BaseActivity {
             }
             }
         });
-        App.instance().getGitLab().getCommitDiff(mProject.getId(), mCommit.getId()).enqueue(mDiffCallback);
+        App.get().getGitLab().getCommitDiff(mProject.getId(), mCommit.getId()).enqueue(mDiffCallback);
     }
 }
\ No newline at end of file

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

@@ -133,7 +133,7 @@ public class FileActivity extends BaseActivity {
     private void loadData() {
         mProgressView.setVisibility(View.VISIBLE);
-        App.instance().getGitLab().getFile(mProjectId, mPath, mRef).enqueue(mRepositoryFileCallback);
+        App.get().getGitLab().getFile(mProjectId, mPath, mRef).enqueue(mRepositoryFileCallback);
     }
     private void bindFile(RepositoryFile repositoryFile) {

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

@@ -17,6 +17,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
+import com.commit451.alakazam.Alakazam;
 import com.commit451.easel.Easel;
 import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.App;
@@ -98,7 +99,7 @@ public class GroupActivity extends BaseActivity {
         } else {
             mProgress.setVisibility(View.VISIBLE);
             long groupId = getIntent().getLongExtra(KEY_GROUP_ID, -1);
-            App.instance().getGitLab().getGroup(groupId).enqueue(mGroupCallback);
+            App.get().getGitLab().getGroup(groupId).enqueue(mGroupCallback);
         }
     }
@@ -108,7 +109,7 @@ public class GroupActivity extends BaseActivity {
     }
     private void bind(Group group) {
-        App.instance().getPicasso()
+        App.get().getPicasso()
                 .load(group.getAvatarUrl())
                 .transform(PaletteTransformation.instance())
                 .into(mBackdrop, new PaletteTransformation.PaletteCallback(mBackdrop) {
@@ -131,7 +132,7 @@ public class GroupActivity extends BaseActivity {
         int darkerColor = Easel.getDarkerColor(vibrantColor);
         if (Build.VERSION.SDK_INT >= 21) {
-            Easel.getNavigationBarColorAnimator(getWindow(), darkerColor)
+            Alakazam.navigationBarColorAnimator(getWindow(), darkerColor)
                     .setDuration(animationTime)
                     .start();
         }

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

@@ -173,7 +173,7 @@ public class GroupsActivity extends BaseActivity {
         mNextPageUrl = null;
         mLoading = true;
-        App.instance().getGitLab().getGroups().enqueue(mGroupsCallback);
+        App.get().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);
-        App.instance().getGitLab().getGroups(mNextPageUrl.toString()).enqueue(mMoreGroupsCallback);
+        App.get().getGitLab().getGroups(mNextPageUrl.toString()).enqueue(mMoreGroupsCallback);
     }
     private class EventReceiver {

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

@@ -125,7 +125,7 @@ public class IssueActivity extends BaseActivity {
                     closeOrOpenIssue();
                     return true;
                 case R.id.action_delete:
-                    App.instance().getGitLab().deleteIssue(mProject.getId(), mIssue.getId()).enqueue(mDeleteIssueCallback);
+                    App.get().getGitLab().deleteIssue(mProject.getId(), mIssue.getId()).enqueue(mDeleteIssueCallback);
                     return true;
             }
             return false;
@@ -136,7 +136,7 @@ public class IssueActivity extends BaseActivity {
         @Override
         public void success(@NonNull Project response) {
             mProject = response;
-            App.instance().getGitLab().getIssuesByIid(mProject.getId(), mIssueIid).enqueue(mIssueCallback);
+            App.get().getGitLab().getIssuesByIid(mProject.getId(), mIssueIid).enqueue(mIssueCallback);
         }
         @Override
@@ -336,7 +336,7 @@ public class IssueActivity extends BaseActivity {
                     }
                 }
             });
-            App.instance().getGitLab().getProject(projectNamespace, projectName).enqueue(mProjectCallback);
+            App.get().getGitLab().getProject(projectNamespace, projectName).enqueue(mProjectCallback);
         }
     }
@@ -384,13 +384,13 @@ public class IssueActivity extends BaseActivity {
             }
         });
         mLoading = true;
-        App.instance().getGitLab().getIssueNotes(mProject.getId(), mIssue.getId()).enqueue(mNotesCallback);
+        App.get().getGitLab().getIssueNotes(mProject.getId(), mIssue.getId()).enqueue(mNotesCallback);
     }
     private void loadMoreNotes() {
         mLoading = true;
         mIssueDetailsAdapter.setLoading(true);
-        App.instance().getGitLab().getIssueNotes(mNextPageUrl.toString()).enqueue(mMoreNotesCallback);
+        App.get().getGitLab().getIssueNotes(mNextPageUrl.toString()).enqueue(mMoreNotesCallback);
     }
     private void postNote(String message) {
@@ -406,16 +406,16 @@ public class IssueActivity extends BaseActivity {
         mTeleprinter.hideKeyboard();
         mSendMessageView.clearText();
-        App.instance().getGitLab().addIssueNote(mProject.getId(), mIssue.getId(), message).enqueue(mPostNoteCallback);
+        App.get().getGitLab().addIssueNote(mProject.getId(), mIssue.getId(), message).enqueue(mPostNoteCallback);
     }
     private void closeOrOpenIssue() {
         mProgress.setVisibility(View.VISIBLE);
         if (mIssue.getState().equals(Issue.STATE_CLOSED)) {
-            App.instance().getGitLab().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_REOPEN)
+            App.get().getGitLab().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_REOPEN)
                     .enqueue(mOpenCloseCallback);
         } else {
-            App.instance().getGitLab().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_CLOSE)
+            App.get().getGitLab().updateIssueStatus(mProject.getId(), mIssue.getId(), Issue.STATE_CLOSE)
                     .enqueue(mOpenCloseCallback);
         }
     }

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

@@ -33,17 +33,17 @@ public class LaunchActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        int savedVersion = App.instance().getPrefs().getSavedVersion();
+        int savedVersion = App.get().getPrefs().getSavedVersion();
         if (savedVersion != -1 && savedVersion < BuildConfig.VERSION_CODE) {
             Timber.d("Performing upgrade");
             performUpgrade(savedVersion, BuildConfig.VERSION_CODE);
-            App.instance().getPrefs().setSavedVersion();
+            App.get().getPrefs().setSavedVersion();
         }
         List<Account> accounts = Account.getAccounts();
         if(accounts.isEmpty()) {
             Navigator.navigateToLogin(this);
             finish();
-        } else if (App.instance().getPrefs().isRequireDeviceAuth()) {
+        } else if (App.get().getPrefs().isRequireDeviceAuth()) {
             showKeyguard();
         } else {
             if (PRIVATE_KEY_ENABLED) {

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

@@ -98,19 +98,19 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
             switch (mLoadType) {
                 case LOAD_TYPE_DIFF:
                     String sha = getIntent().getStringExtra(EXTRA_COMMIT_SHA);
-                    App.instance().getGitLab().getCommit(response.getId(), sha).enqueue(mCommitCallback);
+                    App.get().getGitLab().getCommit(response.getId(), sha).enqueue(mCommitCallback);
                     return;
                 case LOAD_TYPE_MERGE_REQUEST:
                     String mergeRequestId = getIntent().getStringExtra(EXTRA_MERGE_REQUEST);
-                    App.instance().getGitLab().getMergeRequestsByIid(response.getId(), mergeRequestId).enqueue(mMergeRequestCallback);
+                    App.get().getGitLab().getMergeRequestsByIid(response.getId(), mergeRequestId).enqueue(mMergeRequestCallback);
                     return;
                 case LOAD_TYPE_BUILD:
                     long buildId = getIntent().getLongExtra(EXTRA_BUILD_ID, -1);
-                    App.instance().getGitLab().getBuild(response.getId(), buildId).enqueue(mBuildCallback);
+                    App.get().getGitLab().getBuild(response.getId(), buildId).enqueue(mBuildCallback);
                     return;
                 case LOAD_TYPE_MILESTONE:
                     String milestoneId = getIntent().getStringExtra(EXTRA_MILESTONE_ID);
-                    App.instance().getGitLab().getMilestonesByIid(response.getId(), milestoneId).enqueue(mMilestoneCallback);
+                    App.get().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);
-                App.instance().getGitLab().getProject(namespace, project).enqueue(mProjectCallback);
+                App.get().getGitLab().getProject(namespace, project).enqueue(mProjectCallback);
                 break;
         }
     }

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

@@ -35,7 +35,6 @@ import com.commit451.gitlab.R;
 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;
 import com.commit451.gitlab.event.ReloadDataEvent;
@@ -164,8 +163,8 @@ public class LoginActivity extends BaseActivity {
             }
             mAccount.setUser(response.body());
             mAccount.setLastUsed(new Date());
-            App.instance().getPrefs().addAccount(mAccount);
-            App.instance().setAccount(mAccount);
+            App.get().getPrefs().addAccount(mAccount);
+            App.get().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());
@@ -578,7 +577,7 @@ public class LoginActivity extends BaseActivity {
     }
     private boolean isAlreadySignedIn(@NonNull String url, @NonNull String usernameOrEmailOrPrivateToken) {
-        List<Account> accounts = App.instance().getPrefs().getAccounts();
+        List<Account> accounts = App.get().getPrefs().getAccounts();
         for (Account account : accounts) {
             if (account.getServerUrl().equals(Uri.parse(url))) {
                 if (usernameOrEmailOrPrivateToken.equals(account.getUser().getUsername())