A couple crash fixes

unfoldingWord-dev · Feb 15, 2016 · 6a9bb5e · 6a9bb5e
1 parent 54e3d3d
commit 6a9bb5e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/app/app/src/main/java/model/daoModels/BibleChapter.java b/app/app/src/main/java/model/daoModels/BibleChapter.java
@@ -10,6 +10,7 @@
 import model.UWDatabaseModel;
 import org.json.JSONObject;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 // KEEP INCLUDES END
 /**
  * Entity mapped to table "BIBLE_CHAPTER".
@@ -229,11 +230,17 @@ public String getTitle(){
      * @param session session to us
      * @return unique BibleChapter with passed id
      */
+    @Nullable
     static public BibleChapter getModelForId(long id, DaoSession session) {
 
-        return session.getBibleChapterDao().queryBuilder()
-                .where(BibleChapterDao.Properties.Id.eq(id))
-                .unique();
+        if(id < 0) {
+            return null;
+        }
+        else {
+            return session.getBibleChapterDao().queryBuilder()
+                    .where(BibleChapterDao.Properties.Id.eq(id))
+                    .unique();
+        }
     }
 
     //endregion

diff --git a/app/app/src/main/java/utils/UWPreferenceDataManager.java b/app/app/src/main/java/utils/UWPreferenceDataManager.java
@@ -82,8 +82,10 @@ public static void setNewBibleVersion(Context context, Version version, boolean
 
         long currentId = UWPreferenceManager.getCurrentBibleChapter(context, isSecond);
         BibleChapter requestedChapter = null;
-        if(currentId > -1){
-            BibleChapter currentChapter = BibleChapter.getModelForId(currentId, DaoDBHelper.getDaoSession(context));
+        BibleChapter currentChapter = BibleChapter.getModelForId(currentId, DaoDBHelper.getDaoSession(context));
+
+        if(currentChapter != null){
+
             Book newBook = version.getBookForBookSlug(currentChapter.getBook().getSlug(), DaoDBHelper.getDaoSession(context));
             if(newBook != null){
                 requestedChapter = newBook.getBibleChapterForNumber(currentChapter.getNumber());
@@ -117,8 +119,16 @@ public static void setNewStoriesVersion(Context context, Version newVersion, boo
         else {
             DaoSession session = DaoDBHelper.getDaoSession(context);
             Book book = newVersion.getBookForBookSlug(currentPage.getStoriesChapter().getBook().getSlug(), session);
-            StoriesChapter newChapter = book.getStoriesChapterForNumber(currentPage.getStoriesChapter().getNumber());
-            StoryPage newPage = newChapter.getStoryPageForNumber(currentPage.getNumber());
+
+            StoryPage newPage;
+            if(book != null){
+                StoriesChapter newChapter = book.getStoriesChapterForNumber(currentPage.getStoriesChapter().getNumber());
+                newPage = newChapter.getStoryPageForNumber(currentPage.getNumber());
+            }
+            else{
+                newPage =  newVersion.getBooks().get(0).getStoryChapters().get(0).getStoryPages().get(0);
+            }
+
             changedToStoryPage(context, newPage.getId(), isSecond);
         }
         EventBus.getDefault().postSticky(UWPreferenceDataAccessor.getSharedInstance(context).createStoriesPagingEvent());