diff --git a/app/build.gradle b/app/build.gradle
index 8e521fd..48ec754 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,6 @@ apply plugin: "realm-android"
android {
namespace "com.fox2code.mmm"
compileSdk 33
- buildToolsVersion '33.0.0'
signingConfigs {
release {
// Everything comes from local.properties
@@ -81,6 +80,7 @@ android {
}
}
+ //noinspection GrDeprecatedAPIUsage
flavorDimensions "type"
productFlavors {
"default" {
@@ -175,6 +175,7 @@ android {
properties.setProperty('client_id', '"dQ1p7X8bF14PVJ7wAU6ORVjPB2IeTinsuAZ8Uos6tQiyUdUyIjSyZSmN54QBbaTy"')
}
buildConfigField("String", "ANDROIDACY_CLIENT_ID", properties.getProperty('client_id'))
+ versionNameSuffix '-froid'
}
}
@@ -237,12 +238,12 @@ sentry {
// Does auto instrumentation for specified features through bytecode manipulation.
// Default is enabled.
tracingInstrumentation {
- enabled = true
+ enabled = hasSentryConfig
}
// Enable auto-installation of Sentry components (sentry-android SDK and okhttp, timber and fragment integrations).
autoInstallation {
- sentryVersion = '6.11.0'
+ sentryVersion = '6.12.1'
}
// temp fix for gradle bug
@@ -284,7 +285,7 @@ dependencies {
implementation 'com.github.topjohnwu.libsu:io:5.0.1'
implementation 'com.github.Fox2Code:RosettaX:1.0.9'
implementation 'com.github.Fox2Code:AndroidANSI:1.0.1'
- implementation 'io.sentry:sentry-android:6.11.0'
+ implementation 'io.sentry:sentry-android:6.12.1'
// Markdown
implementation "io.noties.markwon:core:4.6.2"
@@ -296,6 +297,8 @@ dependencies {
// Icons
// implementation "com.mikepenz:iconics-core:3.2.5"
//implementation "androidx.appcompat:appcompat:${versions.appCompat}"
+
+ implementation 'androidx.core:core-ktx:1.9.0'
}
if (hasSentryConfig) {
@@ -303,7 +306,7 @@ if (hasSentryConfig) {
try (FileInputStream fis = new FileInputStream(sentryConfigFile)) {
properties.load(fis)
}
- tasks.withType(Exec) {
+ tasks.withType(Exec).configureEach {
environment "SENTRY_PROJECT", properties.getProperty("defaults.project")
environment "SENTRY_ORG", properties.getProperty("defaults.org")
environment "SENTRY_URL", properties.getProperty("defaults.url")
@@ -314,8 +317,8 @@ if (hasSentryConfig) {
android {
ndkVersion '25.1.8937393'
dependenciesInfo {
- includeInApk false
- includeInBundle false
+ includeInApk true
+ includeInBundle true
}
buildFeatures {
viewBinding true
@@ -324,6 +327,8 @@ android {
kotlinOptions {
jvmTarget=JavaVersion.VERSION_11
}
+ //noinspection GrDeprecatedAPIUsage
+ buildToolsVersion '33.0.1'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c284f18..b1f21ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,12 +38,15 @@
tools:ignore="ManifestResource"
tools:replace="android:supportsRtl"
tools:targetApi="s">
+
+ android:label="@string/title_activity_setup"
+ android:theme="@style/Theme.MagiskModuleManager.NoActionBar" />
@@ -65,8 +68,8 @@
@@ -77,8 +80,8 @@
@@ -108,14 +111,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ec36a1..d47e654 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -298,4 +298,6 @@
Could not save logs
Share FoxMMM logs
This app is an unofficial FoxMMM build.
+ Oops! We ran into a problem.
+ Exception: %sGive us more details about what you were doing when this happened.Submit feedback
diff --git a/build.gradle b/build.gradle
index 6771cf9..cf9df6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,15 +16,15 @@ buildscript {
project.ext.kotlin_version = "1.8.0"
dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${latestAboutLibsRelease}"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.realm:realm-gradle-plugin:10.11.1"
}
}
-task clean(type: Delete) {
+tasks.register('clean') {
delete rootProject.buildDir
}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index dec073f..5e3f284 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:Reserv
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
-# android.enableJetifier=true
+android.enableJetifier=true
# Fox builds props mods
org.gradle.parallel=true