Added support for different versionCodes for different ABIs for the s…

…ame versionName
redsolver · May 4, 2021 · d4cef7d · d4cef7d
1 parent 7a1e1be
commit d4cef7d
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 15 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -97,7 +97,10 @@ Future<void> main() async {
   // if (Platform.isAndroid) {
   final deviceInfo = DeviceInfoPlugin();
 
-  unawaited(deviceInfo.androidInfo.then((value) => androidInfo = value));
+  /* unawaited( */
+
+  androidInfo = await deviceInfo.androidInfo;
+
   // }
 
   runApp(
@@ -636,7 +639,8 @@ class _MyHomePageState extends State<MyHomePage> {
       }
 
       if (localVersionCodes.containsKey(a.packageName)) {
-        if (a.currentVersionCode > localVersionCodes.get(a.packageName)) {
+        if (a.currentVersionCodeForDeviceArchitecture >
+            localVersionCodes.get(a.packageName)) {
           updateKeys.add(key);
           continue;
         } else {
@@ -1203,7 +1207,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
                                                                   if (snap.data
                                                                           .versionCode <
-                                                                      app.currentVersionCode) {
+                                                                      app.currentVersionCodeForDeviceArchitecture) {
                                                                     return Container(
                                                                       color: Colors
                                                                           .orange,
@@ -1585,6 +1589,7 @@ class _MyHomePageState extends State<MyHomePage> {
               },
             ),
       bottomNavigationBar: BottomNavigationBar(
+        type: BottomNavigationBarType.fixed,
         currentIndex: currentPage,
         selectedItemColor: Theme.of(context).accentColor,
         onTap: (index) {
@@ -1648,7 +1653,7 @@ class _MyHomePageState extends State<MyHomePage> {
       await task.init();
 
       if ((task?.installedApplication?.versionCode ?? 0) >=
-          app.currentVersionCode) {
+          app.currentVersionCodeForDeviceArchitecture) {
         print('skip $name');
         task.dispose();
         continue;

diff --git a/lib/model/app.dart b/lib/model/app.dart
@@ -137,6 +137,19 @@ class App {
   @HiveField(13)
   int currentVersionCode;
 
+  Build getCurrentBuild() {
+    return builds.firstWhere(
+      (element) => /* element.versionName == currentVersionName ||  */
+          element.versionCode == currentVersionCode,
+      orElse: () => null,
+    );
+  }
+
+  int get currentVersionCodeForDeviceArchitecture {
+    final currentBuild = getCurrentBuild();
+    return currentBuild.versionCodeForDeviceArchitecture ?? currentVersionCode;
+  }
+
   @HiveField(14)
   int added;
   @HiveField(15)
@@ -188,6 +201,20 @@ class Build {
   @HiveField(11)
   Map<String, ABISpecificBuild> abis;
 
+  int get versionCodeForDeviceArchitecture {
+    if (abis != null) {
+      for (final abi in androidInfo.supportedAbis) {
+        if (abis.containsKey(abi)) {
+          final vCode = abis[abi].versionCode;
+          if (vCode != null) {
+            return vCode;
+          }
+        }
+      }
+    }
+    return versionCode;
+  }
+
   // TODO Show some more of this info on the app page
 
   @HiveField(5)
@@ -224,6 +251,11 @@ class ABISpecificBuild {
   @HiveField(2)
   String sha256;
 
+  @HiveField(3)
+  String versionName;
+  @HiveField(4)
+  int versionCode;
+
   ABISpecificBuild();
 
   factory ABISpecificBuild.fromJson(Map<dynamic, dynamic> json) =>

diff --git a/lib/model/app.g.dart b/lib/model/app.g.dart
diff --git a/lib/page/widget/install.dart b/lib/page/widget/install.dart
@@ -183,7 +183,7 @@ class _InstallWidgetState extends State<InstallWidget>
                             width: 8,
                           ),
                           task.installedApplication.versionCode >=
-                                  app.currentVersionCode
+                                  app.currentVersionCodeForDeviceArchitecture
                               ? Expanded(
                                   child: RaisedButton(
                                     color: Theme.of(context).accentColor,

diff --git a/lib/util/install_task.dart b/lib/util/install_task.dart
@@ -61,10 +61,7 @@ class InstallTask {
   }
 
   Future<void> init() async {
-    currentBuild = app.builds.firstWhere(
-      (element) => element.versionCode == app.currentVersionCode,
-      orElse: () => null,
-    );
+    currentBuild = app.getCurrentBuild();
 
     final deviceInfo = DeviceInfoPlugin();
     final androidInfo = await deviceInfo.androidInfo;
@@ -305,7 +302,7 @@ class InstallTask {
   Future<void> install(/* File apk, int versionCode */) async {
     if (downloadedApk == null) throw 'APK not downloaded';
 
-    final versionCode = currentBuild.versionCode;
+    final versionCode = currentBuild.versionCodeForDeviceArchitecture;
 
     if (isShizukuEnabled) {
       void showShizukuErrorDialog(Widget content, String text) {
@@ -359,7 +356,6 @@ class InstallTask {
 /*       setState(() {
         progress = 1;
         state = InstallState.none;
-        expectedVersionCode = versionCode;
       }); */
 
       final result = await platform.invokeMethod(