Merge pull request #32 from codetoart/master

cannot modify text epubs fixed
FolioReader · Oct 26, 2016 · a87ec6c · a87ec6c
2 parents 71ef6ca + 532e5b4
commit a87ec6c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/folioreader/src/main/java/com/folioreader/activity/FolioActivity.java b/folioreader/src/main/java/com/folioreader/activity/FolioActivity.java
@@ -25,7 +25,6 @@
 import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
@@ -239,7 +238,10 @@ public void onConfigChange() {
         ((FolioPageFragment) page).reload();
         if (position < mSpineReferences.size()) {
             page = getFragment(position + 1);
-            ((FolioPageFragment) page).reload();
+            if(page!=null) {
+                ((FolioPageFragment) page).reload();
+            }
+
         }
     }
 

diff --git a/folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java b/folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java
@@ -607,14 +607,15 @@ private String getHtmlContent(String htmlContent) {
         ArrayList<Highlight> highlights =
                 (ArrayList<Highlight>) HighlightTable.getAllHighlight(getActivity().
                         getApplication(), mBook.getTitle(), mPosition);
+
         for (Highlight highlight : highlights) {
             String highlightStr =
                     "<highlight id=\"" + highlight.getHighlightId() +
                             "\" onclick=\"callHighlightURL(this);\" class=\"" +
                             highlight.getType() + "\">" + highlight.getContent() + "</highlight>";
             String searchStr = highlight.getContentPre() +
                     "" + highlight.getContent() + "" + highlight.getContentPost();
-            htmlContent = htmlContent.replace(searchStr, highlightStr);
+            htmlContent = htmlContent.replaceFirst(searchStr, highlightStr);
         }
         return htmlContent;
     }

diff --git a/sample/res/raw/nuevounitled.epub b/sample/res/raw/nuevounitled.epub
diff --git a/sample/src/main/assets/1rosecsem1.epub b/sample/src/main/assets/1rosecsem1.epub
diff --git a/sample/src/main/assets/The Silver Chair2.epub b/sample/src/main/assets/The Silver Chair2.epub
diff --git a/sample/src/main/java/comfolioreader/android/sample/HomeActivity.java b/sample/src/main/java/comfolioreader/android/sample/HomeActivity.java
@@ -49,7 +49,7 @@ public void onClick(View v) {
                 if (ContextCompat.checkSelfPermission(HomeActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                     ActivityCompat.requestPermissions(HomeActivity.this, WRITE_EXTERNAL_STORAGE_PERMS, GALLERY_REQUEST);
                 } else {
-                    openEpub(FolioActivity.EpubSourceType.ASSESTS,"nuevounitled.epub",0);
+                    openEpub(FolioActivity.EpubSourceType.ASSESTS,"1rosecsem1.epub",0);
                 }
             }
         });