From c59a41a60705e4d4e68b7c4e7c6c1b22340ec79b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 23 Jan 2022 01:08:09 -0800
Subject: [PATCH] Minor code refactoring

---
 .../java/com/topjohnwu/magisk/di/Networking.kt | 18 ------------------
 .../com/topjohnwu/magisk/di/ServiceLocator.kt  | 13 +++++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/di/Networking.kt b/app/src/main/java/com/topjohnwu/magisk/di/Networking.kt
index 663392dd2..cd54edf63 100644
--- a/app/src/main/java/com/topjohnwu/magisk/di/Networking.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/di/Networking.kt
@@ -1,15 +1,12 @@
 package com.topjohnwu.magisk.di
 
 import android.content.Context
-import android.text.method.LinkMovementMethod
 import com.squareup.moshi.Moshi
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.ProviderInstaller
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.utils.currentLocale
-import io.noties.markwon.Markwon
-import io.noties.markwon.utils.NoCopySpannableFactory
 import okhttp3.Cache
 import okhttp3.ConnectionSpec
 import okhttp3.Dns
@@ -100,18 +97,3 @@ inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseU
         .build()
         .create(T::class.java)
 }
-
-fun createMarkwon(context: Context): Markwon {
-    return Markwon.builder(context)
-        .textSetter { textView, spanned, bufferType, onComplete ->
-            textView.apply {
-                post {
-                    movementMethod = LinkMovementMethod.getInstance()
-                    setSpannableFactory(NoCopySpannableFactory.getInstance())
-                    setText(spanned, bufferType)
-                    onComplete.run()
-                }
-            }
-        }
-        .build()
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt b/app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
index 26780cd67..87bd3e8f1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.di
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.text.method.LinkMovementMethod
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStoreOwner
@@ -19,6 +20,8 @@ import com.topjohnwu.magisk.ui.install.InstallViewModel
 import com.topjohnwu.magisk.ui.log.LogViewModel
 import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
 import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
+import io.noties.markwon.Markwon
+import io.noties.markwon.utils.NoCopySpannableFactory
 
 val AppContext: Context inline get() = ServiceLocator.context
 
@@ -73,3 +76,13 @@ private fun createSuLogDatabase(context: Context) =
     Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db")
         .fallbackToDestructiveMigration()
         .build()
+
+private fun createMarkwon(context: Context) =
+    Markwon.builder(context).textSetter { textView, spanned, bufferType, onComplete ->
+        textView.apply {
+            movementMethod = LinkMovementMethod.getInstance()
+            setSpannableFactory(NoCopySpannableFactory.getInstance())
+            setText(spanned, bufferType)
+            onComplete.run()
+        }
+    }.build()