Merge branch 'develop'

Author: danielweck

SDKLauncher-Android/app/build_experimental.gradle

@@ -32,8 +32,8 @@ model {
     }
 
     android {
-        compileSdkVersion = 25
-        buildToolsVersion = "25.0.3"
+        compileSdkVersion = 26
+        buildToolsVersion = "27.0.2"
 
         defaultConfig {
 
@@ -44,13 +44,13 @@ model {
             minSdkVersion.apiLevel = 19
 
             // manifest/uses-sdk@android:targetSdkVersion attribute in src/main/AndroidManifest.xml
-            targetSdkVersion.apiLevel = 25
+            targetSdkVersion.apiLevel = 26
 
             // manifest@android:versionCode attribute in src/main/AndroidManifest.xml
-            versionCode 25
+            versionCode 29
 
             // manifest@android:versionName attribute in src/main/AndroidManifest.xml
-            versionName "1.25"
+            versionName "1.29"
         } //defaultConfig
 
         sources {

SDKLauncher-Android/app/build_stable.gradle

@@ -9,8 +9,8 @@ def key_password =  (rootProject.hasProperty("readium_sign_key_password") ? root
 def store_password =  (rootProject.hasProperty("readium_sign_store_password") ? rootProject.readium_sign_store_password : "nope")
 
 android {
-    compileSdkVersion = 25
-    buildToolsVersion = "25.0.3"
+    compileSdkVersion = 26
+    buildToolsVersion = "27.0.2"
 
     lintOptions {
         checkReleaseBuilds = false
@@ -38,13 +38,13 @@ android {
         minSdkVersion 19
 
         // manifest/uses-sdk@android:targetSdkVersion attribute in src/main/AndroidManifest.xml
-        targetSdkVersion 25
+        targetSdkVersion 26
 
         // manifest@android:versionCode attribute in src/main/AndroidManifest.xml
-        versionCode 25
+        versionCode 29
 
         // manifest@android:versionName attribute in src/main/AndroidManifest.xml
-        versionName "1.25"
+        versionName "1.29"
     } //defaultConfig
 
     sourceSets {

SDKLauncher-Android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.readium.sdk.android.launcher"
-    android:versionCode="28"
-    android:versionName="1.28" >
+    android:versionCode="29"
+    android:versionName="1.29" >
 
     <uses-sdk
         android:minSdkVersion="19"
-        android:targetSdkVersion="25" />
+        android:targetSdkVersion="26" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

SDKLauncher-Android/app/src/main/java/org/readium/sdk/android/launcher/WebViewActivity.java

@@ -89,8 +89,13 @@ public class WebViewActivity extends FragmentActivity implements
 	private final boolean quiet = false;
 
 	private static final String TAG = "WebViewActivity";
-	private static final String ASSET_PREFIX = "file:///android_asset/readium-shared-js/";
-	private static final String READER_SKELETON = "file:///android_asset/readium-shared-js/reader.html";
+
+	private static final String ASSET_PREFIX_FILE = "file:///android_asset/readium-shared-js/";
+	private static final String READER_SKELETON_FILE = ASSET_PREFIX_FILE + "reader.html";
+
+	private static final String ASSET_PREFIX = "http://" + EpubServer.HTTP_HOST + ":" + EpubServer.HTTP_PORT + "/readium-shared-js/";
+	private static final String READER_SKELETON = ASSET_PREFIX + "reader.html";
+
 
 	// Installs "hook" function so that top-level window (application) can later
 	// inject the window.navigator.epubReadingSystem into this HTML document's
@@ -109,25 +114,31 @@ public class WebViewActivity extends FragmentActivity implements
 	// window.navigator.epubReadingSystem if the expected hook function exists (
 	// readium_set_epubReadingSystem() ).
 	private static final String INJECT_EPUB_RSO_SCRIPT_2 = ""
-			+ "var epubRSInject =\nfunction(win) {"
+			+ "var epubRSInject =\nfunction(win) {" // 1
 			+ "\nvar ret = '';"
 			+ "\nret += win.location.href;"
 			+ "\nret += ' ---- ';"
-			+
 			// "\nret += JSON.stringify(win.navigator.epubReadingSystem);" +
 			// "\nret += ' ---- ';" +
-			"\nif (win.frames)"
-			+ "\n{"
+			+ "\nif (win.frames)"
+			+ "\n{" // 2
 			+ "\nfor (var i = 0; i < win.frames.length; i++)"
-			+ "\n{"
+			+ "\n{" // 3
 			+ "\nvar iframe = win.frames[i];"
 			+ "\nret += ' IFRAME ';"
+			+ "\ntry {\n" // 4
 			+ "\nif (iframe.readium_set_epubReadingSystem)"
-			+ "\n{"
+			+ "\n{" // 5
 			+ "\nret += ' EPBRS ';"
 			+ "\niframe.readium_set_epubReadingSystem(window.navigator.epubReadingSystem);"
-			+ "\n}" + "\nret += epubRSInject(iframe);" + "\n}" + "\n}"
-			+ "\nreturn ret;" + "\n};" + "\nepubRSInject(window);";
+			+ "\n}" // 5
+			+ "\nret += epubRSInject(iframe);"
+			+ "\n} catch(err) { console.log(err); }" // 4
+			+ "\n}" // 3
+			+ "\n}" // 2
+			+ "\nreturn ret;"
+			+ "\n};" // 1
+			+ "\nepubRSInject(window);";
 
 	// Script tag to inject the "hook" function installer script, added to the
 	// head of every epub iframe document
@@ -276,7 +287,7 @@ public void loadJS(String javascript) {
 	protected void onDestroy() {
 		super.onDestroy();
 		mServer.stop();
-		mWebview.loadUrl(READER_SKELETON);
+		mWebview.loadUrl(READER_SKELETON_FILE);
 		((ViewGroup) mWebview.getParent()).removeView(mWebview);
 		mWebview.removeAllViews();
 		mWebview.clearCache(true);
@@ -481,6 +492,40 @@ public WebResourceResponse shouldInterceptRequest(WebView view,
 				if (!quiet)
 					Log.d(TAG, url + " => " + cleanedUrl);
 
+				String mime = null;
+				int dot = cleanedUrl.lastIndexOf('.');
+				if (dot >= 0) {
+					mime = EpubServer.MIME_TYPES.get(cleanedUrl.substring(
+							dot + 1).toLowerCase());
+				}
+				if (mime == null) {
+					mime = "application/octet-stream";
+				}
+
+				if (url.startsWith(ASSET_PREFIX)) {
+
+					if (!quiet)
+						Log.d(TAG, "READER ASSET ...");
+
+					// reader.html
+					if (mime.equals("application/xhtml+xml")) {
+						mime = "text/html";
+					}
+
+					InputStream is = null;
+					try {
+						is = getAssets().open(cleanedUrl);
+					} catch (IOException e) {
+
+						Log.e(TAG, "asset fail: " + cleanedUrl);
+
+						return new WebResourceResponse(null, UTF_8,
+								new ByteArrayInputStream("".getBytes()));
+					}
+
+					return new WebResourceResponse(mime, UTF_8, is);
+				}
+
 				if (cleanedUrl
 						.matches("\\/?\\d*\\/readium_epubReadingSystem_inject.js")) {
 					if (!quiet)
@@ -535,15 +580,6 @@ public WebResourceResponse shouldInterceptRequest(WebView view,
 					return new WebResourceResponse("text/css", UTF_8, is);
 				}
 
-				String mime = null;
-				int dot = cleanedUrl.lastIndexOf('.');
-				if (dot >= 0) {
-					mime = EpubServer.MIME_TYPES.get(cleanedUrl.substring(
-							dot + 1).toLowerCase());
-				}
-				if (mime == null) {
-					mime = "application/octet-stream";
-				}
 
 				ManifestItem item = mPackage.getManifestItem(cleanedUrl);
 				String contentType = item != null ? item.getMediaType() : null;

SDKLauncher-Android/build.gradle

@@ -41,10 +41,10 @@ buildscript {
         // Use stable gradle or experimental gradle
         if (ndkExperimental) {
             //https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view
-            classpath "com.android.tools.build:gradle-experimental:0.9.2"
+            classpath "com.android.tools.build:gradle-experimental:0.9.3"
         } else {
             //https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
-            classpath "com.android.tools.build:gradle:2.3.2"
+            classpath "com.android.tools.build:gradle:2.3.3"
         }
     }
 }

SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties

@@ -5,5 +5,5 @@ zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #https://services.gradle.org/distributions
 # GRADLE EXPERIMENTAL requires 3.3
-# GRADLE STABLE works with latest (3.5)
+# GRADLE STABLE works with latest (4.4)
 distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

SDKLauncher-Android/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-25
+target=android-26
 android.library.reference.1=../readium-sdk/Platform/Android