FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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

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

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