Fix/first page position of vertical string books, App can't open multibytes title book

build.gradle

@@ -8,9 +8,10 @@ buildscript {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }

folioreader/build.gradle

@@ -28,8 +28,8 @@ ext {
 
 android {
     useLibrary 'org.apache.http.legacy'
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         versionCode 1
@@ -82,7 +82,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':webViewMarker')
 
-    final ANDROID_LIB_VERSION = '26.0.2'
+    final ANDROID_LIB_VERSION = '27.+'
 
     //noinspection GradleDependency
     compile "com.android.support:appcompat-v7:$ANDROID_LIB_VERSION"

folioreader/res/values-pt-rBR/strings.xml

@@ -30,4 +30,5 @@
     <string name="OK">Ok</string>
     <string name="SetSizeTitle">Painel superior</string>
     <string name="LanguageChooserTitle">Escolha 2 linguagens</string>
+    <string name="cant_open_file">Can\'t open file</string>
 </resources>

folioreader/res/values-ru/strings.xml

@@ -41,5 +41,6 @@
     <string name="save_note">Сохранить заметку</string>
     <string name="please_enter_note">пожалуйста введите заметку</string>
     <string name="contents">Содержание</string>
+    <string name="cant_open_file">Can\'t open file</string>
 
 </resources>

folioreader/res/values/strings.xml

@@ -91,4 +91,7 @@
     <string name="dictionary">Dictionary</string>
     <string name="wikipedia">Wikipedia</string>
     <string name="cannot_access_epub_message">Cannot open epub it needs storage access !</string>
+    <string name="orientation_horizontal">horizontal</string>
+    <string name="orientation_vertical">vertical</string>
+    <string name="cant_open_file">Can\'t open file</string>
 </resources>

folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java

@@ -58,7 +58,6 @@
 import com.folioreader.ui.folio.presenter.MainPresenter;
 import com.folioreader.util.AppUtil;
 import com.folioreader.util.FileUtil;
-
 import com.folioreader.util.UiUtil;
 import com.folioreader.view.ConfigBottomSheetDialogFragment;
 import com.folioreader.view.DirectionalViewpager;
@@ -74,6 +73,9 @@
 import org.readium.r2_streamer.server.EpubServerSingleton;
 
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -162,7 +164,10 @@ protected void onCreate(Bundle savedInstanceState) {
         if (ContextCompat.checkSelfPermission(FolioActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(FolioActivity.this, Constants.getWriteExternalStoragePerms(), Constants.WRITE_EXTERNAL_STORAGE_REQUEST);
         } else {
-            setupBook();
+            if(setupBook() == false){
+                Toast.makeText(this, R.string.cant_open_file, Toast.LENGTH_LONG);
+                finish();
+            }
         }
 
         initAudioView();
@@ -205,27 +210,52 @@ public void onClick(View v) {
         }
     }
 
-    private void initBook(String mEpubFileName, int mEpubRawId, String mEpubFilePath, EpubSourceType mEpubSourceType) {
+    private Boolean initBook(String mEpubFileName, int mEpubRawId, String mEpubFilePath, EpubSourceType mEpubSourceType) {
+        Log.v(TAG, "initBook >>");
+        Boolean result = false;
         try {
             int portNumber = getIntent().getIntExtra(Config.INTENT_PORT, Constants.PORT_NUMBER);
             mEpubServer = EpubServerSingleton.getEpubServerInstance(portNumber);
             mEpubServer.start();
             String path = FileUtil.saveEpubFileAndLoadLazyBook(FolioActivity.this, mEpubSourceType, mEpubFilePath,
                     mEpubRawId, mEpubFileName);
-            addEpub(path);
 
-            String urlString = Constants.LOCALHOST + bookFileName + "/manifest";
-            new MainPresenter(this).parseManifest(urlString);
+            if(addEpub(path)){
 
+                String urlString = Constants.LOCALHOST + URLEncoder.encode(bookFileName, "UTF-8") + "/manifest";
+                Log.v(TAG, "initBook urlString = " + urlString);
+                new MainPresenter(this).parseManifest(urlString);
+
+                result = true;
+            }
         } catch (IOException e) {
             Log.e(TAG, "initBook failed", e);
         }
+        Log.v(TAG, "initBook <<");
+
+        return result;
     }
 
-    private void addEpub(String path) throws IOException {
+    private Boolean addEpub(String path) throws IOException {
+        Log.v(TAG, "addEpub >>");
+        Log.v(TAG, "addEpub path = " + path);
+        Log.v(TAG, "addEpub bookFileName = " + bookFileName);
+
+        Boolean result = true;
+
         Container epubContainer = new EpubContainer(path);
-        mEpubServer.addEpub(epubContainer, "/" + bookFileName);
+        try{
+            mEpubServer.addEpub(epubContainer, "/" + URLEncoder.encode(bookFileName));
+        }
+        catch(Exception ex){
+            Log.e(TAG, "addEpub error = " +  ex.getMessage());
+            result = false;
+        }
         getEpubResource();
+
+        Log.v(TAG, "addEpub <<");
+
+        return result;
     }
 
     private void getEpubResource() {
@@ -488,11 +518,12 @@ public void onLoadPublication(EpubPublication publication) {
     }
 
     private void setConfig() {
-        if (AppUtil.getSavedConfig(this) != null) {
-            mConfig = AppUtil.getSavedConfig(this);
-        } else if (getIntent().getParcelableExtra(Config.INTENT_CONFIG) != null) {
+        if (getIntent().getParcelableExtra(Config.INTENT_CONFIG) != null) {
             mConfig = getIntent().getParcelableExtra(Config.INTENT_CONFIG);
             AppUtil.saveConfig(this, mConfig);
+            Log.v(TAG, "setConfig (2) isShowTts = " + mConfig.isShowTts());
+        } else         if (AppUtil.getSavedConfig(this) != null) {
+            mConfig = AppUtil.getSavedConfig(this);
         } else {
             mConfig = new Config.ConfigBuilder().build();
             AppUtil.saveConfig(this, mConfig);
@@ -673,9 +704,29 @@ public void initColors() {
         UiUtil.setColorToImage(this, mConfig.getThemeColor(), ((ImageView) findViewById(R.id.btn_speaker)).getDrawable());
     }
 
-    private void setupBook() {
-        bookFileName = FileUtil.getEpubFilename(this, mEpubSourceType, mEpubFilePath, mEpubRawId);
-        initBook(bookFileName, mEpubRawId, mEpubFilePath, mEpubSourceType);
+    public String md5(String s) {
+        try {
+            // Create MD5 Hash
+            MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
+            digest.update(s.getBytes());
+            byte messageDigest[] = digest.digest();
+
+            // Create Hex String
+            StringBuffer hexString = new StringBuffer();
+            for (int i=0; i<messageDigest.length; i++)
+                hexString.append(String.format("%02x", messageDigest[i] & 0xff));
+            return hexString.toString();
+
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    private Boolean setupBook() {
+        //bookFileName = FileUtil.getEpubFilename(this, mEpubSourceType, mEpubFilePath, mEpubRawId);
+        bookFileName = md5(mEpubFilePath);
+        return initBook(bookFileName, mEpubRawId, mEpubFilePath, mEpubSourceType);
     }
 
     @Override

folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java

@@ -561,7 +561,7 @@ public void onProgressChanged(WebView view, int progress) {
                         @Override
                         public void run() {
                             Log.d("scroll y", "Scrolly" + mScrollY);
-                            mWebview.scrollTo(0, mScrollY);
+                            mWebview.scrollTo(mWebview.getScrollX(), mScrollY);
                         }
                     }, 100);
                 }
@@ -1037,7 +1037,7 @@ public void setWebViewPosition(final int position) {
             @Override
             public void run() {
                 if (isAdded()) {
-                    mWebview.scrollTo(0, position);
+                    mWebview.scrollTo(mWebview.getScrollX(), position);
                 }
             }
         });

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,8 @@
-#Sat Jun 10 11:42:12 IST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
-
-org.gradle.daemon=true
-org.gradle.parallel=true
+#Fri Jun 15 20:59:41 JST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+org.gradle.daemon=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+org.gradle.parallel=true

sample/build.gradle

@@ -8,8 +8,8 @@ android {
     javaMaxHeapSize "4G"
   }
 
-  compileSdkVersion 26
-  buildToolsVersion "26.0.2"
+  compileSdkVersion 27
+  buildToolsVersion '27.0.3'
 
   defaultConfig {
     applicationId "com.folioreader.android.sample"
@@ -57,5 +57,5 @@ android {
 
 dependencies {
   compile project(':folioreader')
-  compile 'com.android.support:appcompat-v7:26.0.2'
+  compile "com.android.support:appcompat-v7:27.+"
 }

webViewMarker/build.gradle

@@ -26,7 +26,7 @@ ext {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         versionCode Integer.parseInt(project.VERSION_CODE)