Skip to content
Snippets Groups Projects
Commit 4088fe8f authored by John Carlson's avatar John Carlson
Browse files

Reptar 2.x

parent 411f6f88
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 194 additions and 196 deletions
app/build.gradle
+ 2
− 2
View file @ 4088fe8f
@@ -64,13 +64,13 @@ android {
}
}
 
ext.supportLibVersion = '25.0.1'
ext.supportLibVersion = '25.1.0'
ext.retrofitVersion = '2.1.0'
ext.okHttpVersion = '3.5.0'
ext.butterknifeVersion = '8.4.0'
ext.loganSquareVersion = '1.3.7'
ext.parcelerVersion = '1.1.6'
ext.reptarVersion = '1.0.1'
ext.reptarVersion = '2.0.1'
ext.adapterLayout = '1.1.0'
ext.materialDialogsVersion = '0.9.1.0'
dependencies {
app/src/main/java/com/commit451/gitlab/activity/AboutActivity.java
+ 5
− 5
View file @ 4088fe8f
@@ -20,10 +20,10 @@ import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.api.Contributor;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.util.ImageUtil;
import com.commit451.gitlab.util.IntentUtil;
import com.commit451.gitlab.view.PhysicsFlowLayout;
import com.commit451.reptar.FocusedSingleObserver;
import com.jawnnypoo.physicslayout.Physics;
import com.jawnnypoo.physicslayout.PhysicsConfig;
import com.wefika.flowlayout.FlowLayout;
@@ -113,18 +113,18 @@ public class AboutActivity extends BaseActivity {
.compose(this.<List<Contributor>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<Contributor>>() {
.subscribe(new CustomSingleObserver<List<Contributor>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.failed_to_load_contributors, Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(List<Contributor> contributors) {
public void success(List<Contributor> contributors) {
mProgress.setVisibility(View.GONE);
addContributors(Contributor.groupContributors(contributors));
}
app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.java
+ 22
− 23
View file @ 4088fe8f
@@ -32,8 +32,8 @@ import com.commit451.gitlab.model.api.Member;
import com.commit451.gitlab.model.api.Milestone;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.teleprinter.Teleprinter;
 
import org.parceler.Parcels;
@@ -178,17 +178,17 @@ public class AddIssueActivity extends MorphActivity {
.compose(this.<Response<List<Milestone>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Milestone>>() {
.subscribe(new CustomResponseSingleObserver<List<Milestone>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mMilestoneProgress.setVisibility(View.GONE);
mMilestoneSpinner.setVisibility(View.GONE);
}
 
@Override
protected void onResponseSuccess(List<Milestone> milestones) {
public void responseSuccess(List<Milestone> milestones) {
mMilestoneProgress.setVisibility(View.GONE);
mMilestoneSpinner.setVisibility(View.VISIBLE);
MilestoneSpinnerAdapter milestoneSpinnerAdapter = new MilestoneSpinnerAdapter(AddIssueActivity.this, milestones);
@@ -197,40 +197,39 @@ public class AddIssueActivity extends MorphActivity {
mMilestoneSpinner.setSelection(milestoneSpinnerAdapter.getSelectedItemPosition(mIssue.getMilestone()));
}
}
});
App.get().getGitLab().getProjectMembers(mProject.getId())
.compose(this.<Response<List<Member>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Member>>() {
.subscribe(new CustomResponseSingleObserver<List<Member>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mAssigneeSpinner.setVisibility(View.GONE);
mAssigneeProgress.setVisibility(View.GONE);
}
 
@Override
protected void onResponseSuccess(List<Member> members) {
public void responseSuccess(List<Member> members) {
mMembers.addAll(members);
if (mProject.belongsToGroup()) {
Timber.d("Project belongs to a group, loading those users too");
App.get().getGitLab().getGroupMembers(mProject.getNamespace().getId())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Member>>() {
.subscribe(new CustomResponseSingleObserver<List<Member>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mAssigneeSpinner.setVisibility(View.GONE);
mAssigneeProgress.setVisibility(View.GONE);
}
 
@Override
protected void onResponseSuccess(List<Member> members) {
public void responseSuccess(List<Member> members) {
mMembers.addAll(members);
setAssignees();
}
@@ -244,18 +243,18 @@ public class AddIssueActivity extends MorphActivity {
.compose(this.<List<Label>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<Label>>() {
.subscribe(new CustomSingleObserver<List<Label>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mListLabels.setVisibility(View.GONE);
mLabelsProgress.setVisibility(View.GONE);
mLabelLabel.setVisibility(View.GONE);
}
 
@Override
public void onSuccess(List<Label> labels) {
public void success(List<Label> labels) {
mLabelsProgress.setVisibility(View.GONE);
mRootAddLabels.setVisibility(View.VISIBLE);
setLabels(labels);
@@ -405,17 +404,17 @@ public class AddIssueActivity extends MorphActivity {
private void observeUpdate(Single<Issue> observable) {
observable.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Issue>() {
.subscribe(new CustomSingleObserver<Issue>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
Snackbar.make(mRoot, getString(R.string.failed_to_create_issue), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(Issue issue) {
public void success(Issue issue) {
if (mIssue == null) {
App.bus().post(new IssueCreatedEvent(issue));
} else {
app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.java
+ 5
− 5
View file @ 4088fe8f
@@ -17,8 +17,8 @@ import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.LabelAdapter;
import com.commit451.gitlab.model.api.Label;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.viewHolder.LabelViewHolder;
import com.commit451.reptar.FocusedSingleObserver;
 
import org.parceler.Parcels;
 
@@ -125,17 +125,17 @@ public class AddLabelActivity extends BaseActivity {
.compose(this.<List<Label>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<Label>>() {
.subscribe(new CustomSingleObserver<List<Label>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
mTextMessage.setVisibility(View.VISIBLE);
}
 
@Override
public void onSuccess(List<Label> labels) {
public void success(List<Label> labels) {
mSwipeRefreshLayout.setRefreshing(false);
if (labels.isEmpty()) {
mTextMessage.setVisibility(View.VISIBLE);
app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.java
+ 5
− 5
View file @ 4088fe8f
@@ -20,7 +20,7 @@ import com.commit451.gitlab.R;
import com.commit451.gitlab.event.MilestoneChangedEvent;
import com.commit451.gitlab.event.MilestoneCreatedEvent;
import com.commit451.gitlab.model.api.Milestone;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.teleprinter.Teleprinter;
import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 
@@ -173,17 +173,17 @@ public class AddMilestoneActivity extends MorphActivity {
observable.subscribeOn(Schedulers.io())
.compose(this.<Milestone>bindToLifecycle())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Milestone>() {
.subscribe(new CustomSingleObserver<Milestone>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
showError();
}
 
@Override
public void onSuccess(Milestone milestone) {
public void success(Milestone milestone) {
mProgress.setVisibility(View.GONE);
if (mMilestone == null) {
App.bus().post(new MilestoneCreatedEvent(milestone));
app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.java
+ 4
− 4
View file @ 4088fe8f
@@ -21,9 +21,9 @@ import com.afollestad.materialdialogs.color.ColorChooserDialog;
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.api.Label;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.util.ColorUtil;
import com.commit451.gitlab.util.Validator;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 
import org.parceler.Parcels;
@@ -136,10 +136,10 @@ public class AddNewLabelActivity extends BaseActivity implements ColorChooserDia
.compose(this.<Response<Label>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<Label>() {
.subscribe(new CustomResponseSingleObserver<Label>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
mProgress.setVisibility(View.GONE);
if (e instanceof HttpException && ((HttpException) e).response().code() == 409) {
@@ -152,7 +152,7 @@ public class AddNewLabelActivity extends BaseActivity implements ColorChooserDia
}
 
@Override
protected void onResponseSuccess(Label label) {
public void responseSuccess(Label label) {
Intent data = new Intent();
data.putExtra(KEY_NEW_LABEL, Parcels.wrap(label));
setResult(RESULT_OK, data);
app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.java
+ 27
− 29
View file @ 4088fe8f
@@ -27,11 +27,11 @@ import com.commit451.gitlab.event.MemberAddedEvent;
import com.commit451.gitlab.model.api.Group;
import com.commit451.gitlab.model.api.Member;
import com.commit451.gitlab.model.api.UserBasic;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.util.LinkHeaderParser;
import com.commit451.gitlab.viewHolder.UserViewHolder;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
import com.commit451.teleprinter.Teleprinter;
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 
import org.parceler.Parcels;
 
@@ -214,11 +214,11 @@ public class AddUserActivity extends MorphActivity {
.compose(this.<Response<List<UserBasic>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<UserBasic>>() {
.subscribe(new CustomResponseSingleObserver<List<UserBasic>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
mLoading = false;
Snackbar.make(mRoot, getString(R.string.connection_error_users), Snackbar.LENGTH_SHORT)
@@ -226,7 +226,7 @@ public class AddUserActivity extends MorphActivity {
}
 
@Override
protected void onResponseSuccess(List<UserBasic> users) {
public void responseSuccess(List<UserBasic> users) {
mSwipeRefreshLayout.setRefreshing(false);
mLoading = false;
mAdapter.setData(users);
@@ -244,16 +244,16 @@ public class AddUserActivity extends MorphActivity {
.compose(this.<Response<List<UserBasic>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<UserBasic>>() {
.subscribe(new CustomResponseSingleObserver<List<UserBasic>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mAdapter.setLoading(false);
}
 
@Override
protected void onResponseSuccess(List<UserBasic> users) {
public void responseSuccess(List<UserBasic> users) {
mLoading = false;
mAdapter.setLoading(false);
mAdapter.addData(users);
@@ -266,31 +266,29 @@ public class AddUserActivity extends MorphActivity {
observable.subscribeOn(Schedulers.io())
.compose(this.<Response<Member>>bindToLifecycle())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Response<Member>>() {
.subscribe(new CustomResponseSingleObserver<Member>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
Snackbar.make(mRoot, R.string.error_failed_to_add_user, Snackbar.LENGTH_SHORT)
public void error(Throwable t) {
Timber.e(t);
String message = getString(R.string.error_failed_to_add_user);
if (t instanceof HttpException) {
switch (((HttpException) t).code()) {
case 409:
message = getString(R.string.error_user_conflict);
}
}
Snackbar.make(mRoot, message, Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(Response<Member> response) {
if (response.isSuccessful()) {
Snackbar.make(mRoot, R.string.user_added_successfully, Snackbar.LENGTH_SHORT)
.show();
mAccessDialog.dismiss();
dismiss();
App.bus().post(new MemberAddedEvent(response.body()));
} else {
if (response.code() == 409) {
Snackbar.make(mRoot, R.string.error_user_conflict, Snackbar.LENGTH_SHORT)
.show();
} else {
onError(new Exception("Does not matter"));
}
}
public void responseSuccess(Member member) {
Snackbar.make(mRoot, R.string.user_added_successfully, Snackbar.LENGTH_SHORT)
.show();
mAccessDialog.dismiss();
dismiss();
App.bus().post(new MemberAddedEvent(member));
}
});
}
app/src/main/java/com/commit451/gitlab/activity/AttachActivity.java
+ 6
− 5
View file @ 4088fe8f
@@ -14,8 +14,8 @@ import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.api.FileUploadResponse;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.rx.FileObservableFactory;
import com.commit451.reptar.FocusedSingleObserver;
 
import org.parceler.Parcels;
 
@@ -150,9 +150,10 @@ public class AttachActivity extends BaseActivity {
.compose(this.<FileUploadResponse>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<FileUploadResponse>() {
.subscribe(new CustomSingleObserver<FileUploadResponse>() {
@Override
public void onSuccess(FileUploadResponse fileUploadResponse) {
public void success(FileUploadResponse fileUploadResponse) {
Intent data = new Intent();
data.putExtra(KEY_FILE_UPLOAD_RESPONSE, Parcels.wrap(fileUploadResponse));
setResult(RESULT_OK, data);
@@ -160,8 +161,8 @@ public class AttachActivity extends BaseActivity {
}
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
finish();
}
});
app/src/main/java/com/commit451/gitlab/activity/BuildActivity.java
+ 13
− 13
View file @ 4088fe8f
@@ -23,9 +23,9 @@ import com.commit451.gitlab.event.BuildChangedEvent;
import com.commit451.gitlab.model.Account;
import com.commit451.gitlab.model.api.Build;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.util.BuildUtil;
import com.commit451.gitlab.util.DownloadUtil;
import com.commit451.reptar.FocusedSingleObserver;
 
import org.parceler.Parcels;
 
@@ -78,18 +78,18 @@ public class BuildActivity extends BaseActivity {
.compose(BuildActivity.this.<Build>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Build>() {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.unable_to_retry_build, Snackbar.LENGTH_LONG)
.show();
}
 
@Override
public void onSuccess(Build build) {
public void success(Build build) {
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.build_started, Snackbar.LENGTH_LONG)
.show();
@@ -103,18 +103,18 @@ public class BuildActivity extends BaseActivity {
.compose(BuildActivity.this.<Build>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Build>() {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.unable_to_erase_build, Snackbar.LENGTH_LONG)
.show();
}
 
@Override
public void onSuccess(Build build) {
public void success(Build build) {
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.build_erased, Snackbar.LENGTH_LONG)
.show();
@@ -128,18 +128,18 @@ public class BuildActivity extends BaseActivity {
.compose(BuildActivity.this.<Build>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Build>() {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.unable_to_cancel_build, Snackbar.LENGTH_LONG)
.show();
}
 
@Override
public void onSuccess(Build build) {
public void success(Build build) {
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.build_canceled, Snackbar.LENGTH_LONG)
.show();
app/src/main/java/com/commit451/gitlab/activity/DiffActivity.java
+ 5
− 5
View file @ 4088fe8f
@@ -17,7 +17,7 @@ import com.commit451.gitlab.adapter.DiffAdapter;
import com.commit451.gitlab.model.api.Diff;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.model.api.RepositoryCommit;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
 
import org.parceler.Parcels;
 
@@ -104,18 +104,18 @@ public class DiffActivity extends BaseActivity {
.compose(this.<List<Diff>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<Diff>>() {
.subscribe(new CustomSingleObserver<List<Diff>>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable t) {
mSwipeRefreshLayout.setRefreshing(false);
Timber.e(e);
Timber.e(t);
mMessageText.setText(R.string.connection_error);
mMessageText.setVisibility(View.VISIBLE);
}
 
@Override
public void onSuccess(List<Diff> diffs) {
public void success(List<Diff> diffs) {
mSwipeRefreshLayout.setRefreshing(false);
mDiffAdapter.setData(diffs);
}
app/src/main/java/com/commit451/gitlab/activity/FileActivity.java
+ 8
− 8
View file @ 4088fe8f
@@ -24,8 +24,8 @@ import android.webkit.WebView;
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.api.RepositoryFile;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.rx.DecodeObservableFactory;
import com.commit451.reptar.FocusedSingleObserver;
 
import java.io.File;
import java.io.FileOutputStream;
@@ -127,18 +127,18 @@ public class FileActivity extends BaseActivity {
.compose(this.<RepositoryFile>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<RepositoryFile>() {
.subscribe(new CustomSingleObserver<RepositoryFile>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgressView.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.file_load_error, Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(RepositoryFile repositoryFile) {
public void success(RepositoryFile repositoryFile) {
mProgressView.setVisibility(View.GONE);
bindFile(repositoryFile);
}
@@ -162,16 +162,16 @@ public class FileActivity extends BaseActivity {
.compose(this.<byte[]>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<byte[]>() {
.subscribe(new CustomSingleObserver<byte[]>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable t) {
Snackbar.make(mRoot, R.string.failed_to_load, Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(byte[] bytes) {
public void success(byte[] bytes) {
bindBlob(bytes);
}
});
app/src/main/java/com/commit451/gitlab/activity/GroupActivity.java
+ 5
− 5
View file @ 4088fe8f
@@ -23,8 +23,8 @@ import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.GroupPagerAdapter;
import com.commit451.gitlab.model.api.Group;
import com.commit451.gitlab.model.api.GroupDetail;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.transformation.PaletteTransformation;
import com.commit451.reptar.FocusedSingleObserver;
 
import org.parceler.Parcels;
 
@@ -95,17 +95,17 @@ public class GroupActivity extends BaseActivity {
.compose(this.<GroupDetail>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<GroupDetail>() {
.subscribe(new CustomSingleObserver<GroupDetail>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
showError();
}
 
@Override
public void onSuccess(GroupDetail groupDetail) {
public void success(GroupDetail groupDetail) {
mProgress.setVisibility(View.GONE);
bind(groupDetail);
}
app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java
+ 7
− 7
View file @ 4088fe8f
@@ -19,10 +19,10 @@ import com.commit451.gitlab.event.CloseDrawerEvent;
import com.commit451.gitlab.event.ReloadDataEvent;
import com.commit451.gitlab.model.api.Group;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.util.DynamicGridLayoutManager;
import com.commit451.gitlab.util.LinkHeaderParser;
import com.commit451.gitlab.viewHolder.GroupViewHolder;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
 
import org.greenrobot.eventbus.Subscribe;
 
@@ -138,10 +138,10 @@ public class GroupsActivity extends BaseActivity {
.compose(this.<Response<List<Group>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Group>>() {
.subscribe(new CustomResponseSingleObserver<List<Group>>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
mSwipeRefreshLayout.setRefreshing(false);
mLoading = false;
@@ -150,7 +150,7 @@ public class GroupsActivity extends BaseActivity {
}
 
@Override
protected void onResponseSuccess(List<Group> groups) {
public void responseSuccess(List<Group> groups) {
mLoading = false;
mSwipeRefreshLayout.setRefreshing(false);
if (groups.isEmpty()) {
@@ -188,16 +188,16 @@ public class GroupsActivity extends BaseActivity {
.compose(this.<Response<List<Group>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Group>>() {
.subscribe(new CustomResponseSingleObserver<List<Group>>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
mLoading = false;
}
 
@Override
protected void onResponseSuccess(List<Group> groups) {
public void responseSuccess(List<Group> groups) {
mLoading = false;
mGroupAdapter.addGroups(groups);
mNextPageUrl = LinkHeaderParser.parse(response()).getNext();
app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java
+ 26
− 27
View file @ 4088fe8f
@@ -25,11 +25,11 @@ import com.commit451.gitlab.model.api.Issue;
import com.commit451.gitlab.model.api.Note;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.util.IntentUtil;
import com.commit451.gitlab.util.LinkHeaderParser;
import com.commit451.gitlab.view.SendMessageView;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
import com.commit451.teleprinter.Teleprinter;
 
import org.greenrobot.eventbus.Subscribe;
@@ -132,17 +132,17 @@ public class IssueActivity extends BaseActivity {
.compose(IssueActivity.this.<String>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<String>() {
.subscribe(new CustomSingleObserver<String>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
Snackbar.make(mRoot, getString(R.string.failed_to_delete_issue), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(String value) {
public void success(String s) {
App.bus().post(new IssueReloadEvent());
Toast.makeText(IssueActivity.this, R.string.issue_deleted, Toast.LENGTH_SHORT)
.show();
@@ -234,18 +234,18 @@ public class IssueActivity extends BaseActivity {
.compose(this.<List<Issue>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<Issue>>() {
.subscribe(new CustomSingleObserver<List<Issue>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(List<Issue> issues) {
public void success(List<Issue> issues) {
if (issues.isEmpty()) {
mSwipeRefreshLayout.setRefreshing(false);
Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
@@ -311,20 +311,19 @@ public class IssueActivity extends BaseActivity {
.compose(this.<Response<List<Note>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Note>>() {
.subscribe(new CustomResponseSingleObserver<List<Note>>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable t) {
mLoading = false;
Timber.e(e);
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
protected void onResponseSuccess(List<Note> notes) {
public void responseSuccess(List<Note> notes) {
mLoading = false;
mSwipeRefreshLayout.setRefreshing(false);
mNextPageUrl = LinkHeaderParser.parse(response()).getNext();
@@ -340,17 +339,17 @@ public class IssueActivity extends BaseActivity {
.compose(this.<Response<List<Note>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Note>>() {
.subscribe(new CustomResponseSingleObserver<List<Note>>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable t) {
mLoading = false;
Timber.e(e);
Timber.e(t);
mIssueDetailsAdapter.setLoading(false);
}
 
@Override
protected void onResponseSuccess(List<Note> notes) {
public void responseSuccess(List<Note> notes) {
mLoading = false;
mIssueDetailsAdapter.setLoading(false);
mNextPageUrl = LinkHeaderParser.parse(response()).getNext();
@@ -376,18 +375,18 @@ public class IssueActivity extends BaseActivity {
.compose(this.<Note>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Note>() {
.subscribe(new CustomSingleObserver<Note>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(Note note) {
public void success(Note note) {
mProgress.setVisibility(View.GONE);
mIssueDetailsAdapter.addNote(note);
mNotesRecyclerView.smoothScrollToPosition(IssueDetailsAdapter.getHeaderCount());
@@ -409,18 +408,18 @@ public class IssueActivity extends BaseActivity {
.compose(this.<Issue>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Issue>() {
.subscribe(new CustomSingleObserver<Issue>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.error_changing_issue), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void onSuccess(Issue issue) {
public void success(Issue issue) {
mProgress.setVisibility(View.GONE);
mIssue = issue;
App.bus().post(new IssueChangedEvent(mIssue));
app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.java
+ 21
− 21
View file @ 4088fe8f
@@ -14,7 +14,7 @@ import com.commit451.gitlab.model.api.Milestone;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.model.api.RepositoryCommit;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
 
import java.util.List;
 
@@ -110,16 +110,16 @@ public class LoadSomeInfoActivity extends BaseActivity {
App.get().getGitLab().getProject(namespace, project)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Project>() {
.subscribe(new CustomSingleObserver<Project>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void onSuccess(Project project) {
public void success(Project project) {
loadNextPart(project);
}
});
@@ -136,16 +136,16 @@ public class LoadSomeInfoActivity extends BaseActivity {
.compose(LoadSomeInfoActivity.this.<RepositoryCommit>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<RepositoryCommit>() {
.subscribe(new CustomSingleObserver<RepositoryCommit>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void onSuccess(RepositoryCommit repositoryCommit) {
public void success(RepositoryCommit repositoryCommit) {
Navigator.navigateToDiffActivity(LoadSomeInfoActivity.this, mProject, repositoryCommit);
finish();
}
@@ -157,16 +157,16 @@ public class LoadSomeInfoActivity extends BaseActivity {
.compose(LoadSomeInfoActivity.this.<List<MergeRequest>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<MergeRequest>>() {
.subscribe(new CustomSingleObserver<List<MergeRequest>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void onSuccess(List<MergeRequest> mergeRequests) {
public void success(List<MergeRequest> mergeRequests) {
if (!mergeRequests.isEmpty()) {
Navigator.navigateToMergeRequest(LoadSomeInfoActivity.this, mProject, mergeRequests.get(0));
finish();
@@ -182,16 +182,16 @@ public class LoadSomeInfoActivity extends BaseActivity {
.compose(LoadSomeInfoActivity.this.<Build>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Build>() {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void onSuccess(Build build) {
public void success(Build build) {
Navigator.navigateToBuild(LoadSomeInfoActivity.this, mProject, build);
finish();
}
@@ -203,16 +203,16 @@ public class LoadSomeInfoActivity extends BaseActivity {
.compose(LoadSomeInfoActivity.this.<List<Milestone>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<List<Milestone>>() {
.subscribe(new CustomSingleObserver<List<Milestone>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void onSuccess(List<Milestone> milestones) {
public void success(List<Milestone> milestones) {
if (!milestones.isEmpty()) {
Navigator.navigateToMilestone(LoadSomeInfoActivity.this, mProject, milestones.get(0));
finish();
app/src/main/java/com/commit451/gitlab/activity/LoginActivity.java
+ 7
− 6
View file @ 4088fe8f
@@ -43,6 +43,7 @@ import com.commit451.gitlab.model.api.Message;
import com.commit451.gitlab.model.api.UserFull;
import com.commit451.gitlab.model.api.UserLogin;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.ssl.CustomHostnameVerifier;
import com.commit451.gitlab.ssl.CustomKeyManager;
import com.commit451.gitlab.ssl.X509CertificateException;
@@ -310,10 +311,10 @@ public class LoginActivity extends BaseActivity {
.compose(this.<Response<UserLogin>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<UserLogin>() {
.subscribe(new CustomResponseSingleObserver<UserLogin>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
if (e instanceof HttpException) {
handleConnectionResponse(response());
@@ -323,7 +324,7 @@ public class LoginActivity extends BaseActivity {
}
 
@Override
protected void onResponseSuccess(UserLogin userLogin) {
public void responseSuccess(UserLogin userLogin) {
mAccount.setPrivateToken(userLogin.getPrivateToken());
loadUser();
}
@@ -428,10 +429,10 @@ public class LoginActivity extends BaseActivity {
.compose(this.<Response<UserFull>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<UserFull>() {
.subscribe(new CustomResponseSingleObserver<UserFull>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
if (e instanceof HttpException) {
handleConnectionResponse(response());
@@ -441,7 +442,7 @@ public class LoginActivity extends BaseActivity {
}
 
@Override
protected void onResponseSuccess(UserFull userFull) {
public void responseSuccess(UserFull userFull) {
mProgress.setVisibility(View.GONE);
mAccount.setUser(userFull);
mAccount.setLastUsed(new Date());
app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.java
+ 4
− 4
View file @ 4088fe8f
@@ -17,7 +17,7 @@ import com.commit451.gitlab.adapter.MergeRequestSectionsPagerAdapter;
import com.commit451.gitlab.event.MergeRequestChangedEvent;
import com.commit451.gitlab.model.api.MergeRequest;
import com.commit451.gitlab.model.api.Project;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 
import org.parceler.Parcels;
@@ -68,10 +68,10 @@ public class MergeRequestActivity extends BaseActivity {
.compose(MergeRequestActivity.this.<Response<MergeRequest>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<MergeRequest>() {
.subscribe(new CustomResponseSingleObserver<MergeRequest>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
mProgress.setVisibility(View.GONE);
String message = getString(R.string.unable_to_merge);
@@ -86,7 +86,7 @@ public class MergeRequestActivity extends BaseActivity {
}
 
@Override
protected void onResponseSuccess(MergeRequest mergeRequest) {
public void responseSuccess(MergeRequest mergeRequest) {
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.merge_request_accepted, Snackbar.LENGTH_LONG)
.show();
app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.java
+ 12
− 12
View file @ 4088fe8f
@@ -23,9 +23,9 @@ import com.commit451.gitlab.model.api.Issue;
import com.commit451.gitlab.model.api.Milestone;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomResponseSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.util.LinkHeaderParser;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
 
import org.greenrobot.eventbus.Subscribe;
import org.parceler.Parcels;
@@ -181,11 +181,11 @@ public class MilestoneActivity extends BaseActivity {
.compose(this.<Response<List<Issue>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Issue>>() {
.subscribe(new CustomResponseSingleObserver<List<Issue>>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mLoading = false;
mSwipeRefreshLayout.setRefreshing(false);
mMessageText.setVisibility(View.VISIBLE);
@@ -194,7 +194,7 @@ public class MilestoneActivity extends BaseActivity {
}
 
@Override
protected void onResponseSuccess(List<Issue> issues) {
public void responseSuccess(List<Issue> issues) {
mSwipeRefreshLayout.setRefreshing(false);
mLoading = false;
 
@@ -225,16 +225,16 @@ public class MilestoneActivity extends BaseActivity {
.compose(this.<Response<List<Issue>>>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new ResponseSingleObserver<List<Issue>>() {
.subscribe(new CustomResponseSingleObserver<List<Issue>>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
mLoading = false;
}
 
@Override
protected void onResponseSuccess(List<Issue> issues) {
public void responseSuccess(List<Issue> issues) {
mLoading = false;
mNextPageUrl = LinkHeaderParser.parse(response()).getNext();
mMilestoneIssuesAdapter.addIssues(issues);
@@ -255,10 +255,10 @@ public class MilestoneActivity extends BaseActivity {
observable.compose(this.<Milestone>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Milestone>() {
.subscribe(new CustomSingleObserver<Milestone>() {
 
@Override
public void onError(Throwable e) {
public void error(Throwable e) {
Timber.e(e);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.failed_to_create_milestone), Snackbar.LENGTH_SHORT)
@@ -266,7 +266,7 @@ public class MilestoneActivity extends BaseActivity {
}
 
@Override
public void onSuccess(Milestone milestone) {
public void success(Milestone milestone) {
mProgress.setVisibility(View.GONE);
mMilestone = milestone;
App.bus().post(new MilestoneChangedEvent(mMilestone));
app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.java
+ 5
− 5
View file @ 4088fe8f
@@ -24,8 +24,8 @@ import com.commit451.gitlab.fragment.BaseFragment;
import com.commit451.gitlab.model.Ref;
import com.commit451.gitlab.model.api.Project;
import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.rx.CustomSingleObserver;
import com.commit451.gitlab.util.IntentUtil;
import com.commit451.reptar.FocusedSingleObserver;
 
import org.parceler.Parcels;
 
@@ -187,11 +187,11 @@ public class ProjectActivity extends BaseActivity {
observable.compose(this.<Project>bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Project>() {
.subscribe(new CustomSingleObserver<Project>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
mProgress.animate()
.alpha(0.0f)
.withEndAction(new HideRunnable(mProgress));
@@ -200,7 +200,7 @@ public class ProjectActivity extends BaseActivity {
}
 
@Override
public void onSuccess(Project project) {
public void success(Project project) {
mProgress.animate()
.alpha(0.0f)
.withEndAction(new HideRunnable(mProgress));
app/src/main/java/com/commit451/gitlab/dialog/AccessDialog.java
+ 5
− 5
View file @ 4088fe8f
@@ -11,7 +11,7 @@ import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.api.Group;
import com.commit451.gitlab.model.api.Member;
import com.commit451.reptar.FocusedSingleObserver;
import com.commit451.gitlab.rx.CustomSingleObserver;
 
import java.util.Arrays;
 
@@ -121,16 +121,16 @@ public class AccessDialog extends MaterialDialog {
observable
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new FocusedSingleObserver<Member>() {
.subscribe(new CustomSingleObserver<Member>() {
 
@Override
public void onError(Throwable e) {
Timber.e(e);
public void error(Throwable t) {
Timber.e(t);
AccessDialog.this.onError();
}
 
@Override
public void onSuccess(Member member) {
public void success(Member member) {
if (mAccessChangedListener != null) {
mAccessChangedListener.onAccessChanged(mMember, mRoleNames[getSelectedIndex()]);
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment