mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 23:27:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor stuff

Browse source
This commit is contained in:
Stefan Niedermann 2020-10-14 17:41:43 +02:00
parent 5b90f97840
commit ea094f93f3
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
View file

@ -4,6 +4,8 @@ import android.app.Application;
import android.content.Context;
import android.util.Log;
import androidx.annotation.AnyThread;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.Pair;
@ -120,6 +122,7 @@ public class MainViewModel extends AndroidViewModel {
}
@NonNull
@MainThread
public LiveData<Pair<NavigationCategory, CategorySortingMethod>> getCategorySortingMethodOfSelectedCategory() {
return switchMap(getSelectedCategory(), selectedCategory -> map(db.getCategoryOrder(selectedCategory), sortingMethod -> new Pair<>(selectedCategory, sortingMethod)));
}
@ -134,11 +137,12 @@ public class MainViewModel extends AndroidViewModel {
}
@NonNull
@MainThread
public LiveData<List<Item>> getNotesListLiveData() {
final MutableLiveData<List<Item>> insufficientInformation = new MutableLiveData<>();
return switchMap(currentAccount, currentAccount -> {
return switchMap(getCurrentAccount(), currentAccount -> {
Log.v(TAG, "[getNotesListLiveData] - currentAccount: " + currentAccount);
if (getCurrentAccount() == null) {
if (currentAccount == null) {
return insufficientInformation;
} else {
return switchMap(getSelectedCategory(), selectedCategory -> {
@ -182,8 +186,8 @@ public class MainViewModel extends AndroidViewModel {
}
Log.v(TAG, "[getNotesListLiveData] - category: " + category.getTitle());
fromDatabase = sortingMethod.second == SORT_MODIFIED_DESC
? db.getNoteDao().searchCategoryByModified(accountId, searchQueryOrWildcard, category == null ? "" : category.getTitle())
: db.getNoteDao().searchCategoryLexicographically(accountId, searchQueryOrWildcard, category == null ? "" : category.getTitle());
? db.getNoteDao().searchCategoryByModified(accountId, searchQueryOrWildcard, category.getTitle())
: db.getNoteDao().searchCategoryLexicographically(accountId, searchQueryOrWildcard, category.getTitle());
break;
}
}
@ -198,7 +202,7 @@ public class MainViewModel extends AndroidViewModel {
});
}
private List<Item> fromNotesWithCategory(List<NoteWithCategory> noteList, @NonNull NavigationCategory selectedCategory, @NonNull CategorySortingMethod sortingMethod) {
private List<Item> fromNotesWithCategory(List<NoteWithCategory> noteList, @NonNull NavigationCategory selectedCategory, @Nullable CategorySortingMethod sortingMethod) {
if (selectedCategory.getType() == DEFAULT_CATEGORY) {
final Category category = selectedCategory.getCategory();
if (category != null) {
@ -215,6 +219,7 @@ public class MainViewModel extends AndroidViewModel {
}
@NonNull
@MainThread
public LiveData<List<NavigationItem>> getNavigationCategories() {
final MutableLiveData<List<NavigationItem>> insufficientInformation = new MutableLiveData<>();
return switchMap(getCurrentAccount(), currentAccount -> {
@ -248,7 +253,7 @@ public class MainViewModel extends AndroidViewModel {
String currentSecondaryCategory = null;
boolean isCategoryOpen = currentPrimaryCategory.equals(expandedCategory);
if (isCategoryOpen && !currentPrimaryCategory.equals(item.label) && expandedCategory != null) {
if (isCategoryOpen && !currentPrimaryCategory.equals(item.label)) {
String currentCategorySuffix = item.label.substring(expandedCategory.length() + 1);
int subSlashIndex = currentCategorySuffix.indexOf('/');
currentSecondaryCategory = subSlashIndex < 0 ? currentCategorySuffix : currentCategorySuffix.substring(0, subSlashIndex);

7
app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
View file

@ -10,6 +10,7 @@ import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.AnyThread;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
@ -157,7 +158,7 @@ public abstract class NotesDatabase extends RoomDatabase {
* @param note Note
*/
@NonNull
@AnyThread
@MainThread
public LiveData<NoteWithCategory> addNoteAndSync(SingleSignOnAccount ssoAccount, long accountId, NoteWithCategory note) {
NoteWithCategory entity = new NoteWithCategory();
entity.setNote(new Note(0, null, note.getModified(), note.getTitle(), note.getContent(), note.getFavorite(), note.getETag(), DBStatus.LOCAL_EDITED, accountId, generateNoteExcerpt(note.getContent(), note.getTitle()), 0));
@ -552,7 +553,7 @@ public abstract class NotesDatabase extends RoomDatabase {
* @return The sorting method in CategorySortingMethod enum format
*/
@NonNull
@AnyThread
@MainThread
public LiveData<CategorySortingMethod> getCategoryOrder(@NonNull NavigationCategory selectedCategory) {
final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
String prefKey;
@ -573,7 +574,7 @@ public abstract class NotesDatabase extends RoomDatabase {
}
case DEFAULT_CATEGORY:
default: {
Category category = selectedCategory.getCategory();
final Category category = selectedCategory.getCategory();
if (category != null) {
return getCategoryDao().getCategoryOrder(category.getId());
} else {