diff --git a/app/build.gradle b/app/build.gradle index 4f25bb4bc..185c6eb1c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId "com.aurora.store" minSdkVersion 21 targetSdkVersion 29 - versionCode 25 - versionName "3.2.5" + versionCode 26 + versionName "3.2.6" resConfigs "ar-rSA", "b+ast", "bh-rIN", "bg-rBG", "ca-rES", "de-rDE", "es-rES", "el-rGR", "fr-rFR", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "in-rID", "it-rIT", "iw-rIL", "ja-rJP", "ko-rKR", "lt-rLT", "pl-rPL", "pt-rPT", "pt-rBR", "ro-rRO", "ru-rRU", "sc-rIT", "sk-rSK", "sr-rSR", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW", "nl-rNL", "be-rBY", "nb-rNO", "pa-rIN", @@ -79,7 +79,8 @@ buildscript { fastAdapter: "5.0.0", okhttp3 : "4.3.1", glide : "4.11.0", - workmanager : "2.3.4" + workmanager: "2.3.4", + navigation : "2.2.2" ] } } @@ -99,8 +100,8 @@ dependencies { //JetPack Components implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" - implementation "androidx.navigation:navigation-fragment:2.2.1" - implementation "androidx.navigation:navigation-ui:2.2.1" + implementation "androidx.navigation:navigation-fragment:${versions.navigation}" + implementation "androidx.navigation:navigation-ui:${versions.navigation}" implementation "androidx.work:work-runtime:${versions.workmanager}" implementation "androidx.work:work-rxjava2:${versions.workmanager}" @@ -120,8 +121,8 @@ dependencies { implementation "com.google.code.gson:gson:2.8.6" //Lombok - compileOnly "org.projectlombok:lombok:1.18.10" - annotationProcessor "org.projectlombok:lombok:1.18.10" + compileOnly "org.projectlombok:lombok:1.18.12" + annotationProcessor "org.projectlombok:lombok:1.18.12" //PlayStoreApi implementation "com.github.whyorean:playstore-api-v2:2.5" diff --git a/app/src/main/java/com/aurora/store/AuroraApplication.java b/app/src/main/java/com/aurora/store/AuroraApplication.java index 8b1936964..f54a1dc1f 100644 --- a/app/src/main/java/com/aurora/store/AuroraApplication.java +++ b/app/src/main/java/com/aurora/store/AuroraApplication.java @@ -140,8 +140,8 @@ public class AuroraApplication extends Application { public void onCreate() { super.onCreate(); - //Clear preferences for app version below 3.2.5 - if (BuildConfig.VERSION_CODE < 24) { + //Clear preferences for app version below 3.2.6 + if (BuildConfig.VERSION_CODE < 26) { SharedPreferences preferences = Util.getPrefs(this); preferences.edit().clear().apply(); } diff --git a/app/src/main/java/com/aurora/store/Constants.java b/app/src/main/java/com/aurora/store/Constants.java index bb425d5b4..966bff80a 100644 --- a/app/src/main/java/com/aurora/store/Constants.java +++ b/app/src/main/java/com/aurora/store/Constants.java @@ -21,7 +21,7 @@ package com.aurora.store; public class Constants { - public static final String SHARED_PREFERENCES_KEY = "com.aurora.store"; + public static final String SHARED_PREFERENCES_KEY = "com.aurora.store.26"; public static final String SERVICE_PACKAGE = "com.aurora.services"; public static final String APP_DETAIL_URL = "https://play.google.com/store/apps/details?id="; public static final String APP_ICON_URL = "https://gitlab.com/AuroraOSS/AuroraStore/raw/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png"; diff --git a/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java b/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java index aa650a5b3..648732b59 100644 --- a/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java +++ b/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java @@ -1,6 +1,7 @@ package com.aurora.store.report; import android.content.Intent; +import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.view.MenuItem; @@ -13,6 +14,7 @@ import androidx.appcompat.widget.Toolbar; import com.aurora.store.BuildConfig; import com.aurora.store.R; import com.aurora.store.ui.single.activity.BaseActivity; +import com.aurora.store.util.Util; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -118,6 +120,8 @@ public class AcraErrorActivity extends BaseActivity { @OnClick(R.id.btn_negative) public void setBtnNegative() { - finishAfterTransition(); + SharedPreferences preferences = Util.getPrefs(this); + preferences.edit().clear().apply(); + Util.restartApp(this); } } diff --git a/app/src/main/java/com/aurora/store/util/ApiBuilderUtil.java b/app/src/main/java/com/aurora/store/util/ApiBuilderUtil.java index 1b4d3bf5a..0928b73ee 100644 --- a/app/src/main/java/com/aurora/store/util/ApiBuilderUtil.java +++ b/app/src/main/java/com/aurora/store/util/ApiBuilderUtil.java @@ -67,8 +67,6 @@ public class ApiBuilderUtil { GooglePlayAPI api = builder.build(); loginInfo.setEmail(builder.getEmail()); - Log.e(loginInfo.toString()); - if (api != null) { loginInfo.setGsfId(api.getGsfId()); loginInfo.setAuthToken(api.getToken()); diff --git a/app/src/main/res/layout/activity_bug.xml b/app/src/main/res/layout/activity_bug.xml index af42a8667..8904c701f 100644 --- a/app/src/main/res/layout/activity_bug.xml +++ b/app/src/main/res/layout/activity_bug.xml @@ -50,6 +50,13 @@ android:layout_marginTop="@dimen/margin_xxsmall" android:text="@string/crash_line2" android:textAppearance="@style/TextAppearance.Aurora.Line2" /> + + "Cancel" "Clear" "Clear all" + "Clear data" "Link copied to clipboard" "Copy Link" "Disable" @@ -343,6 +344,7 @@ "Aurora Crash Report" "Well that's embarrassing !" "You can send this report to Aurora Dev, to help resolve the issue." + "Optionally, you may try clearing app data and retry launching the app." "Ignore this version" "Remove from ignore list" "Disabled" diff --git a/app/src/main/res/values/strings_changelog.xml b/app/src/main/res/values/strings_changelog.xml index d28107c10..30bbb5f38 100644 --- a/app/src/main/res/values/strings_changelog.xml +++ b/app/src/main/res/values/strings_changelog.xml @@ -20,6 +20,9 @@ + \n + \n Changelog : v3.2.6 + \n • Bug Fixes and Improvements \n \n Changelog : v3.2.5 \n • Fixed auto install issues for bulk updates