Skip to content
This repository was archived by the owner on May 7, 2019. It is now read-only.

Commit db56d5b

Browse files
authored
Merge pull request #68 from ayltai/fix/64-shareButton
#67 Avoid sending null to observables
2 parents ea7b4be + 4eb25b7 commit db56d5b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId 'com.github.ayltai.newspaper'
2323
minSdkVersion 16
2424
targetSdkVersion 25
25-
versionCode 15
26-
versionName '2.1.1r' + VERSION_REVISION + '-' + VERSION_HASH
25+
versionCode 16
26+
versionName '2.1.2r' + VERSION_REVISION + '-' + VERSION_HASH
2727

2828
multiDexEnabled true
2929

@@ -97,10 +97,10 @@ configurations {
9797
ext {
9898
supportLibraryVersion = '25.3.1'
9999
firebaseSdkVersion = '10.2.6'
100-
daggerVersion = '2.10'
100+
daggerVersion = '2.11'
101101
frescoVersion = '1.3.0'
102102
bigImageViewerVersion = '1.2.9'
103-
exoPlayerVersion = 'r2.4.0'
103+
exoPlayerVersion = 'r2.4.1'
104104
debugDrawerVersion = '0.7.0'
105105
stethoVersion = '1.5.0'
106106
leakCanaryVersion = '1.5.1'

app/src/main/java/com/github/ayltai/newspaper/item/ItemScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ private void attachEvents() {
534534
this.disposables = new CompositeDisposable();
535535

536536
this.disposables.add(RxView.clicks(this.thumbnail).subscribe(dummy -> this.zooms.onNext(0), error -> LogUtils.getInstance().e(this.getClass().getSimpleName(), error.getMessage(), error)));
537-
this.disposables.add(RxView.clicks(this.share).subscribe(dummy -> this.shares.onNext(null), error -> LogUtils.getInstance().e(this.getClass().getSimpleName(), error.getMessage(), error)));
537+
this.disposables.add(RxView.clicks(this.share).subscribe(dummy -> this.shares.onNext(Irrelevant.INSTANCE), error -> LogUtils.getInstance().e(this.getClass().getSimpleName(), error.getMessage(), error)));
538538

539539
this.disposables.add(RxView.clicks(this.bookmark).subscribe(dummy -> {
540540
this.setIsBookmarked(!this.isBookmarked);

0 commit comments

Comments
 (0)