Resolve #489

app/src/main/java/com/hippo/Native.kt

@@ -20,7 +20,6 @@ package com.hippo
 import java.io.FileDescriptor
 
 object Native {
-    @JvmStatic
     fun initialize() {
         System.loadLibrary("ehviewer")
     }

app/src/main/java/com/hippo/ehviewer/EhApplication.kt

@@ -86,20 +86,16 @@ class EhApplication : SceneApplication() {
         val handler = Thread.getDefaultUncaughtExceptionHandler()
         Thread.setDefaultUncaughtExceptionHandler { t, e ->
             try {
-                // Always save crash file if onCreate() is not done
-                if (!initialized || Settings.getSaveCrashLog()) {
+                if (Settings.getSaveCrashLog()) {
                     Crash.saveCrashLog(application, e)
                 }
             } catch (ignored: Throwable) {
             }
-
             handler?.uncaughtException(t, e)
         }
         super.onCreate()
-        Image.initialize(this)
         Native.initialize()
         GetText.initialize(this)
-        StatusCodeException.initialize(this)
         Settings.initialize(this)
         ReadableTime.initialize(this)
         AppConfig.initialize(this)

app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java

@@ -131,7 +131,7 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc
         mSignIn = ViewUtils.$$(loginForm, R.id.sign_in);
         mSignInViaWebView = (TextView) ViewUtils.$$(loginForm, R.id.sign_in_via_webview);
         mSignInViaCookies = (TextView) ViewUtils.$$(loginForm, R.id.sign_in_via_cookies);
-        mSkipSigningIn = (TextView) ViewUtils.$$(loginForm, R.id.skip_signing_in);
+        mSkipSigningIn = (TextView) ViewUtils.$$(loginForm, R.id.tourist_mode);
 
         mSignInViaWebView.setPaintFlags(mSignInViaWebView.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG);
         mSignInViaCookies.setPaintFlags(mSignInViaCookies.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG);

app/src/main/java/com/hippo/image/Image.kt

@@ -17,7 +17,6 @@
  */
 package com.hippo.image
 
-import android.content.Context
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -32,6 +31,7 @@ import android.graphics.drawable.AnimatedImageDrawable
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import androidx.core.graphics.drawable.toDrawable
+import com.hippo.ehviewer.EhApplication
 import java.io.FileInputStream
 import java.nio.ByteBuffer
 import java.nio.channels.FileChannel
@@ -169,8 +169,8 @@ class Image private constructor(
         var screenWidth: Int = 0
         var screenHeight: Int = 0
 
-        @JvmStatic
-        fun initialize(context: Context) {
+        init {
+            val context = EhApplication.application
             screenWidth = context.resources.displayMetrics.widthPixels
             screenHeight = context.resources.displayMetrics.heightPixels
         }

app/src/main/java/com/hippo/network/StatusCodeException.kt

@@ -15,8 +15,8 @@
  */
 package com.hippo.network
 
-import android.content.Context
 import android.util.SparseArray
+import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 
 class StatusCodeException(val responseCode: Int) : Exception() {
@@ -33,9 +33,8 @@ class StatusCodeException(val responseCode: Int) : Exception() {
         private val ERROR_MESSAGE_ARRAY = SparseArray<String>(24)
         private const val DEFAULT_ERROR_MESSAGE = "Error response code"
 
-        @JvmStatic
-        fun initialize(context: Context) {
-            val resources = context.applicationContext.resources
+        init {
+            val resources = EhApplication.application.resources
             ERROR_MESSAGE_ARRAY.append(400, resources.getString(R.string.error_status_code_400))
             ERROR_MESSAGE_ARRAY.append(401, resources.getString(R.string.error_status_code_401))
             ERROR_MESSAGE_ARRAY.append(402, resources.getString(R.string.error_status_code_402))
@@ -62,5 +61,4 @@ class StatusCodeException(val responseCode: Int) : Exception() {
             ERROR_MESSAGE_ARRAY.append(505, resources.getString(R.string.error_status_code_505))
         }
     }
-
-}
+}