Merge branch 'central-dev' into central-master

avluis · May 12, 2019 · 8b93971 · 8b93971
2 parents cb03ed3 + a898371
commit 8b93971
Show file tree

Hide file tree

Showing 103 changed files with 3,244 additions and 985 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         // or Perfect Viewer implements Content URI
         //noinspection ExpiringTargetSdkVersion
         targetSdkVersion 23
-        versionCode 89
-        versionName '1.6.9'
+        versionCode 103
+        versionName '1.7.3'
 
         def fkToken =  '\"' + (System.getenv("FK_TOKEN")?: "")+'\"'
         def includeObjectBoxBrowser = System.getenv("INCLUDE_OBJECTBOX_BROWSER")?:"false"
@@ -79,6 +79,7 @@ dependencies {
 //    implementation 'com.facebook.stetho:stetho:1.5.0'
     // Support libraries
     implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:exifinterface:27.1.1'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
@@ -122,11 +123,13 @@ dependencies {
     // Lightweight Stream : github.com/aNNiMON/Lightweight-Stream-API
     implementation 'com.annimon:stream:1.2.0'
 
-    // LeakCanary: github.com/square/leakcanary
+    // LeakCanary: github.com/square/leakcanary -- WAITING FOR V2 TO BE STABILIZED
+/*
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
     debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
     testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+*/
 
     // Specific UI layout for tag mosaic : github.com/google/flexbox-layout
     implementation 'com.google.android:flexbox:1.0.0'
@@ -136,9 +139,6 @@ dependencies {
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation 'commons-io:commons-io:2.6'
 
-    // ScrollView with MaxHeight (tag display in advanced search UI) : https://github.com/bskim45/MaxHeightScrollView
-    implementation 'com.bskim:maxheightscrollview:1.0.0@aar'
-
     // Retrofit-ready-ready HTML parser with CSS selectors : https://github.com/DroidsOnRoids/jspoon
     implementation 'pl.droidsonroids:jspoon:1.3.2'
     implementation 'pl.droidsonroids.retrofit2:converter-jspoon:1.3.2'
@@ -162,6 +162,9 @@ dependencies {
         debugImplementation "io.objectbox:objectbox-android-objectbrowser:2.3.1"
         releaseImplementation "io.objectbox:objectbox-android:2.3.1"
     }
+
+    // https://github.com/davemorrissey/subsampling-scale-image-view
+    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 }
 
 sonarqube {

diff --git a/app/objectbox-models/default.json b/app/objectbox-models/default.json
@@ -27,7 +27,7 @@
     },
     {
       "id": "2:5880334030341287801",
-      "lastPropertyId": "16:4321603102287256155",
+      "lastPropertyId": "18:9117635469382092615",
       "name": "Content",
       "properties": [
         {
@@ -93,6 +93,14 @@
         {
           "id": "16:4321603102287256155",
           "name": "downloadParams"
+        },
+        {
+          "id": "17:903347587815260256",
+          "name": "lastReadPageIndex"
+        },
+        {
+          "id": "18:9117635469382092615",
+          "name": "isBeingDeleted"
         }
       ],
       "relations": [

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -228,7 +228,7 @@
                 <!-- Accepts URIs that begin with "http://pururin.io/" -->
                 <data
                     android:host="pururin.io"
-                    android:pathPrefix="/"
+                    android:pathPrefix="/gallery"
                     android:scheme="https" />
             </intent-filter>
             <intent-filter>
@@ -250,7 +250,7 @@
                 <!-- Accepts URIs that begin with "https://e-hentai.org/" -->
                 <data
                     android:host="e-hentai.org"
-                    android:pathPrefix="/"
+                    android:pathPrefix="/g/"
                     android:scheme="https" />
             </intent-filter>
             <intent-filter>
@@ -261,11 +261,20 @@
                 <!-- Accepts URIs that begin with "https://e-hentai.org/" -->
                 <data
                     android:host="fakku.net"
-                    android:pathPrefix="/"
+                    android:pathPrefix="/hentai/"
                     android:scheme="https" />
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activities.ImageViewerActivity"
+            android:label="Image Viewer"
+            android:theme="@style/AppTheme.NoActionBar.viewer">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.DownloadsActivity" />
+        </activity>
+
         <service
             android:name=".services.ContentDownloadService"
             android:enabled="true"

diff --git a/app/src/main/assets/about_mikan.html b/app/src/main/assets/about_mikan.html
@@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>About Mikan</title>
     <style>
         body {
             margin: 1em;
@@ -13,7 +15,7 @@
     </style>
 </head>
 <body>
-Mikan Search is an <b>experimental</b> feature that allows you to browse and search <b>hitomi.la</b> books without having to access the website.
+Mikan Search is an <strong>experimental</strong> feature that allows you to browse and search <strong>hitomi.la</strong> books without having to access the website.
 <br/><br/>
 Keep in mind that Mikan Search is still under development. Its stability is not guaranteed yet.
 <br/><br/>

diff --git a/app/src/main/java/me/devsaki/hentoid/HentoidApp.java b/app/src/main/java/me/devsaki/hentoid/HentoidApp.java
@@ -1,5 +1,6 @@
 package me.devsaki.hentoid;
 
+import android.annotation.SuppressLint;
 import android.app.Application;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -11,7 +12,6 @@
 import com.crashlytics.android.Crashlytics;
 import com.google.android.gms.security.ProviderInstaller;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.squareup.leakcanary.LeakCanary;
 
 import io.fabric.sdk.android.Fabric;
 import me.devsaki.hentoid.database.DatabaseMaintenance;
@@ -33,7 +33,8 @@
 public class HentoidApp extends Application {
 
     private static boolean beginImport;
-    private static HentoidApp instance;
+    @SuppressLint("StaticFieldLeak") // A context leak happening at app level isn't _really_ a leak, right ? ;-)
+    private static Context instance;
 
     public static Context getAppContext() {
         return instance;
@@ -67,20 +68,22 @@ public void onCreate() {
             Timber.e(e, "Google Play ProviderInstaller exception");
         }
 
+/*
         // LeakCanary
         if (LeakCanary.isInAnalyzerProcess(this)) {
             // This process is dedicated to LeakCanary for heap analysis.
             // You should not init your app in this process.
             return;
         }
         LeakCanary.install(this);
+*/
 
         // Timber
         if (BuildConfig.DEBUG) Timber.plant(new Timber.DebugTree());
         Timber.plant(new CrashlyticsTree());
 
         // Prefs
-        instance = this;
+        instance = this.getApplicationContext();
         Preferences.init(this);
 
         // Firebase

diff --git a/app/src/main/java/me/devsaki/hentoid/abstracts/BaseFragment.java b/app/src/main/java/me/devsaki/hentoid/abstracts/BaseFragment.java
@@ -4,8 +4,6 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
-import com.squareup.leakcanary.LeakCanary;
-
 import org.greenrobot.eventbus.EventBus;
 
 import me.devsaki.hentoid.events.DownloadEvent;
@@ -59,7 +57,7 @@ public void onDestroy() {
     public void onDestroyView() {
         super.onDestroyView();
 
-        LeakCanary.installedRefWatcher().watch(this);
+//        LeakCanary.installedRefWatcher().watch(this);
     }
 
     // Implementations must annotate method with: