|
|
@@ -55,7 +55,7 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
|
|
|
defineActionBar();
|
|
|
|
|
|
presenter = definePresenter();
|
|
|
- if(null != presenter) {
|
|
|
+ if (null != presenter) {
|
|
|
model = presenter.getModel();
|
|
|
}
|
|
|
onAfterCreate(savedInstanceState);
|
|
|
@@ -215,10 +215,14 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
|
|
|
.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
|
|
|
.subscribe(isConnectedAll -> {
|
|
|
Log.i("APP# ActivityBase | watchNetwork", "|" + "isConnectedAll: +++++++++" + isConnectedAll);
|
|
|
- presenter.onChangedConnection(isConnectedAll, 0);
|
|
|
+ if (null != presenter) {
|
|
|
+ presenter.onChangedConnection(isConnectedAll, 0);
|
|
|
+ }
|
|
|
}, e -> {
|
|
|
Log.i("APP# ActivityBase | watchNetwork", "|" + "isConnectedAll: ++++++++++" + "error ");
|
|
|
- presenter.onChangedConnection(false, 0);
|
|
|
+ if (null != presenter) {
|
|
|
+ presenter.onChangedConnection(false, 0);
|
|
|
+ }
|
|
|
})
|
|
|
);
|
|
|
}
|