From dde3fc20fbb49ba4cca01baa8dec26e3798e2bfa Mon Sep 17 00:00:00 2001
From: Imran Remtulla <imranr98@pm.me>
Date: Fri, 7 Oct 2022 19:06:02 -0400
Subject: [PATCH] Back to old install plugin (dealbreaker in new one)

---
 lib/providers/apps_provider.dart | 16 ++++++++++------
 pubspec.lock                     |  7 +++++++
 pubspec.yaml                     |  1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart
index 01e6f04..f371423 100644
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -8,6 +8,7 @@ import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:install_plugin_v2/install_plugin_v2.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
 import 'package:provider/provider.dart';
@@ -15,7 +16,6 @@ import 'package:path_provider/path_provider.dart';
 import 'package:flutter_fgbg/flutter_fgbg.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:http/http.dart';
-import 'package:flutter_install_app/flutter_install_app.dart';
 
 class AppInMemory {
   late App app;
@@ -128,7 +128,7 @@ class AppsProvider with ChangeNotifier {
   // If appropriate criteria are met, the update (never a fresh install) happens silently  in the background
   // But even then, we don't know if it actually succeeded
   Future<void> installApk(ApkFile file) async {
-    await AppInstaller.installApk(file.file.path, actionRequired: false);
+    await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
     apps[file.appId]!.app.installedVersion =
         apps[file.appId]!.app.latestVersion;
     await saveApps([apps[file.appId]!.app]);
@@ -215,17 +215,21 @@ class AppsProvider with ChangeNotifier {
       return items;
     }
 
+    // TODO: Remove below line if silentupdates are ever figured out
+    regularInstalls.addAll(silentUpdates);
+
     silentUpdates = moveObtainiumToEnd(silentUpdates);
     regularInstalls = moveObtainiumToEnd(regularInstalls);
 
-    for (var u in silentUpdates) {
-      await installApk(u);
-    }
+    // TODO: Uncomment below if silentupdates are ever figured out
+    // for (var u in silentUpdates) {
+    //   await installApk(u, silent: true); // Would need to add silent option
+    // }
 
     if (context != null) {
       if (regularInstalls.isNotEmpty) {
         // ignore: use_build_context_synchronously
-        await askUserToReturnToForeground(context);
+        await askUserToReturnToForeground(context, waitForFG: true);
       }
       for (var i in regularInstalls) {
         await installApk(i);
diff --git a/pubspec.lock b/pubspec.lock
index 0678420..1a9194c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -282,6 +282,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.0"
+  install_plugin_v2:
+    dependency: "direct main"
+    description:
+      name: install_plugin_v2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   js:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index cbf995f..fa487cf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -52,6 +52,7 @@ dependencies:
   device_info_plus: ^4.1.2
   file_picker: ^5.1.0
   animations: ^2.0.4
+  install_plugin_v2: ^1.0.0
   flutter_install_app: ^1.3.0
   share_plus: ^4.4.0