From 6765ec96e50355d589d5f7ede42fe88aa74e3940 Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Sun, 7 May 2017 21:05:50 -0400
Subject: [PATCH] Cleaning up bookmark initialization logic

---
 .../java/acr/browser/lightning/app/BrowserApp.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/acr/browser/lightning/app/BrowserApp.java b/app/src/main/java/acr/browser/lightning/app/BrowserApp.java
index cc16cc3..e51ee5f 100644
--- a/app/src/main/java/acr/browser/lightning/app/BrowserApp.java
+++ b/app/src/main/java/acr/browser/lightning/app/BrowserApp.java
@@ -87,12 +87,12 @@ public class BrowserApp extends Application {
                 List<HistoryItem> oldBookmarks = LegacyBookmarkManager.destructiveGetBookmarks(BrowserApp.this);
 
                 if (!oldBookmarks.isEmpty()) {
+                    // If there are old bookmarks, import them
                     mBookmarkModel.addBookmarkList(oldBookmarks).subscribeOn(Schedulers.io()).subscribe();
-                } else {
-                    if (mBookmarkModel.count() == 0) {
-                        List<HistoryItem> assetsBookmarks = BookmarkExporter.importBookmarksFromAssets(BrowserApp.this);
-                        mBookmarkModel.addBookmarkList(assetsBookmarks).subscribeOn(Schedulers.io()).subscribe();
-                    }
+                } else if (mBookmarkModel.count() == 0) {
+                    // If the database is empty, fill it from the assets list
+                    List<HistoryItem> assetsBookmarks = BookmarkExporter.importBookmarksFromAssets(BrowserApp.this);
+                    mBookmarkModel.addBookmarkList(assetsBookmarks).subscribeOn(Schedulers.io()).subscribe();
                 }
             }
         });