diff --git a/app/build.gradle b/app/build.gradle index cbfe894..d26e73b 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.nin0dev.vendroid" minSdk 25 targetSdk 34 - versionCode 12 - versionName "1.9" + versionCode 13 + versionName "1.10" } buildTypes { @@ -40,6 +40,5 @@ dependencies { implementation 'com.google.code.gson:gson:2.12.1' implementation 'com.android.volley:volley:1.2.1' implementation 'androidx.constraintlayout:constraintlayout:2.2.0' - implementation 'com.google.firebase:firebase-common-ktx:21.0.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 41c6661..63e8f54 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,17 +12,12 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" - android:usesCleartextTraffic="true" tools:targetApi="34"> - = 300) { throw HttpException(conn) diff --git a/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt b/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt index 95d0e8c..e51b471 100755 --- a/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt +++ b/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt @@ -27,7 +27,14 @@ class VencordNative(private val activity: MainActivity, private val wv: WebView) fun updateVencord() { val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE) val vendroidFile = File(activity.filesDir, "vencord.js") - val conn = HttpClient.fetch(sPrefs.getString("vencordLocation", if(sPrefs.getBoolean("equicord", false)) Constants.EQUICORD_BUNDLE_URL else Constants.JS_BUNDLE_URL)!!) + val conn = HttpClient.fetch( + sPrefs.getString( + "vencordLocation", + if ( + sPrefs.getString("clientMod", "vencord") == "equicord" + ) Constants.EQUICORD_BUNDLE_URL else Constants.JS_BUNDLE_URL + ) + ) vendroidFile.writeText(HttpClient.readAsText(conn.inputStream)) activity.showDiscordToast("Updated Vencord, restart to apply changes!", "SUCCESS") } diff --git a/build.gradle b/build.gradle index 281c968..e3350ac 100755 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.8.1' apply false - id 'com.android.library' version '8.8.1' apply false + id 'com.android.application' version '8.12.2' apply false + id 'com.android.library' version '8.12.2' apply false id 'org.jetbrains.kotlin.android' version '1.9.25' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..37f853b 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME