diff --git a/app/src/main/java/com/readrops/app/activities/MainActivity.java b/app/src/main/java/com/readrops/app/activities/MainActivity.java index 6d77754f..09b4eca1 100644 --- a/app/src/main/java/com/readrops/app/activities/MainActivity.java +++ b/app/src/main/java/com/readrops/app/activities/MainActivity.java @@ -190,7 +190,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou finish(); } - if (accountWeakReference.get() != null && !(accountWeakReference.get().getAccountType() == Account.AccountType.LOCAL)) { + if (accountWeakReference.get() != null && !accountWeakReference.get().isLocal()) { refreshLayout.setRefreshing(true); onRefresh(); accountWeakReference.clear(); diff --git a/app/src/main/java/com/readrops/app/database/entities/Account.java b/app/src/main/java/com/readrops/app/database/entities/Account.java index 0a10c062..00c4d9ff 100644 --- a/app/src/main/java/com/readrops/app/database/entities/Account.java +++ b/app/src/main/java/com/readrops/app/database/entities/Account.java @@ -228,6 +228,10 @@ public class Account implements Parcelable { return new Credentials(login, password, url); } + public boolean isLocal() { + return accountType == AccountType.LOCAL; + } + @Override public boolean equals(@Nullable Object obj) { if (obj == null) diff --git a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java index 02276426..1891acb5 100644 --- a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java @@ -63,7 +63,7 @@ public class AccountSettingsFragment extends PreferenceFragmentCompat { }); credentialsPref.setOnPreferenceClickListener(preference -> { - if (account.getAccountType() != Account.AccountType.LOCAL) { + if (!account.isLocal()) { Intent intent = new Intent(getContext(), AddAccountActivity.class); intent.putExtra(AddAccountActivity.EDIT_ACCOUNT, account); startActivity(intent); diff --git a/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java index c000ed7a..6bd7ac33 100644 --- a/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java +++ b/app/src/main/java/com/readrops/app/viewmodels/MainViewModel.java @@ -238,7 +238,7 @@ public class MainViewModel extends AndroidViewModel { } public boolean isAccountLocal() { - return currentAccount.getAccountType() == Account.AccountType.LOCAL; + return currentAccount.isLocal(); } //endregion