Find the first page from spine item instead of toc

Author: devgrapher

OCEBook/app/src/main/java/com/devgrapher/ocebook/WebViewFragment.java

@@ -18,6 +18,7 @@
 import android.webkit.WebViewClient;
 import android.widget.TextView;
 
+import com.devgrapher.ocebook.readium.TocManager;
 import com.devgrapher.ocebook.readium.ScriptProcessor;
 import com.devgrapher.ocebook.readium.ReadiumServer;
 import com.devgrapher.ocebook.model.ContainerHolder;
@@ -30,15 +31,11 @@
 import org.readium.sdk.android.Container;
 import org.readium.sdk.android.Package;
 import org.readium.sdk.android.SpineItem;
-import org.readium.sdk.android.components.navigation.NavigationElement;
-import org.readium.sdk.android.components.navigation.NavigationPoint;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Locale;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**
@@ -59,7 +56,7 @@ public class WebViewFragment extends Fragment {
     private ViewerSettings mViewerSettings;
     private ReadiumJSApi mReadiumJSApi;
     private ReadiumServer mReadiumServer;
-    private List<NavigationPoint> mNavPoints;
+    private TocManager mTocManager;
 
     private WebView mWebView;
     private TextView mPageInfoTextView;
@@ -109,11 +106,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         initWebView();
         intReadium();
 
-        //TODO: TEST 작성
-        mNavPoints = flatNavigationElement(mPackage.getTableOfContents())
-                .filter(e -> e instanceof NavigationPoint)
-                .map(e -> (NavigationPoint)e)
-                .collect(Collectors.toList());
 
         mViewerSettings = new ViewerSettings(
                 ViewerSettings.SyntheticSpreadMode.AUTO,
@@ -128,14 +120,10 @@ public void loadJS(String javascript) {
 
         mReadiumServer.start();
 
+        mTocManager = new TocManager(mPackage);
         return view;
     }
 
-    public Stream<NavigationElement> flatNavigationElement(final NavigationElement elem) {
-        return Stream.concat(
-                Stream.of(elem),
-                elem.getChildren().stream().flatMap(e -> flatNavigationElement(e)));
-    }
 
     private void initWebView() {
         if ((getContext().getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)
@@ -307,15 +295,12 @@ public final class ReadiumJsEventListener implements ScriptProcessor.JsEventList
         @Override
         public void onReaderInitialized() {
             getActivity().runOnUiThread(() -> {
-                if (mNavPoints.size() == 0)
-                    return;
-
-                NavigationPoint nav = mNavPoints.get(0);
-                OpenPageRequest openPageRequest =
-                        OpenPageRequest.fromContentUrl(nav.getContent(),
-                                mPackage.getTableOfContents().getSourceHref());
-
-                mReadiumJSApi.openBook(mPackage, mViewerSettings, openPageRequest);
+                mPackage.getSpineItems().stream()
+                        .findAny()
+                        .ifPresent(item -> {
+                            mReadiumJSApi.openBook(mPackage, mViewerSettings,
+                                    OpenPageRequest.fromIdref(item.getIdRef()));
+                        });
             });
         }
 

OCEBook/app/src/main/java/com/devgrapher/ocebook/readium/ReadiumServer.java

@@ -11,9 +11,9 @@
 
 public class ReadiumServer {
     private static final String TAG = ReadiumServer.class.toString();
-    private WebServer mServer;
-    private ScriptProcessor mScriptProcessor;
-    private Package mPackage;
+    private final WebServer mServer;
+    private final ScriptProcessor mScriptProcessor;
+    private final Package mPackage;
 
     private final WebServer.DataPreProcessor dataPreProcessor =
             new WebServer.DataPreProcessor() {