From f0111a3dd3ffc08d4ade907b247213aaf7094ed7 Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Sat, 20 Mar 2021 21:45:41 +0800
Subject: [PATCH] Update proguard rules

---
 app/proguard-rules.pro                        | 38 +++++++++----------
 .../com/hippo/ehviewer/ui/MainActivity.java   |  1 +
 .../hippo/ehviewer/ui/scene/BaseScene.java    |  6 ---
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e8c0a4fe8..29c6c0054 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,34 +1,30 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in E:\Android\android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
     public static void check*(...);
     public static void throw*(...);
 }
+
 -keepattributes SourceFile,LineNumberTable
+
 -keep class com.hippo.a7zip.* { *; }
+
 -keep class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BaseFragment { }
 -keep class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BasePreferenceFragment { }
+
 -keepnames class com.hippo.ehviewer.ui.scene.* { }
+
 -keep class com.hippo.image.* { *; }
--keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
-public static java.lang.String TABLENAME;
-}
+
 -keep class com.hippo.ehviewer.dao.* { *; }
+
 -dontwarn net.sqlcipher.database.**
 -dontwarn rx.**
--dontwarn org.conscrypt.ConscryptHostnameVerifier
\ No newline at end of file
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn net.sqlcipher.Cursor
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index df5d63859..db62a149a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -314,6 +314,7 @@ public final class MainActivity extends StageActivity
 
         mStageLayout = (EhStageLayout) ViewUtils.$$(this, R.id.fragment_container);
         mDrawerLayout = (DrawerLayout) ViewUtils.$$(this, R.id.draw_view);
+        mDrawerLayout.setStatusBarBackgroundColor(0);
         mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view);
         mRightDrawer = (DrawerView) ViewUtils.$$(this, R.id.right_drawer);
         View headerLayout = mNavView.getHeaderView(0);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
index 5f0c4a79c..207514458 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
@@ -253,10 +253,4 @@ public abstract class BaseScene extends SceneFragment {
         super.onResume();
         Analytics.onSceneView(this);
     }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-    }
 }