FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't check feed count if the current account is not local

This commit is contained in:
Shinokuni 2019-07-27 11:21:15 +02:00
parent ff27c3bae1
commit 470bedd669
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -460,21 +460,24 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
drawerManager.disableAccountSelection();
updating = true;
viewModel.getFeedCount()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new DisposableSingleObserver<Integer>() {
@Override
public void onSuccess(Integer integer) {
feedNb = integer;
sync(null);
}
if (viewModel.isAccountLocal()) {
viewModel.getFeedCount()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new DisposableSingleObserver<Integer>() {
@Override
public void onSuccess(Integer integer) {
feedNb = integer;
sync(null);
}
@Override
public void onError(Throwable e) {
Utils.showSnackbar(rootLayout, e.getMessage());
}
});
@Override
public void onError(Throwable e) {
Utils.showSnackbar(rootLayout, e.getMessage());
}
});
} else
sync(null);
}
public void openAddFeedActivity(View view) {
@ -498,8 +501,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
} else if (requestCode == MANAGE_FEEDS_REQUEST) {
updateDrawerFeeds();
} else if (requestCode == ADD_ACCOUNT_REQUEST) {
} else if (requestCode == ADD_ACCOUNT_REQUEST && resultCode == RESULT_OK) {
if (data != null) {
Account newAccount = data.getParcelableExtra(ACCOUNT_KEY);
@ -523,7 +525,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
super.onActivityResult(requestCode, resultCode, data);
}
private void sync(List<Feed> feeds) {
private void sync(@Nullable List<Feed> feeds) {
Account account = viewModel.getCurrentAccount();
if (account.getLogin() == null)
account.setLogin(SharedPreferencesManager.readString(this, account.getLoginKey()));