From d2f226d442b38763e245a1b6fc1662c825143169 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <imranr98@pm.me>
Date: Sat, 12 Nov 2022 10:44:59 -0500
Subject: [PATCH] Slight refactoring

---
 lib/main.dart                        | 2 +-
 lib/providers/apps_provider.dart     | 5 ++---
 lib/providers/settings_provider.dart | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 4838d8d..ad169fb 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -134,7 +134,7 @@ class _ObtainiumState extends State<Obtainium> {
         Permission.notification.request();
         appsProvider.saveApps([
           App(
-              'dev.imranr.obtainium',
+              obtainiumId,
               'https://github.com/ImranR98/Obtainium',
               'ImranR98',
               'Obtainium',
diff --git a/lib/providers/apps_provider.dart b/lib/providers/apps_provider.dart
index b07a643..fea48e6 100644
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -15,6 +15,7 @@ import 'package:installed_apps/installed_apps.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:package_archive_info/package_archive_info.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
@@ -310,12 +311,10 @@ class AppsProvider with ChangeNotifier {
 
     // If Obtainium is being installed, it should be the last one
     List<DownloadedApk> moveObtainiumToStart(List<DownloadedApk> items) {
-      String obtainiumIdA = 'imranr98_obtainium_${GitHub().host}';
-      String obtainiumIdB = 'dev.imranr.obtainium';
       DownloadedApk? temp;
       items.removeWhere((element) {
         bool res =
-            element.appId == obtainiumIdA || element.appId == obtainiumIdB;
+            element.appId == obtainiumId || element.appId == obtainiumTempId;
         if (res) {
           temp = element;
         }
diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart
index acf373d..ba30e69 100644
--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@@ -2,9 +2,13 @@
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+String obtainiumTempId = 'imranr98_obtainium_${GitHub().host}';
+String obtainiumId = 'dev.imranr.obtainium';
+
 enum ThemeSettings { system, light, dark }
 
 enum ColourSettings { basic, materialYou }