Merge pull request #2455 from ImranR98/dev

Fix "Bad state" bug on mark as updated/installed (#2453)

.gitignore

@@ -11,7 +11,8 @@
 .svn/
 .swiftpm/
 migrate_working_dir/
-.vscode/
+.vscode/*
+!.vscode/launch.json
 
 # IntelliJ related
 *.iml

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Obtainium",
+            "request": "launch",
+            "type": "dart",
+            "args":[ "--flavor", "normal" ]
+        },
+        {
+            "name": "Obtainium (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile",
+            "args":[ "--flavor", "normal" ]
+        },
+        {
+            "name": "Obtainium (release mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release",
+            "args":[ "--flavor", "normal" ]
+        }
+    ]
+}

lib/app_sources/rustore.dart

@@ -36,13 +36,15 @@ class RuStore extends AppSource {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
-  Future<String> decodeString(String str) async {
+  Future<dynamic> decodeJsonBody(Uint8List bytes) async {
     try {
-      return (await CharsetDetector.autoDecode(
-        Uint8List.fromList(str.codeUnits),
-      )).string;
+      return jsonDecode((await CharsetDetector.autoDecode(bytes)).string);
     } catch (e) {
-      return str;
+      try {
+        return jsonDecode(utf8.decode(bytes));
+      } catch (_) {
+        rethrow;
+      }
     }
   }
 
@@ -59,7 +61,7 @@ class RuStore extends AppSource {
     if (res0.statusCode != 200) {
       throw getObtainiumHttpError(res0);
     }
-    var appDetails = jsonDecode(res0.body)['body'];
+    var appDetails = (await decodeJsonBody(res0.bodyBytes))['body'];
     if (appDetails['appId'] == null) {
       throw NoReleasesError();
     }
@@ -83,15 +85,11 @@ class RuStore extends AppSource {
       followRedirects: false,
       postBody: {"appId": appDetails['appId'], "firstInstall": true},
     );
-    var downloadDetails = jsonDecode(res1.body)['body'];
+    var downloadDetails = (await decodeJsonBody(res1.bodyBytes))['body'];
     if (res1.statusCode != 200 || downloadDetails['apkUrl'] == null) {
       throw NoAPKError();
     }
 
-    appName = await decodeString(appName);
-    author = await decodeString(author);
-    changeLog = changeLog != null ? await decodeString(changeLog) : null;
-
     return APKDetails(
       version,
       getApkUrlsFromUrls([

lib/providers/apps_provider.dart

@@ -1084,7 +1084,8 @@ class AppsProvider with ChangeNotifier {
       var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
       var refreshBeforeDownload =
           apps[id]!.app.additionalSettings['refreshBeforeDownload'] == true ||
-          apps[id]!.app.apkUrls.first.value == 'placeholder';
+          apps[id]!.app.apkUrls.isNotEmpty &&
+              apps[id]!.app.apkUrls.first.value == 'placeholder';
       if (refreshBeforeDownload) {
         await checkUpdate(apps[id]!.app.id);
       }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.2.2+2318
+version: 1.2.3+2319
 
 environment:
   sdk: ^3.8.1