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

Add @NonNull for Observers

parent bda83257
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 120 additions and 131 deletions
app/build.gradle
+ 4
− 2
View file @ a83796b2
@@ -96,10 +96,12 @@ dependencies {
exclude group: 'stax', module: 'stax'
}
compile "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
compile 'com.github.Commit451:OkioProGuardRules:1.11.0.0'
compile 'com.github.Commit451:RetrofitProguardRules:2.1.0.0'
compile 'com.github.aurae.retrofit2:converter-logansquare:1.4.1'
compile "com.bluelinelabs:logansquare:$loganSquareVersion"
annotationProcessor "com.bluelinelabs:logansquare-compiler:$loganSquareVersion"
compile 'com.github.Commit451:LoganSquareProGuardRules:1.3.6.0'
compile "com.squareup.okhttp3:okhttp:$okHttpVersion"
compile "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
compile 'com.squareup.picasso:picasso:2.5.2'
@@ -142,11 +144,11 @@ dependencies {
compile "com.afollestad.material-dialogs:core:$materialDialogsVersion"
compile "com.afollestad.material-dialogs:commons:$materialDialogsVersion"
compile 'de.hdodenhof:circleimageview:2.1.0'
compile ('com.vdurmont:emoji-java:3.1.3') {
compile('com.vdurmont:emoji-java:3.1.3') {
exclude group: 'org.json', module: 'json'
}
compile 'com.github.jkwiecien:EasyImage:1.4.1'
compile ('com.github.ozodrukh:CircularReveal:2.0.1@aar') {
compile('com.github.ozodrukh:CircularReveal:2.0.1@aar') {
transitive = true;
}
 
app/proguard-rules.pro
+ 0
− 20
View file @ a83796b2
@@ -27,9 +27,6 @@
# Picasso rules
-dontwarn com.squareup.okhttp.**
 
# Okio
-dontwarn okio.**
# Simple-Xml Proguard Config
# Keep public classes and methods.
-dontwarn com.bea.xml.stream.**
@@ -41,18 +38,6 @@
-dontwarn javax.xml.stream.events.**
-dontwarn javax.xml.**
 
# EventBus
-keepattributes *Annotation*
-keepclassmembers class ** {
@org.greenrobot.eventbus.Subscribe <methods>;
}
-keep enum org.greenrobot.eventbus.ThreadMode { *; }
# Only required if you use AsyncExecutor
-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
<init>(java.lang.Throwable);
}
## joda-time-android 2.8.0
# This is only necessary if you are not including the optional joda-convert dependency
 
@@ -66,10 +51,5 @@
 
-keep class org.parceler.Parceler$$Parcels
 
# LoganSquare
-keep class com.bluelinelabs.logansquare.** { *; }
-keep @com.bluelinelabs.logansquare.annotation.JsonObject class *
-keep class **$$JsonObjectMapper { *; }
# Custom rules
-keep class com.commit451.gitlab.ssl.CustomSSLSocketFactory
\ No newline at end of file
app/src/main/java/com/commit451/gitlab/App.java
+ 22
− 22
View file @ a83796b2
@@ -46,25 +46,25 @@ public class App extends Application {
LoganSquare.registerTypeConverter(Uri.class, new UriTypeConverter());
}
 
private static EventBus sBus;
private static App sInstance;
private static EventBus bus;
private static App instance;
 
public static EventBus bus() {
if (sBus == null) {
sBus = EventBus.getDefault();
if (bus == null) {
bus = EventBus.getDefault();
}
return sBus;
return bus;
}
 
public static App get() {
return sInstance;
return instance;
}
 
private Account mAccount;
private GitLab mGitLab;
private GitLabRss mGitLabRss;
private Picasso mPicasso;
private Prefs mPrefs;
private Account account;
private GitLab gitLab;
private GitLabRss gitLabRss;
private Picasso picasso;
private Prefs prefs;
 
@Override
public void onCreate() {
@@ -75,9 +75,9 @@ public class App extends Application {
return;
}
setupLeakCanary();
sInstance = this;
instance = this;
 
mPrefs = new Prefs(this);
prefs = new Prefs(this);
//So that we don't get weird half translations
forceLocale(Locale.ENGLISH);
setupCrashReporting();
@@ -131,23 +131,23 @@ public class App extends Application {
}
 
public GitLab getGitLab() {
return mGitLab;
return gitLab;
}
 
public GitLabRss getGitLabRss() {
return mGitLabRss;
return gitLabRss;
}
 
public Picasso getPicasso() {
return mPicasso;
return picasso;
}
 
public Account getAccount() {
return mAccount;
return account;
}
 
public void setAccount(Account account) {
mAccount = account;
this.account = account;
OkHttpClient.Builder clientBuilder = OkHttpClientFactory.create(account);
if (BuildConfig.DEBUG) {
clientBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY));
@@ -166,18 +166,18 @@ public class App extends Application {
}
 
public Prefs getPrefs() {
return mPrefs;
return prefs;
}
 
private void initGitLab(Account account, OkHttpClient client) {
mGitLab = GitLabFactory.create(account, client);
gitLab = GitLabFactory.create(account, client);
}
 
private void initGitLabRss(Account account, OkHttpClient client) {
mGitLabRss = GitLabRssFactory.create(account, client);
gitLabRss = GitLabRssFactory.create(account, client);
}
 
private void initPicasso(OkHttpClient client) {
mPicasso = PicassoFactory.createPicasso(client);
picasso = PicassoFactory.createPicasso(client);
}
}
app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.java
+ 8
− 8
View file @ a83796b2
@@ -180,14 +180,14 @@ public class AddIssueActivity extends MorphActivity {
.subscribe(new CustomResponseSingleObserver<List<Milestone>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progressMilestone.setVisibility(View.GONE);
spinnerMilestone.setVisibility(View.GONE);
}
 
@Override
public void responseSuccess(List<Milestone> milestones) {
public void responseSuccess(@NonNull List<Milestone> milestones) {
progressMilestone.setVisibility(View.GONE);
spinnerMilestone.setVisibility(View.VISIBLE);
MilestoneSpinnerAdapter milestoneSpinnerAdapter = new MilestoneSpinnerAdapter(AddIssueActivity.this, milestones);
@@ -204,14 +204,14 @@ public class AddIssueActivity extends MorphActivity {
.subscribe(new CustomResponseSingleObserver<List<Member>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
spinnerAssignee.setVisibility(View.GONE);
progressAssignee.setVisibility(View.GONE);
}
 
@Override
public void responseSuccess(List<Member> members) {
public void responseSuccess(@NonNull List<Member> members) {
AddIssueActivity.this.members.addAll(members);
if (project.belongsToGroup()) {
Timber.d("Project belongs to a group, loading those users too");
@@ -221,14 +221,14 @@ public class AddIssueActivity extends MorphActivity {
.subscribe(new CustomResponseSingleObserver<List<Member>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
spinnerAssignee.setVisibility(View.GONE);
progressAssignee.setVisibility(View.GONE);
}
 
@Override
public void responseSuccess(List<Member> members) {
public void responseSuccess(@NonNull List<Member> members) {
AddIssueActivity.this.members.addAll(members);
setAssignees();
}
@@ -245,7 +245,7 @@ public class AddIssueActivity extends MorphActivity {
.subscribe(new CustomSingleObserver<List<Label>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
listLabels.setVisibility(View.GONE);
progressLabels.setVisibility(View.GONE);
@@ -253,7 +253,7 @@ public class AddIssueActivity extends MorphActivity {
}
 
@Override
public void success(List<Label> labels) {
public void success(@NonNull List<Label> labels) {
progressLabels.setVisibility(View.GONE);
rootAddLabels.setVisibility(View.VISIBLE);
setLabels(labels);
app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.java
+ 1
− 1
View file @ a83796b2
@@ -68,7 +68,7 @@ public class AddNewLabelActivity extends BaseActivity implements ColorChooserDia
 
@OnClick(R.id.root_color)
void onChooseColorClicked() {
// Pass AppCompatActivity which implements ColorCallback, along with the title of the dialog
// Pass AppCompatActivity which implements ColorCallback, along with the textTitle of the dialog
new ColorChooserDialog.Builder(this, R.string.add_new_label_choose_color)
.preselect(chosenColor)
.show();
app/src/main/java/com/commit451/gitlab/activity/AttachActivity.java
+ 3
− 2
View file @ a83796b2
@@ -5,6 +5,7 @@ import android.animation.Animator;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
@@ -153,7 +154,7 @@ public class AttachActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<FileUploadResponse>() {
 
@Override
public void success(FileUploadResponse fileUploadResponse) {
public void success(@NonNull FileUploadResponse fileUploadResponse) {
Intent data = new Intent();
data.putExtra(KEY_FILE_UPLOAD_RESPONSE, Parcels.wrap(fileUploadResponse));
setResult(RESULT_OK, data);
@@ -161,7 +162,7 @@ public class AttachActivity extends BaseActivity {
}
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
finish();
}
app/src/main/java/com/commit451/gitlab/activity/BuildActivity.java
+ 6
− 6
View file @ a83796b2
@@ -81,7 +81,7 @@ public class BuildActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.unable_to_retry_build, Snackbar.LENGTH_LONG)
@@ -89,7 +89,7 @@ public class BuildActivity extends BaseActivity {
}
 
@Override
public void success(Build build) {
public void success(@NonNull Build build) {
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.build_started, Snackbar.LENGTH_LONG)
.show();
@@ -106,7 +106,7 @@ public class BuildActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.unable_to_erase_build, Snackbar.LENGTH_LONG)
@@ -114,7 +114,7 @@ public class BuildActivity extends BaseActivity {
}
 
@Override
public void success(Build build) {
public void success(@NonNull Build build) {
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.build_erased, Snackbar.LENGTH_LONG)
.show();
@@ -131,7 +131,7 @@ public class BuildActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.unable_to_cancel_build, Snackbar.LENGTH_LONG)
@@ -139,7 +139,7 @@ public class BuildActivity extends BaseActivity {
}
 
@Override
public void success(Build build) {
public void success(@NonNull Build build) {
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.build_canceled, Snackbar.LENGTH_LONG)
.show();
app/src/main/java/com/commit451/gitlab/activity/DiffActivity.java
+ 3
− 2
View file @ a83796b2
@@ -3,6 +3,7 @@ package com.commit451.gitlab.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -113,7 +114,7 @@ public class DiffActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<List<Diff>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
swipeRefreshLayout.setRefreshing(false);
Timber.e(t);
textMessage.setText(R.string.connection_error);
@@ -121,7 +122,7 @@ public class DiffActivity extends BaseActivity {
}
 
@Override
public void success(List<Diff> diffs) {
public void success(@NonNull List<Diff> diffs) {
swipeRefreshLayout.setRefreshing(false);
adapterDiff.setData(diffs);
}
app/src/main/java/com/commit451/gitlab/activity/FileActivity.java
+ 4
− 4
View file @ a83796b2
@@ -129,7 +129,7 @@ public class FileActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<RepositoryFile>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.file_load_error, Snackbar.LENGTH_SHORT)
@@ -137,7 +137,7 @@ public class FileActivity extends BaseActivity {
}
 
@Override
public void success(RepositoryFile repositoryFile) {
public void success(@NonNull RepositoryFile repositoryFile) {
progress.setVisibility(View.GONE);
bindFile(repositoryFile);
}
@@ -164,13 +164,13 @@ public class FileActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<byte[]>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Snackbar.make(root, R.string.failed_to_load, Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void success(byte[] bytes) {
public void success(@NonNull byte[] bytes) {
bindBlob(bytes);
}
});
app/src/main/java/com/commit451/gitlab/activity/GroupActivity.java
+ 3
− 2
View file @ a83796b2
@@ -7,6 +7,7 @@ import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout;
@@ -98,14 +99,14 @@ public class GroupActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<GroupDetail>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
showError();
}
 
@Override
public void success(GroupDetail groupDetail) {
public void success(@NonNull GroupDetail groupDetail) {
progress.setVisibility(View.GONE);
bind(groupDetail);
}
app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java
+ 6
− 5
View file @ a83796b2
@@ -4,6 +4,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v4.widget.SwipeRefreshLayout;
@@ -12,6 +13,7 @@ import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.TextView;
 
import com.alexgwyn.recyclerviewsquire.DynamicGridLayoutManager;
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.GroupAdapter;
@@ -20,7 +22,6 @@ 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;
 
@@ -145,7 +146,7 @@ public class GroupsActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<List<Group>>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
swipeRefreshLayout.setRefreshing(false);
loading = false;
@@ -154,7 +155,7 @@ public class GroupsActivity extends BaseActivity {
}
 
@Override
public void responseSuccess(List<Group> groups) {
public void responseSuccess(@NonNull List<Group> groups) {
loading = false;
swipeRefreshLayout.setRefreshing(false);
if (groups.isEmpty()) {
@@ -195,13 +196,13 @@ public class GroupsActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<List<Group>>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
loading = false;
}
 
@Override
public void responseSuccess(List<Group> groups) {
public void responseSuccess(@NonNull List<Group> groups) {
loading = false;
adapterGroup.addGroups(groups);
nextPageUrl = LinkHeaderParser.parse(response()).getNext();
app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java
+ 13
− 12
View file @ a83796b2
@@ -4,6 +4,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
@@ -133,14 +134,14 @@ public class IssueActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<String>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
Snackbar.make(root, getString(R.string.failed_to_delete_issue), Snackbar.LENGTH_SHORT)
.show();
}
 
@Override
public void success(String s) {
public void success(@NonNull String s) {
App.bus().post(new IssueReloadEvent());
Toast.makeText(IssueActivity.this, R.string.issue_deleted, Toast.LENGTH_SHORT)
.show();
@@ -234,7 +235,7 @@ public class IssueActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<List<Issue>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
swipeRefreshLayout.setRefreshing(false);
Snackbar.make(root, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
@@ -242,7 +243,7 @@ public class IssueActivity extends BaseActivity {
}
 
@Override
public void success(List<Issue> issues) {
public void success(@NonNull List<Issue> issues) {
if (issues.isEmpty()) {
swipeRefreshLayout.setRefreshing(false);
Snackbar.make(root, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
@@ -311,7 +312,7 @@ public class IssueActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<List<Note>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
loading = false;
Timber.e(t);
swipeRefreshLayout.setRefreshing(false);
@@ -320,7 +321,7 @@ public class IssueActivity extends BaseActivity {
}
 
@Override
public void responseSuccess(List<Note> notes) {
public void responseSuccess(@NonNull List<Note> notes) {
loading = false;
swipeRefreshLayout.setRefreshing(false);
nextPageUrl = LinkHeaderParser.parse(response()).getNext();
@@ -339,14 +340,14 @@ public class IssueActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<List<Note>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
loading = false;
Timber.e(t);
adapterIssueDetails.setLoading(false);
}
 
@Override
public void responseSuccess(List<Note> notes) {
public void responseSuccess(@NonNull List<Note> notes) {
loading = false;
adapterIssueDetails.setLoading(false);
nextPageUrl = LinkHeaderParser.parse(response()).getNext();
@@ -375,7 +376,7 @@ public class IssueActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Note>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
Snackbar.make(root, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
@@ -383,7 +384,7 @@ public class IssueActivity extends BaseActivity {
}
 
@Override
public void success(Note note) {
public void success(@NonNull Note note) {
progress.setVisibility(View.GONE);
adapterIssueDetails.addNote(note);
listNotes.smoothScrollToPosition(IssueDetailsAdapter.getHeaderCount());
@@ -408,7 +409,7 @@ public class IssueActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Issue>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.setVisibility(View.GONE);
Snackbar.make(root, getString(R.string.error_changing_issue), Snackbar.LENGTH_SHORT)
@@ -416,7 +417,7 @@ public class IssueActivity extends BaseActivity {
}
 
@Override
public void success(Issue issue) {
public void success(@NonNull Issue issue) {
progress.setVisibility(View.GONE);
IssueActivity.this.issue = issue;
App.bus().post(new IssueChangedEvent(IssueActivity.this.issue));
app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.java
+ 11
− 10
View file @ a83796b2
@@ -3,6 +3,7 @@ package com.commit451.gitlab.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.View;
import android.widget.Toast;
 
@@ -114,13 +115,13 @@ public class LoadSomeInfoActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Project>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void success(Project project) {
public void success(@NonNull Project project) {
loadNextPart(project);
}
});
@@ -140,13 +141,13 @@ public class LoadSomeInfoActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<RepositoryCommit>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void success(RepositoryCommit repositoryCommit) {
public void success(@NonNull RepositoryCommit repositoryCommit) {
Navigator.navigateToDiffActivity(LoadSomeInfoActivity.this, project, repositoryCommit);
finish();
}
@@ -161,13 +162,13 @@ public class LoadSomeInfoActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<List<MergeRequest>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void success(List<MergeRequest> mergeRequests) {
public void success(@NonNull List<MergeRequest> mergeRequests) {
if (!mergeRequests.isEmpty()) {
Navigator.navigateToMergeRequest(LoadSomeInfoActivity.this, project, mergeRequests.get(0));
finish();
@@ -186,13 +187,13 @@ public class LoadSomeInfoActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void success(Build build) {
public void success(@NonNull Build build) {
Navigator.navigateToBuild(LoadSomeInfoActivity.this, project, build);
finish();
}
@@ -207,13 +208,13 @@ public class LoadSomeInfoActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<List<Milestone>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
LoadSomeInfoActivity.this.onError();
}
 
@Override
public void success(List<Milestone> milestones) {
public void success(@NonNull List<Milestone> milestones) {
if (!milestones.isEmpty()) {
Navigator.navigateToMilestone(LoadSomeInfoActivity.this, project, milestones.get(0));
finish();
app/src/main/java/com/commit451/gitlab/activity/LoginActivity.java
+ 5
− 4
View file @ a83796b2
@@ -48,6 +48,7 @@ import com.commit451.gitlab.ssl.CustomHostnameVerifier;
import com.commit451.gitlab.ssl.CustomKeyManager;
import com.commit451.gitlab.ssl.X509CertificateException;
import com.commit451.gitlab.ssl.X509Util;
import com.commit451.reptar.retrofit.ResponseSingleObserver;
import com.commit451.teleprinter.Teleprinter;
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 
@@ -312,7 +313,7 @@ public class LoginActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<UserLogin>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
if (e instanceof HttpException) {
handleConnectionResponse(response());
@@ -322,7 +323,7 @@ public class LoginActivity extends BaseActivity {
}
 
@Override
public void responseSuccess(UserLogin userLogin) {
public void responseSuccess(@NonNull UserLogin userLogin) {
account.setPrivateToken(userLogin.getPrivateToken());
loadUser();
}
@@ -430,7 +431,7 @@ public class LoginActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<UserFull>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
if (e instanceof HttpException) {
handleConnectionResponse(response());
@@ -440,7 +441,7 @@ public class LoginActivity extends BaseActivity {
}
 
@Override
public void responseSuccess(UserFull userFull) {
public void responseSuccess(@NonNull UserFull userFull) {
progress.setVisibility(View.GONE);
account.setUser(userFull);
account.setLastUsed(new Date());
app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.java
+ 3
− 2
View file @ a83796b2
@@ -3,6 +3,7 @@ package com.commit451.gitlab.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager;
@@ -71,7 +72,7 @@ public class MergeRequestActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<MergeRequest>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
progress.setVisibility(View.GONE);
String message = getString(R.string.unable_to_merge);
@@ -86,7 +87,7 @@ public class MergeRequestActivity extends BaseActivity {
}
 
@Override
public void responseSuccess(MergeRequest mergeRequest) {
public void responseSuccess(@NonNull MergeRequest mergeRequest) {
progress.setVisibility(View.GONE);
Snackbar.make(root, R.string.merge_request_accepted, Snackbar.LENGTH_LONG)
.show();
app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.java
+ 7
− 6
View file @ a83796b2
@@ -5,6 +5,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
@@ -181,7 +182,7 @@ public class MilestoneActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<List<Issue>>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
loading = false;
swipeRefreshLayout.setRefreshing(false);
@@ -191,7 +192,7 @@ public class MilestoneActivity extends BaseActivity {
}
 
@Override
public void responseSuccess(List<Issue> issues) {
public void responseSuccess(@NonNull List<Issue> issues) {
swipeRefreshLayout.setRefreshing(false);
loading = false;
 
@@ -225,13 +226,13 @@ public class MilestoneActivity extends BaseActivity {
.subscribe(new CustomResponseSingleObserver<List<Issue>>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
loading = false;
}
 
@Override
public void responseSuccess(List<Issue> issues) {
public void responseSuccess(@NonNull List<Issue> issues) {
loading = false;
nextPageUrl = LinkHeaderParser.parse(response()).getNext();
adapterMilestoneIssues.addIssues(issues);
@@ -255,7 +256,7 @@ public class MilestoneActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Milestone>() {
 
@Override
public void error(Throwable e) {
public void error(@NonNull Throwable e) {
Timber.e(e);
progress.setVisibility(View.GONE);
Snackbar.make(root, getString(R.string.failed_to_create_milestone), Snackbar.LENGTH_SHORT)
@@ -263,7 +264,7 @@ public class MilestoneActivity extends BaseActivity {
}
 
@Override
public void success(Milestone milestone) {
public void success(@NonNull Milestone milestone) {
progress.setVisibility(View.GONE);
MilestoneActivity.this.milestone = milestone;
App.bus().post(new MilestoneChangedEvent(MilestoneActivity.this.milestone));
app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.java
+ 3
− 2
View file @ a83796b2
@@ -5,6 +5,7 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
@@ -190,7 +191,7 @@ public class ProjectActivity extends BaseActivity {
.subscribe(new CustomSingleObserver<Project>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
progress.animate()
.alpha(0.0f)
@@ -200,7 +201,7 @@ public class ProjectActivity extends BaseActivity {
}
 
@Override
public void success(Project project) {
public void success(@NonNull Project project) {
progress.animate()
.alpha(0.0f)
.withEndAction(new HideRunnable(progress));
app/src/main/java/com/commit451/gitlab/api/GitLab.java
+ 4
− 4
View file @ a83796b2
@@ -205,7 +205,7 @@ public interface GitLab {
@FormUrlEncoded
@POST(API_VERSION + "/projects/{id}/milestones")
Single<Milestone> createMilestone(@Path("id") long projectId,
@Field("title") String title,
@Field("textTitle") String title,
@Field("description") String description,
@Field("due_date") String dueDate);
 
@@ -213,7 +213,7 @@ public interface GitLab {
@PUT(API_VERSION + "/projects/{id}/milestones/{milestone_id}")
Single<Milestone> editMilestone(@Path("id") long projectId,
@Path("milestone_id") long milestoneId,
@Field("title") String title,
@Field("textTitle") String title,
@Field("description") String description,
@Field("due_date") String dueDate);
 
@@ -285,7 +285,7 @@ public interface GitLab {
@FormUrlEncoded
@POST(API_VERSION + "/projects/{id}/issues")
Single<Issue> createIssue(@Path("id") long projectId,
@Field("title") String title,
@Field("textTitle") String title,
@Field("description") String description,
@Field("assignee_id") @Nullable Long assigneeId,
@Field("milestone_id") @Nullable Long milestoneId,
@@ -294,7 +294,7 @@ public interface GitLab {
@PUT(API_VERSION + "/projects/{id}/issues/{issue_id}")
Single<Issue> updateIssue(@Path("id") long projectId,
@Path("issue_id") long issueId,
@Query("title") String title,
@Query("textTitle") String title,
@Query("description") String description,
@Query("assignee_id") @Nullable Long assigneeId,
@Query("milestone_id") @Nullable Long milestoneId,
app/src/main/java/com/commit451/gitlab/dialog/AccessDialog.java
+ 3
− 2
View file @ a83796b2
package com.commit451.gitlab.dialog;
 
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.View;
import android.widget.Toast;
 
@@ -124,13 +125,13 @@ public class AccessDialog extends MaterialDialog {
.subscribe(new CustomSingleObserver<Member>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
AccessDialog.this.onError();
}
 
@Override
public void success(Member member) {
public void success(@NonNull Member member) {
if (mAccessChangedListener != null) {
mAccessChangedListener.onAccessChanged(mMember, mRoleNames[getSelectedIndex()]);
}
app/src/main/java/com/commit451/gitlab/fragment/BuildDescriptionFragment.java
+ 11
− 15
View file @ a83796b2
package com.commit451.gitlab.fragment;
 
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v4.widget.SwipeRefreshLayout;
@@ -70,8 +71,6 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
Project mProject;
Build mBuild;
 
EventReceiver mEventReceiver;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -95,8 +94,7 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
}
});
bindBuild(mBuild);
mEventReceiver = new EventReceiver();
App.bus().register(mEventReceiver);
App.bus().register(this);
}
 
private void load() {
@@ -107,14 +105,14 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
.subscribe(new CustomSingleObserver<Build>() {
 
@Override
public void error(Throwable t) {
public void error(@NonNull Throwable t) {
Timber.e(t);
Snackbar.make(mRoot, R.string.unable_to_load_build, Snackbar.LENGTH_LONG)
.show();
}
 
@Override
public void success(Build build) {
public void success(@NonNull Build build) {
mSwipeRefreshLayout.setRefreshing(false);
mBuild = build;
bindBuild(build);
@@ -151,7 +149,7 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
if (build.getRunner() != null) {
bindRunner(build.getRunner());
}
if(build.getCommit() != null) {
if (build.getCommit() != null) {
bindCommit(build.getCommit());
}
}
@@ -170,18 +168,16 @@ public class BuildDescriptionFragment extends ButterKnifeFragment {
 
@Override
public void onDestroyView() {
App.bus().unregister(this);
super.onDestroyView();
App.bus().unregister(mEventReceiver);
}
 
private class EventReceiver {
 
@Subscribe
public void onBuildChangedEvent(BuildChangedEvent event) {
if (mBuild.getId() == event.build.getId()) {
mBuild = event.build;
bindBuild(mBuild);
}
@Subscribe
public void onBuildChangedEvent(BuildChangedEvent event) {
if (mBuild.getId() == event.build.getId()) {
mBuild = event.build;
bindBuild(mBuild);
}
}
 
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