Use the easy callback

app/build.gradle

@@ -79,6 +79,7 @@ dependencies {
     compile 'com.github.Commit451:Teleprinter:1.0.1'
     compile 'com.github.Commit451:BypassPicassoImageGetter:1.0.0'
     compile 'com.github.Commit451:Jounce:1.0.1'
+    compile 'com.github.Commit451:EasyCallback:1.0.0'
     compile 'com.pnikosis:materialish-progress:1.7'
     compile 'com.jawnnypoo:physicslayout:1.0.1'
     compile 'com.alexgwyn.recyclerviewsquire:recyclerviewsquire:0.0.5'

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

@@ -19,7 +19,7 @@ import android.widget.TextView;
 import com.commit451.gitbal.Gimbal;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Contributor;
 import com.commit451.gitlab.navigation.NavigationManager;
@@ -93,13 +93,13 @@ public class AboutActivity extends BaseActivity {
     private Callback<List<Contributor>> mContributorResponseCallback = new EasyCallback<List<Contributor>>() {
         @Override
-        public void onResponse(@NonNull List<Contributor> response) {
+        public void success(@NonNull List<Contributor> response) {
             mProgress.setVisibility(View.GONE);
             addContributors(Contributor.groupContributors(response));
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.failed_to_load_contributors, Snackbar.LENGTH_SHORT)

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

@@ -20,7 +20,7 @@ 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.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.api.exception.NullBodyException;
 import com.commit451.gitlab.event.IssueChangedEvent;
@@ -105,7 +105,7 @@ public class AddIssueActivity extends MorphActivity {
     private final Callback<List<Milestone>> mMilestonesCallback = new EasyCallback<List<Milestone>>() {
         @Override
-        public void onResponse(@NonNull List<Milestone> response) {
+        public void success(@NonNull List<Milestone> response) {
             mMilestoneProgress.setVisibility(View.GONE);
             mMilestoneSpinner.setVisibility(View.VISIBLE);
             MilestoneSpinnerAdapter milestoneSpinnerAdapter = new MilestoneSpinnerAdapter(AddIssueActivity.this, response);
@@ -116,7 +116,7 @@ public class AddIssueActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mMilestoneProgress.setVisibility(View.GONE);
             mMilestoneSpinner.setVisibility(View.GONE);
@@ -125,7 +125,7 @@ public class AddIssueActivity extends MorphActivity {
     private final Callback<List<Member>> mAssigneeCallback = new EasyCallback<List<Member>>() {
         @Override
-        public void onResponse(@NonNull List<Member> response) {
+        public void success(@NonNull List<Member> response) {
             mMembers.addAll(response);
             if (mProject.belongsToGroup()) {
                 Timber.d("Project belongs to a group, loading those users too");
@@ -136,7 +136,7 @@ public class AddIssueActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mAssigneeSpinner.setVisibility(View.GONE);
             mAssigneeProgress.setVisibility(View.GONE);
@@ -145,13 +145,13 @@ public class AddIssueActivity extends MorphActivity {
     private final Callback<List<Member>> mGroupMembersCallback = new EasyCallback<List<Member>>() {
         @Override
-        public void onResponse(@NonNull List<Member> response) {
+        public void success(@NonNull List<Member> response) {
             mMembers.addAll(response);
             setAssignees();
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mAssigneeSpinner.setVisibility(View.GONE);
             mAssigneeProgress.setVisibility(View.GONE);
@@ -160,14 +160,14 @@ public class AddIssueActivity extends MorphActivity {
     private final Callback<List<Label>> mLabelCallback = new EasyCallback<List<Label>>() {
         @Override
-        public void onResponse(@NonNull List<Label> response) {
+        public void success(@NonNull List<Label> response) {
             mLabelsProgress.setVisibility(View.GONE);
             mListLabels.setVisibility(View.VISIBLE);
             setLabels(response);
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             //null body could just mean no labels have been created for this project
             if (t instanceof NullBodyException) {
@@ -183,7 +183,7 @@ public class AddIssueActivity extends MorphActivity {
     private final Callback<Issue> mIssueCreatedCallback = new EasyCallback<Issue>() {
         @Override
-        public void onResponse(@NonNull Issue response) {
+        public void success(@NonNull Issue response) {
             if (mIssue == null) {
                 LabCoatApp.bus().post(new IssueCreatedEvent(response));
             } else {
@@ -193,7 +193,7 @@ public class AddIssueActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             Snackbar.make(mRoot, getString(R.string.failed_to_create_issue), Snackbar.LENGTH_SHORT)
                     .show();

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

@@ -18,7 +18,7 @@ import android.widget.FrameLayout;
 import com.commit451.easel.Easel;
 import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.MilestoneChangedEvent;
 import com.commit451.gitlab.event.MilestoneCreatedEvent;
@@ -111,7 +111,7 @@ public class AddMilestoneActivity extends MorphActivity {
     private Callback<Milestone> mMilestoneCallback = new EasyCallback<Milestone>() {
         @Override
-        public void onResponse(@NonNull Milestone response) {
+        public void success(@NonNull Milestone response) {
             mProgress.setVisibility(View.GONE);
             if (mMilestone == null) {
                 LabCoatApp.bus().post(new MilestoneCreatedEvent(response));
@@ -122,7 +122,7 @@ public class AddMilestoneActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             showError();

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

@@ -23,7 +23,7 @@ import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.UsersAdapter;
 import com.commit451.gitlab.animation.HideRunnable;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.api.exception.HttpException;
 import com.commit451.gitlab.dialog.AccessDialog;
@@ -183,7 +183,7 @@ public class AddUserActivity extends MorphActivity {
     private final Callback<List<UserBasic>> mUserCallback = new EasyCallback<List<UserBasic>>() {
         @Override
-        public void onResponse(@NonNull List<UserBasic> response) {
+        public void success(@NonNull List<UserBasic> response) {
             mSwipeRefreshLayout.setRefreshing(false);
             mLoading = false;
             mAdapter.setData(response);
@@ -192,7 +192,7 @@ public class AddUserActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mSwipeRefreshLayout.setRefreshing(false);
             mLoading = false;
@@ -203,7 +203,7 @@ public class AddUserActivity extends MorphActivity {
     private final Callback<List<UserBasic>> mMoreUsersCallback = new EasyCallback<List<UserBasic>>() {
         @Override
-        public void onResponse(@NonNull List<UserBasic> response) {
+        public void success(@NonNull List<UserBasic> response) {
             mLoading = false;
             mAdapter.setLoading(false);
             mAdapter.addData(response);
@@ -211,7 +211,7 @@ public class AddUserActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mAdapter.setLoading(false);
         }
@@ -219,7 +219,7 @@ public class AddUserActivity extends MorphActivity {
     private final Callback<Member> mAddGroupMemeberCallback = new EasyCallback<Member>() {
         @Override
-        public void onResponse(@NonNull Member response) {
+        public void success(@NonNull Member response) {
             Snackbar.make(mRoot, R.string.user_added_successfully, Snackbar.LENGTH_SHORT)
                     .show();
             mAccessDialog.dismiss();
@@ -228,7 +228,7 @@ public class AddUserActivity extends MorphActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (t instanceof HttpException) {
                 //Conflict

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

@@ -15,7 +15,7 @@ import android.view.ViewGroup;
 import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.BuildSectionsPagerAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.model.api.Build;
@@ -58,7 +58,7 @@ public class BuildActivity extends BaseActivity {
     private final EasyCallback<Build> mRetryCallback = new EasyCallback<Build>() {
         @Override
-        public void onResponse(@NonNull Build response) {
+        public void success(@NonNull Build response) {
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.build_started, Snackbar.LENGTH_LONG)
                     .show();
@@ -66,7 +66,7 @@ public class BuildActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.unable_to_retry_build, Snackbar.LENGTH_LONG)
@@ -76,7 +76,7 @@ public class BuildActivity extends BaseActivity {
     private final EasyCallback<Build> mEraseCallback = new EasyCallback<Build>() {
         @Override
-        public void onResponse(@NonNull Build response) {
+        public void success(@NonNull Build response) {
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.build_erased, Snackbar.LENGTH_LONG)
                     .show();
@@ -84,7 +84,7 @@ public class BuildActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.unable_to_erase_build, Snackbar.LENGTH_LONG)
@@ -94,7 +94,7 @@ public class BuildActivity extends BaseActivity {
     private final EasyCallback<Build> mCancelCallback = new EasyCallback<Build>() {
         @Override
-        public void onResponse(@NonNull Build response) {
+        public void success(@NonNull Build response) {
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.build_canceled, Snackbar.LENGTH_LONG)
                     .show();
@@ -102,7 +102,7 @@ public class BuildActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.unable_to_cancel_build, Snackbar.LENGTH_LONG)

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

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DiffAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+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;
@@ -56,13 +56,13 @@ public class DiffActivity extends BaseActivity {
     private Callback<List<Diff>> mDiffCallback = new EasyCallback<List<Diff>>() {
         @Override
-        public void onResponse(@NonNull List<Diff> response) {
+        public void success(@NonNull List<Diff> response) {
             mSwipeRefreshLayout.setRefreshing(false);
             mDiffAdapter.setData(response);
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mSwipeRefreshLayout.setRefreshing(false);
             Timber.e(t, null);
             mMessageText.setText(R.string.connection_error);

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

@@ -22,7 +22,7 @@ import android.webkit.MimeTypeMap;
 import android.webkit.WebView;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.RepositoryFile;
 import com.commit451.gitlab.observable.DecodeObservableFactory;
@@ -80,13 +80,13 @@ public class FileActivity extends BaseActivity {
     private final Callback<RepositoryFile> mRepositoryFileCallback = new EasyCallback<RepositoryFile>() {
         @Override
-        public void onResponse(@NonNull RepositoryFile response) {
+        public void success(@NonNull RepositoryFile response) {
             mProgressView.setVisibility(View.GONE);
             bindFile(response);
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgressView.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.file_load_error, Snackbar.LENGTH_SHORT)

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

@@ -20,7 +20,7 @@ import android.widget.ImageView;
 import com.commit451.easel.Easel;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupPagerAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+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;
@@ -63,13 +63,13 @@ public class GroupActivity extends BaseActivity {
     private final Callback<GroupDetail> mGroupCallback = new EasyCallback<GroupDetail>() {
         @Override
-        public void onResponse(@NonNull GroupDetail response) {
+        public void success(@NonNull GroupDetail response) {
             mProgress.setVisibility(View.GONE);
             bind(response);
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             showError();

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

@@ -18,7 +18,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.GroupAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.CloseDrawerEvent;
 import com.commit451.gitlab.model.api.Group;
@@ -71,7 +71,7 @@ public class GroupsActivity extends BaseActivity {
     private final Callback<List<Group>> mGroupsCallback = new EasyCallback<List<Group>>() {
         @Override
-        public void onResponse(@NonNull List<Group> response) {
+        public void success(@NonNull List<Group> response) {
             mLoading = false;
             mSwipeRefreshLayout.setRefreshing(false);
             if (response.isEmpty()) {
@@ -86,7 +86,7 @@ public class GroupsActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mSwipeRefreshLayout.setRefreshing(false);
             mLoading = false;
@@ -97,14 +97,14 @@ public class GroupsActivity extends BaseActivity {
     private final Callback<List<Group>> mMoreGroupsCallback = new EasyCallback<List<Group>>() {
         @Override
-        public void onResponse(@NonNull List<Group> response) {
+        public void success(@NonNull List<Group> response) {
             mLoading = false;
             mGroupAdapter.addGroups(response);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
         }

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

@@ -20,7 +20,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.IssueDetailsAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.IssueChangedEvent;
 import com.commit451.gitlab.event.IssueReloadEvent;
@@ -140,13 +140,13 @@ public class IssueActivity extends BaseActivity {
     private Callback<Project> mProjectCallback = new EasyCallback<Project>() {
         @Override
-        public void onResponse(@NonNull Project response) {
+        public void success(@NonNull Project response) {
             mProject = response;
             GitLabClient.instance().getIssuesByIid(mProject.getId(), mIssueIid).enqueue(mIssueCallback);
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mSwipeRefreshLayout.setRefreshing(false);
             Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
@@ -157,7 +157,7 @@ public class IssueActivity extends BaseActivity {
     private Callback<List<Issue>> mIssueCallback = new EasyCallback<List<Issue>>() {
         @Override
-        public void onResponse(@NonNull List<Issue> response) {
+        public void success(@NonNull List<Issue> response) {
             if (response.isEmpty()) {
                 mSwipeRefreshLayout.setRefreshing(false);
                 Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
@@ -173,7 +173,7 @@ public class IssueActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mSwipeRefreshLayout.setRefreshing(false);
             Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
@@ -184,7 +184,7 @@ public class IssueActivity extends BaseActivity {
     private Callback<List<Note>> mNotesCallback = new EasyCallback<List<Note>>() {
         @Override
-        public void onResponse(@NonNull List<Note> response) {
+        public void success(@NonNull List<Note> response) {
             mLoading = false;
             mSwipeRefreshLayout.setRefreshing(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -192,7 +192,7 @@ public class IssueActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             mSwipeRefreshLayout.setRefreshing(false);
@@ -204,7 +204,7 @@ public class IssueActivity extends BaseActivity {
     private Callback<List<Note>> mMoreNotesCallback = new EasyCallback<List<Note>>() {
         @Override
-        public void onResponse(@NonNull List<Note> response) {
+        public void success(@NonNull List<Note> response) {
             mLoading = false;
             mIssueDetailsAdapter.setLoading(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -212,7 +212,7 @@ public class IssueActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             mIssueDetailsAdapter.setLoading(false);
@@ -221,7 +221,7 @@ public class IssueActivity extends BaseActivity {
     private final Callback<Issue> mOpenCloseCallback = new EasyCallback<Issue>() {
         @Override
-        public void onResponse(@NonNull Issue response) {
+        public void success(@NonNull Issue response) {
             mProgress.setVisibility(View.GONE);
             mIssue = response;
             LabCoatApp.bus().post(new IssueChangedEvent(mIssue));
@@ -231,7 +231,7 @@ public class IssueActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, getString(R.string.error_changing_issue), Snackbar.LENGTH_SHORT)
@@ -242,14 +242,14 @@ public class IssueActivity extends BaseActivity {
     private Callback<Note> mPostNoteCallback = new EasyCallback<Note>() {
         @Override
-        public void onResponse(@NonNull Note response) {
+        public void success(@NonNull Note response) {
             mProgress.setVisibility(View.GONE);
             mIssueDetailsAdapter.addNote(response);
             mNotesRecyclerView.smoothScrollToPosition(IssueDetailsAdapter.getHeaderCount());
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
@@ -259,13 +259,13 @@ public class IssueActivity extends BaseActivity {
     private Callback<FileUploadResponse> mUploadImageCallback = new EasyCallback<FileUploadResponse>() {
         @Override
-        public void onResponse(@NonNull FileUploadResponse response) {
+        public void success(@NonNull FileUploadResponse response) {
             mProgress.setVisibility(View.GONE);
             mSendMessageView.appendText(response.getMarkdown());
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)

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

@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.Toast;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Build;
 import com.commit451.gitlab.model.api.MergeRequest;
@@ -93,7 +93,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
     private final EasyCallback<Project> mProjectCallback = new EasyCallback<Project>() {
         @Override
-        public void onResponse(@NonNull Project response) {
+        public void success(@NonNull Project response) {
             mProject = response;
             switch (mLoadType) {
                 case LOAD_TYPE_DIFF:
@@ -117,7 +117,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             onError();
         }
@@ -125,13 +125,13 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
     private final EasyCallback<RepositoryCommit> mCommitCallback = new EasyCallback<RepositoryCommit>() {
         @Override
-        public void onResponse(@NonNull RepositoryCommit response) {
+        public void success(@NonNull RepositoryCommit response) {
             NavigationManager.navigateToDiffActivity(LoadSomeInfoActivity.this, mProject, response);
             finish();
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             onError();
         }
@@ -139,7 +139,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
     private final EasyCallback<List<MergeRequest>> mMergeRequestCallback = new EasyCallback<List<MergeRequest>>() {
         @Override
-        public void onResponse(@NonNull List<MergeRequest> response) {
+        public void success(@NonNull List<MergeRequest> response) {
             if (!response.isEmpty()) {
                 NavigationManager.navigateToMergeRequest(LoadSomeInfoActivity.this, mProject, response.get(0));
                 finish();
@@ -149,7 +149,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             onError();
         }
@@ -157,13 +157,13 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
     private final EasyCallback<Build> mBuildCallback = new EasyCallback<Build>() {
         @Override
-        public void onResponse(@NonNull Build response) {
+        public void success(@NonNull Build response) {
             NavigationManager.navigateToBuild(LoadSomeInfoActivity.this, mProject, response);
             finish();
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             onError();
         }
@@ -171,7 +171,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
     private final EasyCallback<List<Milestone>> mMilestoneCallback = new EasyCallback<List<Milestone>>() {
         @Override
-        public void onResponse(@NonNull List<Milestone> response) {
+        public void success(@NonNull List<Milestone> response) {
             if (!response.isEmpty()) {
                 NavigationManager.navigateToMilestone(LoadSomeInfoActivity.this, mProject, response.get(0));
                 finish();
@@ -181,7 +181,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             onError();
         }

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

@@ -15,7 +15,7 @@ import android.view.ViewGroup;
 import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.MergeRequestSectionsPagerAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.MergeRequestChangedEvent;
 import com.commit451.gitlab.model.api.MergeRequest;
@@ -58,7 +58,7 @@ public class MergeRequestActivity extends BaseActivity {
     private final EasyCallback<MergeRequest> mMergeRequestCallback = new EasyCallback<MergeRequest>() {
         @Override
-        public void onResponse(@NonNull MergeRequest response) {
+        public void success(@NonNull MergeRequest response) {
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.merge_request_accepted, Snackbar.LENGTH_LONG)
                     .show();
@@ -66,7 +66,7 @@ public class MergeRequestActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, R.string.unable_to_merge, Snackbar.LENGTH_LONG)

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

@@ -19,7 +19,7 @@ import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
 import com.commit451.gitlab.adapter.MilestoneIssuesAdapter;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.MilestoneChangedEvent;
 import com.commit451.gitlab.model.api.Issue;
@@ -87,7 +87,7 @@ public class MilestoneActivity extends BaseActivity {
     private final Callback<List<Issue>> mIssuesCallback = new EasyCallback<List<Issue>>() {
         @Override
-        public void onResponse(@NonNull List<Issue> response) {
+        public void success(@NonNull List<Issue> response) {
             mSwipeRefreshLayout.setRefreshing(false);
             mLoading = false;
@@ -104,7 +104,7 @@ public class MilestoneActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
             mSwipeRefreshLayout.setRefreshing(false);
@@ -116,14 +116,14 @@ public class MilestoneActivity extends BaseActivity {
     private final Callback<List<Issue>> mMoreIssuesCallback = new EasyCallback<List<Issue>>() {
         @Override
-        public void onResponse(@NonNull List<Issue> response) {
+        public void success(@NonNull List<Issue> response) {
             mLoading = false;
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
             mMilestoneIssuesAdapter.addIssues(response);
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
         }
@@ -131,7 +131,7 @@ public class MilestoneActivity extends BaseActivity {
     private final Callback<Milestone> mOpenCloseCallback = new EasyCallback<Milestone>() {
         @Override
-        public void onResponse(@NonNull Milestone response) {
+        public void success(@NonNull Milestone response) {
             mProgress.setVisibility(View.GONE);
             mMilestone = response;
             LabCoatApp.bus().post(new MilestoneChangedEvent(mMilestone));
@@ -139,7 +139,7 @@ public class MilestoneActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.setVisibility(View.GONE);
             Snackbar.make(mRoot, getString(R.string.failed_to_create_milestone), Snackbar.LENGTH_SHORT)

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

@@ -24,7 +24,7 @@ import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.SectionsPagerAdapter;
 import com.commit451.gitlab.animation.HideRunnable;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.ProjectReloadEvent;
 import com.commit451.gitlab.fragment.BaseFragment;
@@ -92,14 +92,14 @@ public class ProjectActivity extends BaseActivity {
     private final Callback<Project> mProjectCallback = new EasyCallback<Project>() {
         @Override
-        public void onResponse(@NonNull Project response) {
+        public void success(@NonNull Project response) {
             mProject = response;
             setupTabs();
             loadBranches();
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.animate()
                     .alpha(0.0f)
@@ -112,7 +112,7 @@ public class ProjectActivity extends BaseActivity {
     private final Callback<List<Branch>> mBranchesCallback = new EasyCallback<List<Branch>>() {
         @Override
-        public void onResponse(@NonNull List<Branch> response) {
+        public void success(@NonNull List<Branch> response) {
             mProgress.animate()
                     .alpha(0.0f)
                     .withEndAction(new HideRunnable(mProgress));
@@ -140,7 +140,7 @@ public class ProjectActivity extends BaseActivity {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mProgress.animate()
                     .alpha(0.0f)

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

-package com.commit451.gitlab.api;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import com.commit451.gitlab.api.exception.HttpException;
-import com.commit451.gitlab.api.exception.NullBodyException;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * An easier version of a Retrofit callback that simplifies
- * the response block so that you do not have to check
- * {@link Response#isSuccessful()}. You can still call {@link #getResponse()}
- * if you need it. If there is a HTTP error, {@link #onAllFailure(Throwable)}
- * will be called with a {@link HttpException}
- */
-public abstract class EasyCallback<T> implements Callback<T> {
-
-    @Nullable
-    private Response<T> mResponse;
-    private Call<T> mCall;
-
-    public abstract void onResponse(@NonNull T response);
-
-    public abstract void onAllFailure(Throwable t);
-
-    @Override
-    public void onResponse(Call<T> call, Response<T> response) {
-        mCall = call;
-        mResponse = response;
-        if (!response.isSuccessful()) {
-            onAllFailure(new HttpException(response.code(), response.errorBody()));
-            return;
-        }
-        if (response.body() == null) {
-            onAllFailure(new NullBodyException());
-            return;
-        }
-        onResponse(response.body());
-    }
-
-    @Override
-    public void onFailure(Call<T> call, Throwable t) {
-        mCall = call;
-        onAllFailure(t);
-    }
-
-    @Nullable
-    public Response<T> getResponse() {
-        return mResponse;
-    }
-
-    @Nullable
-    public Call<T> getCall() {
-        return mCall;
-    }
-}

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

@@ -8,7 +8,7 @@ import android.widget.Toast;
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Group;
 import com.commit451.gitlab.model.api.Member;
@@ -47,7 +47,7 @@ public class AccessDialog extends MaterialDialog {
     private final Callback<Member> mEditUserCallback = new EasyCallback<Member>() {
         @Override
-        public void onResponse(@NonNull Member response) {
+        public void success(@NonNull Member response) {
             if (mAccessChangedListener != null) {
                 mAccessChangedListener.onAccessChanged(mMember, mRoleNames[getSelectedIndex()]);
             }
@@ -55,7 +55,7 @@ public class AccessDialog extends MaterialDialog {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             onError();
         }

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

@@ -15,7 +15,7 @@ import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.adapter.BuildArtifactsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.model.api.Artifact;
@@ -59,7 +59,7 @@ public class BuildArtifactsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Artifact>> mCommitsCallback = new EasyCallback<List<Artifact>>() {
         @Override
-        public void onResponse(@NonNull List<Artifact> response) {
+        public void success(@NonNull List<Artifact> response) {
             if (getView() == null) {
                 return;
             }
@@ -74,7 +74,7 @@ public class BuildArtifactsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.LabCoatApp;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.model.api.Build;
@@ -70,7 +70,7 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
     private final EasyCallback<Build> mLoadBuildCallback = new EasyCallback<Build>() {
         @Override
-        public void onResponse(@NonNull Build response) {
+        public void success(@NonNull Build response) {
             if (getView() == null) {
                 return;
             }
@@ -81,7 +81,7 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             if (getView() == null) {
                 return;

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

@@ -20,7 +20,7 @@ import com.commit451.gitlab.R;
 import com.commit451.gitlab.activity.ProjectActivity;
 import com.commit451.gitlab.adapter.BuildsAdapter;
 import com.commit451.gitlab.adapter.DividerItemDecoration;
-import com.commit451.gitlab.api.EasyCallback;
+import com.commit451.easycallback.EasyCallback;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.event.BuildChangedEvent;
 import com.commit451.gitlab.event.ProjectReloadEvent;
@@ -104,7 +104,7 @@ public class BuildsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Build>> mLoadCallback = new EasyCallback<List<Build>>() {
         @Override
-        public void onResponse(@NonNull List<Build> response) {
+        public void success(@NonNull List<Build> response) {
             mLoading = false;
             if (getView() == null) {
                 return;
@@ -120,7 +120,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             mLoading = false;
             Timber.e(t, null);
             if (getView() == null) {
@@ -136,7 +136,7 @@ public class BuildsFragment extends ButterKnifeFragment {
     private final EasyCallback<List<Build>> mMoreCallback = new EasyCallback<List<Build>>() {
         @Override
-        public void onResponse(@NonNull List<Build> response) {
+        public void success(@NonNull List<Build> response) {
             mLoading = false;
             mBuildsAdapter.setLoading(false);
             mNextPageUrl = PaginationUtil.parse(getResponse()).getNext();
@@ -144,7 +144,7 @@ public class BuildsFragment extends ButterKnifeFragment {
         }
         @Override
-        public void onAllFailure(Throwable t) {
+        public void failure(Throwable t) {
             Timber.e(t, null);
             mLoading = false;
             mBuildsAdapter.setLoading(false);