From 0d716513d72c07be77a3196465ea902ae8ea9f68 Mon Sep 17 00:00:00 2001
From: aAbed <39409020+TheAabedKhan@users.noreply.github.com>
Date: Thu, 3 Aug 2023 07:21:39 +0545
Subject: [PATCH 1/3] fix: keystore password dialog showing up before importing
 (#1068)

---
 lib/ui/widgets/settingsView/settings_export_section.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/ui/widgets/settingsView/settings_export_section.dart b/lib/ui/widgets/settingsView/settings_export_section.dart
index 73d0f974..e4881a09 100644
--- a/lib/ui/widgets/settingsView/settings_export_section.dart
+++ b/lib/ui/widgets/settingsView/settings_export_section.dart
@@ -73,10 +73,12 @@ class SExportSection extends StatelessWidget {
             ),
           ),
           subtitle: I18nText('settingsView.importKeystoreHint'),
-          onTap: () {
-            _settingsViewModel.importKeystore();
+          onTap: () async{
+            await _settingsViewModel.importKeystore();
             final sManageKeystorePassword = SManageKeystorePassword();
-            sManageKeystorePassword.showKeystoreDialog(context);
+            if(context.mounted){
+              sManageKeystorePassword.showKeystoreDialog(context);
+            }
           },
         ),
         ListTile(

From 8c79f5e371204d444b82473b8a7f338b531afcd0 Mon Sep 17 00:00:00 2001
From: Ushie <ushiekane@gmail.com>
Date: Thu, 3 Aug 2023 05:23:16 +0300
Subject: [PATCH 2/3] build: bump patcher to v12.1.0

---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7854cd64..4a17f4f2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:12.0.0"
+    implementation "app.revanced:revanced-patcher:12.1.0"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

From 9cfa274d81f98ebbfd4018bacffd7bc68104b09a Mon Sep 17 00:00:00 2001
From: Ushie <ushiekane@gmail.com>
Date: Thu, 3 Aug 2023 05:23:47 +0300
Subject: [PATCH 3/3] build: bump version to v1.5.1

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index ff85109c..c2453aa3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.5.0+100400004
+version: 1.5.1+100400005
 
 environment:
   sdk: '>=3.0.0 <4.0.0'