Cleaning up bookmark initialization logic
This commit is contained in:
parent
c71ffda636
commit
6765ec96e5
@ -87,12 +87,12 @@ public class BrowserApp extends Application {
|
|||||||
List<HistoryItem> oldBookmarks = LegacyBookmarkManager.destructiveGetBookmarks(BrowserApp.this);
|
List<HistoryItem> oldBookmarks = LegacyBookmarkManager.destructiveGetBookmarks(BrowserApp.this);
|
||||||
|
|
||||||
if (!oldBookmarks.isEmpty()) {
|
if (!oldBookmarks.isEmpty()) {
|
||||||
|
// If there are old bookmarks, import them
|
||||||
mBookmarkModel.addBookmarkList(oldBookmarks).subscribeOn(Schedulers.io()).subscribe();
|
mBookmarkModel.addBookmarkList(oldBookmarks).subscribeOn(Schedulers.io()).subscribe();
|
||||||
} else {
|
} else if (mBookmarkModel.count() == 0) {
|
||||||
if (mBookmarkModel.count() == 0) {
|
// If the database is empty, fill it from the assets list
|
||||||
List<HistoryItem> assetsBookmarks = BookmarkExporter.importBookmarksFromAssets(BrowserApp.this);
|
List<HistoryItem> assetsBookmarks = BookmarkExporter.importBookmarksFromAssets(BrowserApp.this);
|
||||||
mBookmarkModel.addBookmarkList(assetsBookmarks).subscribeOn(Schedulers.io()).subscribe();
|
mBookmarkModel.addBookmarkList(assetsBookmarks).subscribeOn(Schedulers.io()).subscribe();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user