diff --git a/app/build.gradle b/app/build.gradle index 68f310c..0534cf7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "ru.svolf.pcompiler" minSdk 21 targetSdk 33 - versionCode 25 - versionName "2.5.0" + versionCode 26 + versionName "2.5.1" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resConfigs "en", "ar", "bn", "fa", "hi", "in", "it", "pt", "ru", "si", "tr", "vi" @@ -65,7 +65,6 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.preference:preference:1.2.0' testImplementation 'junit:junit:4.13.2' - implementation 'com.faendir:acra:4.10.0' implementation 'io.reactivex.rxjava2:rxjava:2.2.17' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'com.squareup.okhttp3:okhttp:4.3.1' diff --git a/app/release/app-release.apk b/app/release/app-release.apk deleted file mode 100644 index fd26d35..0000000 Binary files a/app/release/app-release.apk and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 4111b45..9213f7b 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 25, - "versionName": "2.5.0", + "versionCode": 26, + "versionName": "2.5.1", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/ru/svolf/pcompiler/App.java b/app/src/main/java/ru/svolf/pcompiler/App.java index f47861c..a0901cf 100644 --- a/app/src/main/java/ru/svolf/pcompiler/App.java +++ b/app/src/main/java/ru/svolf/pcompiler/App.java @@ -18,17 +18,10 @@ import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatDelegate; -import androidx.appcompat.content.res.AppCompatResources; import androidx.core.app.ActivityCompat; import androidx.preference.PreferenceManager; import com.google.android.material.color.DynamicColors; -import com.google.android.material.resources.MaterialResources; - -import org.acra.ACRA; -import org.acra.ReportField; -import org.acra.ReportingInteractionMode; -import org.acra.annotation.ReportsCrashes; import java.lang.reflect.Field; import java.util.ArrayList; @@ -41,31 +34,12 @@ import ru.svolf.girl.reactive.SimpleObservable; import ru.svolf.pcompiler.util.Constants; import ru.svolf.pcompiler.util.RuntimeUtil; -import ru.svolf.pcompiler.util.StringWrapper; /** * Created by Snow Volf on 17.08.2017, 15:24 */ -@ReportsCrashes( - mailTo = "svolf15@yandex.ru", - mode = ReportingInteractionMode.NOTIFICATION, - resDialogTitle = R.string.error_crashed, - resDialogText = R.string.error_occurred, - resNotifTitle = R.string.app_name, - resDialogIcon = R.mipmap.ic_launcher, - resNotifText = R.string.error_occurred, - resNotifTickerText = R.string.error_crashed, - customReportContent = { - ReportField.APP_VERSION_CODE, - ReportField.APP_VERSION_NAME, - ReportField.ANDROID_VERSION, - ReportField.BRAND, - ReportField.PHONE_MODEL, - ReportField.STACK_TRACE, - ReportField.LOGCAT - } -) + public class App extends Application { private static App INSTANCE = null; private SharedPreferences preferences; @@ -100,9 +74,6 @@ public void onCreate() { Log.d(Constants.INSTANCE.getTAG(), String.format("RxJavaPlugins errorHandler %s", throwable)); throwable.printStackTrace(); }); - if (StringWrapper.b("8zuv+ap22YnX6ohcFCYktA")) { - ACRA.init(this); - } PreferenceManager.setDefaultValues(this, R.xml.settings, false); AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); // Support android 12 Monet Engine diff --git a/app/src/main/java/ru/svolf/pcompiler/ui/activity/SettingsActivity.java b/app/src/main/java/ru/svolf/pcompiler/ui/activity/SettingsActivity.java index 279b9b5..1b7cf53 100644 --- a/app/src/main/java/ru/svolf/pcompiler/ui/activity/SettingsActivity.java +++ b/app/src/main/java/ru/svolf/pcompiler/ui/activity/SettingsActivity.java @@ -1,7 +1,6 @@ package ru.svolf.pcompiler.ui.activity; import android.app.AlertDialog; -import android.os.Build; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; @@ -9,8 +8,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; -import org.acra.ACRA; - import ru.svolf.pcompiler.App; import ru.svolf.pcompiler.R; import ru.svolf.pcompiler.ui.fragment.settings.SettingsFragment; @@ -53,7 +50,7 @@ private void debugMenu() { try { throw new RuntimeException("DevException"); } catch (RuntimeException ex){ - ACRA.getErrorReporter().handleException(ex); + ex.printStackTrace(); } break; } diff --git a/app/src/main/java/ru/svolf/pcompiler/ui/activity/TabbedActivity.kt b/app/src/main/java/ru/svolf/pcompiler/ui/activity/TabbedActivity.kt index f239d08..7a16ae1 100644 --- a/app/src/main/java/ru/svolf/pcompiler/ui/activity/TabbedActivity.kt +++ b/app/src/main/java/ru/svolf/pcompiler/ui/activity/TabbedActivity.kt @@ -31,7 +31,6 @@ import net.lingala.zip4j.exception.ZipException import net.lingala.zip4j.model.ZipParameters import net.lingala.zip4j.model.enums.CompressionLevel import net.lingala.zip4j.model.enums.CompressionMethod -import org.acra.ACRA import ru.svolf.girl.ui.CodeText import ru.svolf.girl.ui.GirlToolbar import ru.svolf.pcompiler.App @@ -350,7 +349,6 @@ class TabbedActivity : BaseActivity(), TabManager.TabListener { zipFile.addFiles(extra, parameters) zipFile.addFiles(extraDex, parameters) } catch (e: Exception) { - ACRA.getErrorReporter().handleException(e) Toast.makeText(this, e.message, Toast.LENGTH_LONG).show() } } @@ -358,7 +356,6 @@ class TabbedActivity : BaseActivity(), TabManager.TabListener { Toast.makeText(this, String.format(getString(R.string.message_saved_in_path_zip), zipFile.file.absolutePath), Toast.LENGTH_LONG).show() } catch (e: ZipException) { Log.e(TAG, e.message!!) - ACRA.getErrorReporter().handleException(e) } }