fix bugs

Signed-off-by: androidacy-user <[email protected]>

Author: androidacy-user

app/src/main/kotlin/com/fox2code/mmm/XHooks.kt

@@ -15,9 +15,10 @@ import com.fox2code.mmm.repo.RepoManager
 /**
  * Class made to expose some manager functions to xposed modules.
  * It will not be obfuscated on release builds
+ *
+ * TODO: Evaluate usage and deprecate if not needed
  */
 @Suppress("UNUSED_PARAMETER")
-@Deprecated("This class is deprecated and will be removed in the future")
 @Keep
 enum class XHooks {
     ;

app/src/main/kotlin/com/fox2code/mmm/module/ActionButtonType.kt

@@ -182,7 +182,7 @@ enum class ActionButtonType {
             var markwon: Markwon? = null
             val localModuleInfo = moduleHolder.moduleInfo
             if (localModuleInfo != null && localModuleInfo.updateChangeLog.isNotEmpty()) {
-                markwon = INSTANCE!!.reallyGetMarkwon()
+                markwon = INSTANCE!!.markwon
                 // Re-render each time in cse of config changes
                 desc = markwon!!.toMarkdown(localModuleInfo.updateChangeLog)
             }
@@ -484,7 +484,7 @@ enum class ActionButtonType {
                     var markwon: Markwon? = null
                     val localModuleInfo = moduleHolder.moduleInfo
                     if (localModuleInfo != null && localModuleInfo.updateChangeLog.isNotEmpty()) {
-                        markwon = INSTANCE!!.reallyGetMarkwon()
+                        markwon = INSTANCE!!.markwon
                         // Re-render each time in cse of config changes
                         desc = markwon!!.toMarkdown(localModuleInfo.updateChangeLog)
                     }

app/src/main/kotlin/com/fox2code/mmm/utils/io/net/Http.kt

@@ -48,8 +48,6 @@ import okhttp3.Response
 import okhttp3.Response.*
 import okhttp3.dnsoverhttps.DnsOverHttps
 import okhttp3.dnsoverhttps.DnsOverHttps.Builder.*
-import okhttp3.logging.HttpLoggingInterceptor
-import okhttp3.logging.HttpLoggingInterceptor.*
 import okio.BufferedSink
 import org.chromium.net.CronetEngine
 import timber.log.Timber
@@ -342,15 +340,6 @@ enum class Http {;
                 chain.proceed(request.build())
             })
 
-            // for debug builds, add a logging interceptor
-            // this spams the logcat, so it's disabled by default and hidden behind a build config flag
-            if (BuildConfig.DEBUG && BuildConfig.DEBUG_HTTP) {
-                Timber.w("HTTP logging is enabled. Performance may be impacted.")
-                val loggingInterceptor = HttpLoggingInterceptor()
-                loggingInterceptor.setLevel(Level.BODY)
-                httpclientBuilder.addInterceptor(loggingInterceptor)
-            }
-
             // add sentry interceptor
             httpclientBuilder.addInterceptor(SentryOkHttpInterceptor())
 

app/src/main/res/xml/app_info_preferences.xml

@@ -3,17 +3,17 @@
 
     <PreferenceCategory app:title="@string/pref_category_info">
         <!-- donate buttons for fox2code and androidacy -->
-        <com.fox2code.mmm.settings.LongClickablePreference
-            app:icon="@drawable/ic_baseline_monetization_on_24"
-            app:key="pref_donate_fox"
-            app:singleLineTitle="false"
-            app:title="@string/donate_fox" />
         <com.fox2code.mmm.settings.LongClickablePreference
             app:icon="@drawable/ic_baseline_monetization_on_24"
             app:key="pref_donate_androidacy"
             app:singleLineTitle="false"
             app:summary="@string/donate_androidacy_sum"
             app:title="@string/donate_androidacy" />
+        <com.fox2code.mmm.settings.LongClickablePreference
+            app:icon="@drawable/ic_baseline_monetization_on_24"
+            app:key="pref_donate_fox"
+            app:singleLineTitle="false"
+            app:title="@string/donate_fox" />
         <com.fox2code.mmm.settings.LongClickablePreference
             app:icon="@drawable/ic_baseline_bug_report_24"
             app:key="pref_report_bug"

build.gradle.kts

@@ -13,7 +13,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.3.0-alpha03")
+        classpath("com.android.tools.build:gradle:8.1.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
         classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.8.3")
 

gradle.properties

@@ -16,7 +16,7 @@ android.enableJetifier=false
 android.enableR8.fullMode=true
 android.useAndroidX=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false # temporarily disabled due to https://github.com/getsentry/sentry-android-gradle-plugin/issues/554
 org.gradle.configuration-cache.problems=warn
 org.gradle.jvmargs=-Xmx1536M -Dorg.gradle.android.cache-fix.ignoreVersionCheck\=true -Dkotlin.daemon.jvm.options\="-Xmx1536M" -Dfile.encoding\=UTF-8 -XX\:+UseParallelGC -XX\:ReservedCodeCacheSize\=768m
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Mon Jul 03 11:59:05 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -21,10 +21,12 @@ gradleEnterprise {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        mavenCentral()
         google()
-        // enable jitpack
-        maven { setUrl("https://jitpack.io") }
+        mavenCentral()
+        maven {
+            setUrl("https://jitpack.io")
+        }
+        gradlePluginPortal()
     }
 }