Merge pull request #2021 from sonusourav/lint

Fix lint warnings in bookmark package
This commit is contained in:
Seán Mac Gillicuddy 2020-04-16 15:46:25 +01:00 committed by GitHub
commit 8281bd4314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions

View File

@ -80,7 +80,7 @@ class BookmarksAdapter extends RecyclerView.Adapter<BookmarksAdapter.Item> {
boolean onItemLongClick(ImageView favicon, BookmarkItem bookmark); boolean onItemLongClick(ImageView favicon, BookmarkItem bookmark);
} }
class Item extends RecyclerView.ViewHolder { static class Item extends RecyclerView.ViewHolder {
@BindView(R2.id.favicon) @BindView(R2.id.favicon)
ImageView favicon; ImageView favicon;
@BindView(R2.id.title) @BindView(R2.id.title)

View File

@ -26,6 +26,7 @@ import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.jetbrains.annotations.NotNull;
import org.kiwix.kiwixmobile.core.base.BasePresenter; import org.kiwix.kiwixmobile.core.base.BasePresenter;
import org.kiwix.kiwixmobile.core.data.DataSource; import org.kiwix.kiwixmobile.core.data.DataSource;
import org.kiwix.kiwixmobile.core.di.qualifiers.Computation; import org.kiwix.kiwixmobile.core.di.qualifiers.Computation;
@ -61,7 +62,9 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
@Override @Override
public void onSuccess(List<BookmarkItem> bookmarks) { public void onSuccess(List<BookmarkItem> bookmarks) {
view.updateBookmarksList(bookmarks); if (view != null) {
view.updateBookmarksList(bookmarks);
}
} }
@Override @Override
@ -72,7 +75,7 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
} }
@Override @Override
public void filterBookmarks(List<BookmarkItem> bookmarks, String newText) { public void filterBookmarks(@NotNull List<BookmarkItem> bookmarks, @NotNull String newText) {
Observable.fromIterable(bookmarks) Observable.fromIterable(bookmarks)
.filter( .filter(
bookmark -> bookmark.getBookmarkTitle().toLowerCase().contains(newText.toLowerCase())) bookmark -> bookmark.getBookmarkTitle().toLowerCase().contains(newText.toLowerCase()))
@ -87,7 +90,9 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
@Override @Override
public void onSuccess(List<BookmarkItem> bookmarkList) { public void onSuccess(List<BookmarkItem> bookmarkList) {
view.notifyBookmarksListFiltered(bookmarkList); if (view != null) {
view.notifyBookmarksListFiltered(bookmarkList);
}
} }
@Override @Override
@ -98,7 +103,7 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
} }
@Override @Override
public void deleteBookmarks(List<BookmarkItem> deleteList) { public void deleteBookmarks(@NotNull List<BookmarkItem> deleteList) {
dataSource.deleteBookmarks(deleteList) dataSource.deleteBookmarks(deleteList)
.subscribe(new CompletableObserver() { .subscribe(new CompletableObserver() {
@Override @Override