Merge branch 'central-dev' into central-master

avluis · Apr 7, 2019 · 0219972 · 0219972
2 parents c1e5189 + aa8d073
commit 0219972
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
+apply plugin: 'org.sonarqube'
 
 // apply signing configuration if config file exists
 if (file('signing.gradle').exists()) {
@@ -19,8 +20,8 @@ android {
         // or Perfect Viewer implements Content URI
         //noinspection ExpiringTargetSdkVersion
         targetSdkVersion 23
-        versionCode 87
-        versionName '1.6.7'
+        versionCode 88
+        versionName '1.6.8'
 
         def fkToken =  '\"' + (System.getenv("FK_TOKEN")?: "")+'\"'
         def includeObjectBoxBrowser = System.getenv("INCLUDE_OBJECTBOX_BROWSER")?:"false"
@@ -163,5 +164,16 @@ dependencies {
     }
 }
 
+sonarqube {
+    properties {
+        property "sonar.projectKey", "RobbWatershed_hentoid-sonar"
+        property "sonar.organization", "robbwatershed-github"
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.language", "java"
+        property "sonar.sources", "src/main/"
+        property "sonar.login", "3d0dc80792bad95f0193e7ed626cf090ac83e208"
+    }
+}
+
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'io.objectbox' // apply last
diff --git a/app/src/main/java/me/devsaki/hentoid/activities/websites/BaseWebActivity.java b/app/src/main/java/me/devsaki/hentoid/activities/websites/BaseWebActivity.java
@@ -238,7 +238,7 @@ public void onProgressChanged(WebView view, int newProgress) {
         webSettings.setBuiltInZoomControls(true);
         webSettings.setDisplayZoomControls(false);
 
-        webSettings.setUserAgentString(Consts.USER_AGENT);
+        webSettings.setUserAgentString(Consts.USER_AGENT_NEUTRAL);
 
         webSettings.setDomStorageEnabled(true);
         webSettings.setUseWideViewPort(true);

diff --git a/app/src/main/java/me/devsaki/hentoid/database/domains/Content.java b/app/src/main/java/me/devsaki/hentoid/database/domains/Content.java
@@ -336,7 +336,10 @@ public Content postJSONImport() {   // TODO - this is shabby
             this.attributes.clear();
             for (AttributeType type : this.attributeMap.keySet()) {
                 for (Attribute attr : this.attributeMap.get(type))
+                {
+                    if (null == attr.getType()) attr.setType(AttributeType.SERIE); // Fix the issue with v1.6.5
                     this.attributes.add(attr.computeLocation(site));
+                }
             }
         }
         if (this.imageList != null) {

diff --git a/app/src/main/java/me/devsaki/hentoid/enums/Site.java b/app/src/main/java/me/devsaki/hentoid/enums/Site.java
@@ -14,15 +14,15 @@ public enum Site {
     // TODO : https://hentai2read.com/,
     FAKKU(0, "Fakku", "https://www.fakku.net", "fakku", R.drawable.ic_menu_fakku, true, true, false), // Legacy support for old fakku archives
     PURURIN(1, "Pururin", "https://pururin.io", "pururin", R.drawable.ic_menu_pururin, true, true, false),
-    HITOMI(2, "hitomi", "https://hitomi.la", "hitomi", R.drawable.ic_menu_hitomi, true, true, false),
+    HITOMI(2, "hitomi", "https://hitomi.la", "hitomi", R.drawable.ic_menu_hitomi, true, false, false),
     NHENTAI(3, "nhentai", "https://nhentai.net", "nhentai", R.drawable.ic_menu_nhentai, true, true, false),
     TSUMINO(4, "tsumino", "https://www.tsumino.com", "tsumino", R.drawable.ic_menu_tsumino, true, true, false),
     HENTAICAFE(5, "hentaicafe", "https://hentai.cafe", "hentai.cafe", R.drawable.ic_menu_hentaicafe, true, true, false),
     ASMHENTAI(6, "asmhentai", "https://asmhentai.com", "/asmhentai", R.drawable.ic_menu_asmhentai, true, true, false),
     ASMHENTAI_COMICS(7, "asmhentai comics", "https://comics.asmhentai.com", "comics.asmhentai", R.drawable.ic_menu_asmcomics, true, true, false),
     EHENTAI(8, "e-hentai", "https://e-hentai.org", "e-hentai", R.drawable.ic_menu_ehentai, true, true, false),
     FAKKU2(9, "Fakku", "https://www.fakku.net", "fakku2", R.drawable.ic_menu_fakku, true, false, true),
-    NONE(98, "none", "", "none", R.drawable.ic_menu_about, true, true, false),
+    NONE(98, "none", "", "none", R.drawable.ic_menu_about, true, true, false), // Fallback site
     PANDA(99, "panda", "https://www.mangapanda.com", "mangapanda", R.drawable.ic_menu_panda, true, true, false); // Safe-for-work/wife/gf option
 
 

diff --git a/app/src/main/java/me/devsaki/hentoid/services/ImportService.java b/app/src/main/java/me/devsaki/hentoid/services/ImportService.java
@@ -188,7 +188,7 @@ private void startImport(boolean cleanup) {
                 else booksOK++;
             } catch (Exception e) {
                 if (null == content)
-                    content = new Content().setTitle("none").setUrl("").setSite(Site.NONE);
+                    content = new Content().setTitle("none").setSite(Site.NONE).setUrl("");
                 booksKO++;
                 trace(Log.ERROR, log, "Import book ERROR : %s %s", e.getMessage(), folder.getAbsolutePath());
             }

diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.0.0'
         classpath 'io.fabric.tools:gradle:1.25.4'
         classpath "io.objectbox:objectbox-gradle-plugin:2.3.1"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -26,6 +27,7 @@ allprojects {
         jcenter()
         maven { url "http://jcenter.bintray.com" } // non-https jcenter
         maven { url 'https://jitpack.io' }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 }