Compare commits
	
		
			75 Commits
		
	
	
		
			v0.3.1-bet
			...
			v0.6.11-be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					e158c23cca | ||
| 
						 | 
					208f125e12 | ||
| 
						 | 
					b7ccf3fa49 | ||
| 
						 | 
					c746e89052 | ||
| 
						 | 
					ee758e8470 | ||
| 
						 | 
					68d903e092 | ||
| 
						 | 
					c47b752344 | ||
| 
						 | 
					62a05996cf | ||
| 
						 | 
					1cda941fbe | ||
| 
						 | 
					49cb908d04 | ||
| 
						 | 
					139f44d31d | ||
| 
						 | 
					ed955ac6a2 | ||
| 
						 | 
					f3ead6caf1 | ||
| 
						 | 
					97ab723d04 | ||
| 
						 | 
					ed4a26d348 | ||
| 
						 | 
					bd5f21984e | ||
| 
						 | 
					5037d77b14 | ||
| 
						 | 
					c9711c7734 | ||
| 
						 | 
					76e98feeb7 | ||
| 
						 | 
					03da23f77a | ||
| 
						 | 
					9b99e2b302 | ||
| 
						 | 
					e746ca890a | ||
| 
						 | 
					9c00a7da14 | ||
| 
						 | 
					4df0dd64ad | ||
| 
						 | 
					7cf7ffe0de | ||
| 
						 | 
					b1953435af | ||
| 
						 | 
					fc7d7d11d6 | ||
| 
						 | 
					9ef26b3a4a | ||
| 
						 | 
					27ee6b9e88 | ||
| 
						 | 
					d1a3529036 | ||
| 
						 | 
					a954a627fd | ||
| 
						 | 
					52ce5b19c4 | ||
| 
						 | 
					03f0b6cf05 | ||
| 
						 | 
					5d8d0de8de | ||
| 
						 | 
					07f6d4ad2c | ||
| 
						 | 
					dfbb4e19a5 | ||
| 
						 | 
					f5fda2ca90 | ||
| 
						 | 
					661dc1626c | ||
| 
						 | 
					dde3fc20fb | ||
| 
						 | 
					017b867d8d | ||
| 
						 | 
					1cb1c124eb | ||
| 
						 | 
					fdeb852c7b | ||
| 
						 | 
					67f50ba776 | ||
| 
						 | 
					a0968caa5c | ||
| 
						 | 
					e3e945d13b | ||
| 
						 | 
					61f7f171b1 | ||
| 
						 | 
					de07583161 | ||
| 
						 | 
					49b9a65053 | ||
| 
						 | 
					aebc8aed76 | ||
| 
						 | 
					3958425c22 | ||
| 
						 | 
					0a560871cb | ||
| 
						 | 
					fbe4f0b49e | ||
| 
						 | 
					e2440a38c4 | ||
| 
						 | 
					496a10a444 | ||
| 
						 | 
					b8bb8d1f4b | ||
| 
						 | 
					af033f42cb | ||
| 
						 | 
					e706661062 | ||
| 
						 | 
					1a68b8abe6 | ||
| 
						 | 
					15c0ed04d1 | ||
| 
						 | 
					dd193d62f2 | ||
| 
						 | 
					77e1768f3b | ||
| 
						 | 
					da9e5aed5e | ||
| 
						 | 
					136628c9e6 | ||
| 
						 | 
					a916167be3 | ||
| 
						 | 
					420cf487d4 | ||
| 
						 | 
					12855370b0 | ||
| 
						 | 
					33fed1cb2f | ||
| 
						 | 
					33238b56a9 | ||
| 
						 | 
					428c208de4 | ||
| 
						 | 
					9a4b0301be | ||
| 
						 | 
					f58d26524c | ||
| 
						 | 
					45e5544c5b | ||
| 
						 | 
					0a9373e65a | ||
| 
						 | 
					b65c6e1d41 | ||
| 
						 | 
					22dd8253a9 | 
@@ -30,7 +30,25 @@
 | 
				
			|||||||
        <meta-data
 | 
					        <meta-data
 | 
				
			||||||
            android:name="flutterEmbedding"
 | 
					            android:name="flutterEmbedding"
 | 
				
			||||||
            android:value="2" />
 | 
					            android:value="2" />
 | 
				
			||||||
 | 
					        <service
 | 
				
			||||||
 | 
					            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
 | 
				
			||||||
 | 
					            android:permission="android.permission.BIND_JOB_SERVICE"
 | 
				
			||||||
 | 
					            android:exported="false"/>
 | 
				
			||||||
 | 
					        <receiver
 | 
				
			||||||
 | 
					            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
 | 
				
			||||||
 | 
					            android:exported="false"/>
 | 
				
			||||||
 | 
					        <receiver
 | 
				
			||||||
 | 
					            android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
 | 
				
			||||||
 | 
					            android:enabled="false"
 | 
				
			||||||
 | 
					            android:exported="false">
 | 
				
			||||||
 | 
					            <intent-filter>
 | 
				
			||||||
 | 
					                <action android:name="android.intent.action.BOOT_COMPLETED" />
 | 
				
			||||||
 | 
					            </intent-filter>
 | 
				
			||||||
 | 
					        </receiver>
 | 
				
			||||||
    </application>
 | 
					    </application>
 | 
				
			||||||
    <uses-permission android:name="android.permission.INTERNET" />
 | 
					    <uses-permission android:name="android.permission.INTERNET" />
 | 
				
			||||||
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 | 
					    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 | 
				
			||||||
 | 
					    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 | 
				
			||||||
 | 
					    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 | 
				
			||||||
 | 
					    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
 | 
				
			||||||
</manifest>
 | 
					</manifest>
 | 
				
			||||||
							
								
								
									
										5
									
								
								android/app/src/main/res/xml/file_paths.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="utf-8"?>
 | 
				
			||||||
 | 
					<paths>
 | 
				
			||||||
 | 
					    <external-path path="Android/data/dev.imranr.obtainium/" name="files_root" />
 | 
				
			||||||
 | 
					    <external-path path="." name="external_storage_root" />
 | 
				
			||||||
 | 
					</paths>
 | 
				
			||||||
| 
		 Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 228 KiB  | 
| 
		 Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 162 KiB  | 
| 
		 Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 170 KiB  | 
| 
		 Before Width: | Height: | Size: 263 KiB After Width: | Height: | Size: 146 KiB  | 
| 
		 Before Width: | Height: | Size: 200 KiB After Width: | Height: | Size: 188 KiB  | 
| 
		 Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 192 KiB  | 
@@ -1,6 +1,7 @@
 | 
				
			|||||||
import 'package:html/parser.dart';
 | 
					import 'package:html/parser.dart';
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class FDroid implements AppSource {
 | 
					class FDroid implements AppSource {
 | 
				
			||||||
@@ -9,38 +10,66 @@ class FDroid implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  String standardizeURL(String url) {
 | 
					  String standardizeURL(String url) {
 | 
				
			||||||
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/packages/[^/]+');
 | 
					    RegExp standardUrlRegExB =
 | 
				
			||||||
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
					        RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
 | 
				
			||||||
 | 
					    RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
 | 
				
			||||||
 | 
					    if (match != null) {
 | 
				
			||||||
 | 
					      url = 'https://$host/packages/${Uri.parse(url).pathSegments.last}';
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
 | 
				
			||||||
 | 
					    match = standardUrlRegExA.firstMatch(url.toLowerCase());
 | 
				
			||||||
    if (match == null) {
 | 
					    if (match == null) {
 | 
				
			||||||
      throw notValidURL(runtimeType.toString());
 | 
					      throw InvalidURLError(runtimeType.toString());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return url.substring(0, match.end);
 | 
					    return url.substring(0, match.end);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) => null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Future<APKDetails> getLatestAPKDetails(
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
      String standardUrl, List<String> additionalData) async {
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
    Response res = await get(Uri.parse(standardUrl));
 | 
					    Response res = await get(Uri.parse(standardUrl));
 | 
				
			||||||
    if (res.statusCode == 200) {
 | 
					    if (res.statusCode == 200) {
 | 
				
			||||||
      var latestReleaseDiv =
 | 
					      var releases = parse(res.body).querySelectorAll('.package-version');
 | 
				
			||||||
          parse(res.body).querySelector('#latest.package-version');
 | 
					      if (releases.isEmpty) {
 | 
				
			||||||
      var apkUrl = latestReleaseDiv
 | 
					        throw NoReleasesError();
 | 
				
			||||||
          ?.querySelector('.package-version-download a')
 | 
					 | 
				
			||||||
          ?.attributes['href'];
 | 
					 | 
				
			||||||
      if (apkUrl == null) {
 | 
					 | 
				
			||||||
        throw noAPKFound;
 | 
					 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      var version = latestReleaseDiv
 | 
					      String? latestVersion = releases[0]
 | 
				
			||||||
          ?.querySelector('.package-version-header b')
 | 
					          .querySelector('.package-version-header b')
 | 
				
			||||||
          ?.innerHtml
 | 
					          ?.innerHtml
 | 
				
			||||||
          .split(' ')
 | 
					          .split(' ')
 | 
				
			||||||
          .last;
 | 
					          .sublist(1)
 | 
				
			||||||
      if (version == null) {
 | 
					          .join(' ');
 | 
				
			||||||
        throw couldNotFindLatestVersion;
 | 
					      if (latestVersion == null) {
 | 
				
			||||||
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return APKDetails(version, [apkUrl]);
 | 
					      List<String> apkUrls = releases
 | 
				
			||||||
 | 
					          .where((element) =>
 | 
				
			||||||
 | 
					              element
 | 
				
			||||||
 | 
					                  .querySelector('.package-version-header b')
 | 
				
			||||||
 | 
					                  ?.innerHtml
 | 
				
			||||||
 | 
					                  .split(' ')
 | 
				
			||||||
 | 
					                  .sublist(1)
 | 
				
			||||||
 | 
					                  .join(' ') ==
 | 
				
			||||||
 | 
					              latestVersion)
 | 
				
			||||||
 | 
					          .map((e) =>
 | 
				
			||||||
 | 
					              e
 | 
				
			||||||
 | 
					                  .querySelector('.package-version-download a')
 | 
				
			||||||
 | 
					                  ?.attributes['href'] ??
 | 
				
			||||||
 | 
					              '')
 | 
				
			||||||
 | 
					          .where((element) => element.isNotEmpty)
 | 
				
			||||||
 | 
					          .toList();
 | 
				
			||||||
 | 
					      if (apkUrls.isEmpty) {
 | 
				
			||||||
 | 
					        throw NoAPKError();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      return APKDetails(latestVersion, apkUrls);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      throw couldNotFindReleases;
 | 
					      throw NoReleasesError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -54,4 +83,7 @@ class FDroid implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<String> additionalDataDefaults = [];
 | 
					  List<String> additionalDataDefaults = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,11 @@
 | 
				
			|||||||
import 'dart:convert';
 | 
					import 'dart:convert';
 | 
				
			||||||
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					import 'package:url_launcher/url_launcher_string.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class GitHub implements AppSource {
 | 
					class GitHub implements AppSource {
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
@@ -12,23 +16,38 @@ class GitHub implements AppSource {
 | 
				
			|||||||
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
 | 
					    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
 | 
				
			||||||
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
					    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
				
			||||||
    if (match == null) {
 | 
					    if (match == null) {
 | 
				
			||||||
      throw notValidURL(runtimeType.toString());
 | 
					      throw InvalidURLError(runtimeType.toString());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return url.substring(0, match.end);
 | 
					    return url.substring(0, match.end);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  Future<String> getCredentialPrefixIfAny() async {
 | 
				
			||||||
 | 
					    SettingsProvider settingsProvider = SettingsProvider();
 | 
				
			||||||
 | 
					    await settingsProvider.initializeSettings();
 | 
				
			||||||
 | 
					    String? creds =
 | 
				
			||||||
 | 
					        settingsProvider.getSettingString(moreSourceSettingsFormItems[0].id);
 | 
				
			||||||
 | 
					    return creds != null && creds.isNotEmpty ? '$creds@' : '';
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) =>
 | 
				
			||||||
 | 
					      '$standardUrl/releases';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Future<APKDetails> getLatestAPKDetails(
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
      String standardUrl, List<String> additionalData) async {
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
    var includePrereleases =
 | 
					    var includePrereleases =
 | 
				
			||||||
        additionalData.isNotEmpty && additionalData[0] == "true";
 | 
					        additionalData.isNotEmpty && additionalData[0] == 'true';
 | 
				
			||||||
    var fallbackToOlderReleases =
 | 
					    var fallbackToOlderReleases =
 | 
				
			||||||
        additionalData.length >= 2 && additionalData[1] == "true";
 | 
					        additionalData.length >= 2 && additionalData[1] == 'true';
 | 
				
			||||||
    var regexFilter = additionalData.length >= 3 && additionalData[2].isNotEmpty
 | 
					    var regexFilter = additionalData.length >= 3 && additionalData[2].isNotEmpty
 | 
				
			||||||
        ? additionalData[2]
 | 
					        ? additionalData[2]
 | 
				
			||||||
        : null;
 | 
					        : null;
 | 
				
			||||||
    Response res = await get(Uri.parse(
 | 
					    Response res = await get(Uri.parse(
 | 
				
			||||||
        'https://api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
 | 
					        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
 | 
				
			||||||
    if (res.statusCode == 200) {
 | 
					    if (res.statusCode == 200) {
 | 
				
			||||||
      var releases = jsonDecode(res.body) as List<dynamic>;
 | 
					      var releases = jsonDecode(res.body) as List<dynamic>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -50,6 +69,7 @@ class GitHub implements AppSource {
 | 
				
			|||||||
        if (!includePrereleases && releases[i]['prerelease'] == true) {
 | 
					        if (!includePrereleases && releases[i]['prerelease'] == true) {
 | 
				
			||||||
          continue;
 | 
					          continue;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (regexFilter != null &&
 | 
					        if (regexFilter != null &&
 | 
				
			||||||
            !RegExp(regexFilter)
 | 
					            !RegExp(regexFilter)
 | 
				
			||||||
                .hasMatch((releases[i]['name'] as String).trim())) {
 | 
					                .hasMatch((releases[i]['name'] as String).trim())) {
 | 
				
			||||||
@@ -64,22 +84,25 @@ class GitHub implements AppSource {
 | 
				
			|||||||
        break;
 | 
					        break;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      if (targetRelease == null) {
 | 
					      if (targetRelease == null) {
 | 
				
			||||||
        throw couldNotFindReleases;
 | 
					        throw NoReleasesError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      if ((targetRelease['apkUrls'] as List<String>).isEmpty) {
 | 
					      if ((targetRelease['apkUrls'] as List<String>).isEmpty) {
 | 
				
			||||||
        throw noAPKFound;
 | 
					        throw NoAPKError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      String? version = targetRelease['tag_name'];
 | 
					      String? version = targetRelease['tag_name'];
 | 
				
			||||||
      if (version == null) {
 | 
					      if (version == null) {
 | 
				
			||||||
        throw couldNotFindLatestVersion;
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return APKDetails(version, targetRelease['apkUrls']);
 | 
					      return APKDetails(version, targetRelease['apkUrls']);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      if (res.headers['x-ratelimit-remaining'] == '0') {
 | 
					      if (res.headers['x-ratelimit-remaining'] == '0') {
 | 
				
			||||||
        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
 | 
					        throw RateLimitError(
 | 
				
			||||||
 | 
					            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
 | 
				
			||||||
 | 
					                    60000000)
 | 
				
			||||||
 | 
					                .round());
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      throw couldNotFindReleases;
 | 
					      throw NoReleasesError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -92,14 +115,14 @@ class GitHub implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<List<GeneratedFormItem>> additionalDataFormItems = [
 | 
					  List<List<GeneratedFormItem>> additionalDataFormItems = [
 | 
				
			||||||
    [GeneratedFormItem(label: "Include prereleases", type: FormItemType.bool)],
 | 
					    [GeneratedFormItem(label: 'Include prereleases', type: FormItemType.bool)],
 | 
				
			||||||
    [
 | 
					    [
 | 
				
			||||||
      GeneratedFormItem(
 | 
					      GeneratedFormItem(
 | 
				
			||||||
          label: "Fallback to older releases", type: FormItemType.bool)
 | 
					          label: 'Fallback to older releases', type: FormItemType.bool)
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    [
 | 
					    [
 | 
				
			||||||
      GeneratedFormItem(
 | 
					      GeneratedFormItem(
 | 
				
			||||||
          label: "Filter Release Titles by Regular Expression",
 | 
					          label: 'Filter Release Titles by Regular Expression',
 | 
				
			||||||
          type: FormItemType.string,
 | 
					          type: FormItemType.string,
 | 
				
			||||||
          required: false,
 | 
					          required: false,
 | 
				
			||||||
          additionalValidators: [
 | 
					          additionalValidators: [
 | 
				
			||||||
@@ -110,7 +133,7 @@ class GitHub implements AppSource {
 | 
				
			|||||||
              try {
 | 
					              try {
 | 
				
			||||||
                RegExp(value);
 | 
					                RegExp(value);
 | 
				
			||||||
              } catch (e) {
 | 
					              } catch (e) {
 | 
				
			||||||
                return "Invalid regular expression";
 | 
					                return 'Invalid regular expression';
 | 
				
			||||||
              }
 | 
					              }
 | 
				
			||||||
              return null;
 | 
					              return null;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
@@ -119,5 +142,44 @@ class GitHub implements AppSource {
 | 
				
			|||||||
  ];
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<String> additionalDataDefaults = ["true", "true", ""];
 | 
					  List<String> additionalDataDefaults = ['true', 'true', ''];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [
 | 
				
			||||||
 | 
					    GeneratedFormItem(
 | 
				
			||||||
 | 
					        label: 'GitHub Personal Access Token (Increases Rate Limit)',
 | 
				
			||||||
 | 
					        id: 'github-creds',
 | 
				
			||||||
 | 
					        required: false,
 | 
				
			||||||
 | 
					        additionalValidators: [
 | 
				
			||||||
 | 
					          (value) {
 | 
				
			||||||
 | 
					            if (value != null && value.trim().isNotEmpty) {
 | 
				
			||||||
 | 
					              if (value
 | 
				
			||||||
 | 
					                      .split(':')
 | 
				
			||||||
 | 
					                      .where((element) => element.trim().isNotEmpty)
 | 
				
			||||||
 | 
					                      .length !=
 | 
				
			||||||
 | 
					                  2) {
 | 
				
			||||||
 | 
					                return 'PAT must be in this format: username:token';
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            return null;
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					        ],
 | 
				
			||||||
 | 
					        hint: 'username:token',
 | 
				
			||||||
 | 
					        belowWidgets: [
 | 
				
			||||||
 | 
					          const SizedBox(
 | 
				
			||||||
 | 
					            height: 8,
 | 
				
			||||||
 | 
					          ),
 | 
				
			||||||
 | 
					          GestureDetector(
 | 
				
			||||||
 | 
					              onTap: () {
 | 
				
			||||||
 | 
					                launchUrlString(
 | 
				
			||||||
 | 
					                    'https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token',
 | 
				
			||||||
 | 
					                    mode: LaunchMode.externalApplication);
 | 
				
			||||||
 | 
					              },
 | 
				
			||||||
 | 
					              child: const Text(
 | 
				
			||||||
 | 
					                'About GitHub PATs',
 | 
				
			||||||
 | 
					                style: TextStyle(
 | 
				
			||||||
 | 
					                    decoration: TextDecoration.underline, fontSize: 12),
 | 
				
			||||||
 | 
					              ))
 | 
				
			||||||
 | 
					        ])
 | 
				
			||||||
 | 
					  ];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,6 +2,7 @@ import 'package:html/parser.dart';
 | 
				
			|||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:obtainium/app_sources/github.dart';
 | 
					import 'package:obtainium/app_sources/github.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class GitLab implements AppSource {
 | 
					class GitLab implements AppSource {
 | 
				
			||||||
@@ -13,11 +14,18 @@ class GitLab implements AppSource {
 | 
				
			|||||||
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
 | 
					    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
 | 
				
			||||||
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
					    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
				
			||||||
    if (match == null) {
 | 
					    if (match == null) {
 | 
				
			||||||
      throw notValidURL(runtimeType.toString());
 | 
					      throw InvalidURLError(runtimeType.toString());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return url.substring(0, match.end);
 | 
					    return url.substring(0, match.end);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) =>
 | 
				
			||||||
 | 
					      '$standardUrl/-/releases';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Future<APKDetails> getLatestAPKDetails(
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
      String standardUrl, List<String> additionalData) async {
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
@@ -32,7 +40,9 @@ class GitLab implements AppSource {
 | 
				
			|||||||
        ...getLinksFromParsedHTML(
 | 
					        ...getLinksFromParsedHTML(
 | 
				
			||||||
            entryContent,
 | 
					            entryContent,
 | 
				
			||||||
            RegExp(
 | 
					            RegExp(
 | 
				
			||||||
                '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$',
 | 
					                '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
 | 
				
			||||||
 | 
					                  return '\\${x[0]}';
 | 
				
			||||||
 | 
					                })}/uploads/[^/]+/[^/]+\\.apk\$',
 | 
				
			||||||
                caseSensitive: false),
 | 
					                caseSensitive: false),
 | 
				
			||||||
            standardUri.origin),
 | 
					            standardUri.origin),
 | 
				
			||||||
        // GitLab releases may contain links to externally hosted APKs
 | 
					        // GitLab releases may contain links to externally hosted APKs
 | 
				
			||||||
@@ -42,18 +52,18 @@ class GitLab implements AppSource {
 | 
				
			|||||||
            .toList()
 | 
					            .toList()
 | 
				
			||||||
      ];
 | 
					      ];
 | 
				
			||||||
      if (apkUrlList.isEmpty) {
 | 
					      if (apkUrlList.isEmpty) {
 | 
				
			||||||
        throw noAPKFound;
 | 
					        throw NoAPKError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      var entryId = entry?.querySelector('id')?.innerHtml;
 | 
					      var entryId = entry?.querySelector('id')?.innerHtml;
 | 
				
			||||||
      var version =
 | 
					      var version =
 | 
				
			||||||
          entryId == null ? null : Uri.parse(entryId).pathSegments.last;
 | 
					          entryId == null ? null : Uri.parse(entryId).pathSegments.last;
 | 
				
			||||||
      if (version == null) {
 | 
					      if (version == null) {
 | 
				
			||||||
        throw couldNotFindLatestVersion;
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return APKDetails(version, apkUrlList);
 | 
					      return APKDetails(version, apkUrlList);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      throw couldNotFindReleases;
 | 
					      throw NoReleasesError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -68,4 +78,7 @@ class GitLab implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<String> additionalDataDefaults = [];
 | 
					  List<String> additionalDataDefaults = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,7 @@
 | 
				
			|||||||
import 'package:html/parser.dart';
 | 
					import 'package:html/parser.dart';
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class IzzyOnDroid implements AppSource {
 | 
					class IzzyOnDroid implements AppSource {
 | 
				
			||||||
@@ -12,11 +13,17 @@ class IzzyOnDroid implements AppSource {
 | 
				
			|||||||
    RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
 | 
					    RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
 | 
				
			||||||
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
					    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
				
			||||||
    if (match == null) {
 | 
					    if (match == null) {
 | 
				
			||||||
      throw notValidURL(runtimeType.toString());
 | 
					      throw InvalidURLError(runtimeType.toString());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return url.substring(0, match.end);
 | 
					    return url.substring(0, match.end);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) => null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Future<APKDetails> getLatestAPKDetails(
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
      String standardUrl, List<String> additionalData) async {
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
@@ -31,7 +38,7 @@ class IzzyOnDroid implements AppSource {
 | 
				
			|||||||
          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
 | 
					          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
 | 
				
			||||||
          .toList();
 | 
					          .toList();
 | 
				
			||||||
      if (multipleVersionApkUrls.isEmpty) {
 | 
					      if (multipleVersionApkUrls.isEmpty) {
 | 
				
			||||||
        throw noAPKFound;
 | 
					        throw NoAPKError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      var version = parsedHtml
 | 
					      var version = parsedHtml
 | 
				
			||||||
          .querySelector('#keydata')
 | 
					          .querySelector('#keydata')
 | 
				
			||||||
@@ -44,11 +51,11 @@ class IzzyOnDroid implements AppSource {
 | 
				
			|||||||
          ?.children[1]
 | 
					          ?.children[1]
 | 
				
			||||||
          .innerHtml;
 | 
					          .innerHtml;
 | 
				
			||||||
      if (version == null) {
 | 
					      if (version == null) {
 | 
				
			||||||
        throw couldNotFindLatestVersion;
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return APKDetails(version, [multipleVersionApkUrls[0]]);
 | 
					      return APKDetails(version, [multipleVersionApkUrls[0]]);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      throw couldNotFindReleases;
 | 
					      throw NoReleasesError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -62,4 +69,7 @@ class IzzyOnDroid implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<String> additionalDataDefaults = [];
 | 
					  List<String> additionalDataDefaults = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,7 @@
 | 
				
			|||||||
import 'package:html/parser.dart';
 | 
					import 'package:html/parser.dart';
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Mullvad implements AppSource {
 | 
					class Mullvad implements AppSource {
 | 
				
			||||||
@@ -12,11 +13,18 @@ class Mullvad implements AppSource {
 | 
				
			|||||||
    RegExp standardUrlRegEx = RegExp('^https?://$host');
 | 
					    RegExp standardUrlRegEx = RegExp('^https?://$host');
 | 
				
			||||||
    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
					    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
				
			||||||
    if (match == null) {
 | 
					    if (match == null) {
 | 
				
			||||||
      throw notValidURL(runtimeType.toString());
 | 
					      throw InvalidURLError(runtimeType.toString());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return url.substring(0, match.end);
 | 
					    return url.substring(0, match.end);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) =>
 | 
				
			||||||
 | 
					      'https://github.com/mullvad/mullvadvpn-app/blob/master/CHANGELOG.md';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Future<APKDetails> getLatestAPKDetails(
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
      String standardUrl, List<String> additionalData) async {
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
@@ -29,12 +37,12 @@ class Mullvad implements AppSource {
 | 
				
			|||||||
          ?.split('/')
 | 
					          ?.split('/')
 | 
				
			||||||
          .last;
 | 
					          .last;
 | 
				
			||||||
      if (version == null) {
 | 
					      if (version == null) {
 | 
				
			||||||
        throw couldNotFindLatestVersion;
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return APKDetails(
 | 
					      return APKDetails(
 | 
				
			||||||
          version, ['https://mullvad.net/download/app/apk/latest']);
 | 
					          version, ['https://mullvad.net/download/app/apk/latest']);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      throw couldNotFindReleases;
 | 
					      throw NoReleasesError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -48,4 +56,7 @@ class Mullvad implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<String> additionalDataDefaults = [];
 | 
					  List<String> additionalDataDefaults = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,7 @@
 | 
				
			|||||||
import 'dart:convert';
 | 
					import 'dart:convert';
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Signal implements AppSource {
 | 
					class Signal implements AppSource {
 | 
				
			||||||
@@ -12,6 +13,12 @@ class Signal implements AppSource {
 | 
				
			|||||||
    return 'https://$host';
 | 
					    return 'https://$host';
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) => null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Future<APKDetails> getLatestAPKDetails(
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
      String standardUrl, List<String> additionalData) async {
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
@@ -21,15 +28,15 @@ class Signal implements AppSource {
 | 
				
			|||||||
      var json = jsonDecode(res.body);
 | 
					      var json = jsonDecode(res.body);
 | 
				
			||||||
      String? apkUrl = json['url'];
 | 
					      String? apkUrl = json['url'];
 | 
				
			||||||
      if (apkUrl == null) {
 | 
					      if (apkUrl == null) {
 | 
				
			||||||
        throw noAPKFound;
 | 
					        throw NoAPKError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      String? version = json['versionName'];
 | 
					      String? version = json['versionName'];
 | 
				
			||||||
      if (version == null) {
 | 
					      if (version == null) {
 | 
				
			||||||
        throw couldNotFindLatestVersion;
 | 
					        throw NoVersionError();
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return APKDetails(version, [apkUrl]);
 | 
					      return APKDetails(version, [apkUrl]);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      throw couldNotFindReleases;
 | 
					      throw NoReleasesError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -41,4 +48,7 @@ class Signal implements AppSource {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  List<String> additionalDataDefaults = [];
 | 
					  List<String> additionalDataDefaults = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										78
									
								
								lib/app_sources/sourceforge.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,78 @@
 | 
				
			|||||||
 | 
					import 'package:html/parser.dart';
 | 
				
			||||||
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class SourceForge implements AppSource {
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  late String host = 'sourceforge.net';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String standardizeURL(String url) {
 | 
				
			||||||
 | 
					    RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
 | 
				
			||||||
 | 
					    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
 | 
				
			||||||
 | 
					    if (match == null) {
 | 
				
			||||||
 | 
					      throw InvalidURLError(runtimeType.toString());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return url.substring(0, match.end);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl) => null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<APKDetails> getLatestAPKDetails(
 | 
				
			||||||
 | 
					      String standardUrl, List<String> additionalData) async {
 | 
				
			||||||
 | 
					    Response res = await get(Uri.parse('$standardUrl/rss?path=/'));
 | 
				
			||||||
 | 
					    if (res.statusCode == 200) {
 | 
				
			||||||
 | 
					      var parsedHtml = parse(res.body);
 | 
				
			||||||
 | 
					      var allDownloadLinks =
 | 
				
			||||||
 | 
					          parsedHtml.querySelectorAll('guid').map((e) => e.innerHtml).toList();
 | 
				
			||||||
 | 
					      getVersion(String url) {
 | 
				
			||||||
 | 
					        try {
 | 
				
			||||||
 | 
					          var tokens = url.split('/');
 | 
				
			||||||
 | 
					          return tokens[tokens.length - 3];
 | 
				
			||||||
 | 
					        } catch (e) {
 | 
				
			||||||
 | 
					          return null;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      String? version = getVersion(allDownloadLinks[0]);
 | 
				
			||||||
 | 
					      if (version == null) {
 | 
				
			||||||
 | 
					        throw NoVersionError();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      var apkUrlListAllReleases = allDownloadLinks
 | 
				
			||||||
 | 
					          .where((element) => element.toLowerCase().endsWith('.apk/download'))
 | 
				
			||||||
 | 
					          .toList();
 | 
				
			||||||
 | 
					      var apkUrlList =
 | 
				
			||||||
 | 
					          apkUrlListAllReleases // This can be used skipped for fallback support later
 | 
				
			||||||
 | 
					              .where((element) => getVersion(element) == version)
 | 
				
			||||||
 | 
					              .toList();
 | 
				
			||||||
 | 
					      if (apkUrlList.isEmpty) {
 | 
				
			||||||
 | 
					        throw NoAPKError();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      return APKDetails(version, apkUrlList);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      throw NoReleasesError();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  AppNames getAppNames(String standardUrl) {
 | 
				
			||||||
 | 
					    return AppNames(runtimeType.toString(),
 | 
				
			||||||
 | 
					        standardUrl.substring(standardUrl.lastIndexOf('/') + 1));
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<List<GeneratedFormItem>> additionalDataFormItems = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<String> additionalDataDefaults = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  List<GeneratedFormItem> moreSourceSettingsFormItems = [];
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -10,13 +10,19 @@ class GeneratedFormItem {
 | 
				
			|||||||
  late bool required;
 | 
					  late bool required;
 | 
				
			||||||
  late int max;
 | 
					  late int max;
 | 
				
			||||||
  late List<String? Function(String? value)> additionalValidators;
 | 
					  late List<String? Function(String? value)> additionalValidators;
 | 
				
			||||||
 | 
					  late String id;
 | 
				
			||||||
 | 
					  late List<Widget> belowWidgets;
 | 
				
			||||||
 | 
					  late String? hint;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  GeneratedFormItem(
 | 
					  GeneratedFormItem(
 | 
				
			||||||
      {this.label = "Input",
 | 
					      {this.label = 'Input',
 | 
				
			||||||
      this.type = FormItemType.string,
 | 
					      this.type = FormItemType.string,
 | 
				
			||||||
      this.required = true,
 | 
					      this.required = true,
 | 
				
			||||||
      this.max = 1,
 | 
					      this.max = 1,
 | 
				
			||||||
      this.additionalValidators = const []});
 | 
					      this.additionalValidators = const [],
 | 
				
			||||||
 | 
					      this.id = 'input',
 | 
				
			||||||
 | 
					      this.belowWidgets = const [],
 | 
				
			||||||
 | 
					      this.hint});
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class GeneratedForm extends StatefulWidget {
 | 
					class GeneratedForm extends StatefulWidget {
 | 
				
			||||||
@@ -69,7 +75,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
 | 
				
			|||||||
        .map((row) => row.map((e) {
 | 
					        .map((row) => row.map((e) {
 | 
				
			||||||
              return j < widget.defaultValues.length
 | 
					              return j < widget.defaultValues.length
 | 
				
			||||||
                  ? widget.defaultValues[j++]
 | 
					                  ? widget.defaultValues[j++]
 | 
				
			||||||
                  : "";
 | 
					                  : '';
 | 
				
			||||||
            }).toList())
 | 
					            }).toList())
 | 
				
			||||||
        .toList();
 | 
					        .toList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -89,7 +95,8 @@ class _GeneratedFormState extends State<GeneratedForm> {
 | 
				
			|||||||
              });
 | 
					              });
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            decoration: InputDecoration(
 | 
					            decoration: InputDecoration(
 | 
				
			||||||
                helperText: e.value.label + (e.value.required ? " *" : "")),
 | 
					                helperText: e.value.label + (e.value.required ? ' *' : ''),
 | 
				
			||||||
 | 
					                hintText: e.value.hint),
 | 
				
			||||||
            minLines: e.value.max <= 1 ? null : e.value.max,
 | 
					            minLines: e.value.max <= 1 ? null : e.value.max,
 | 
				
			||||||
            maxLines: e.value.max <= 1 ? 1 : e.value.max,
 | 
					            maxLines: e.value.max <= 1 ? 1 : e.value.max,
 | 
				
			||||||
            validator: (value) {
 | 
					            validator: (value) {
 | 
				
			||||||
@@ -122,10 +129,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
 | 
				
			|||||||
            children: [
 | 
					            children: [
 | 
				
			||||||
              Text(widget.items[r][e].label),
 | 
					              Text(widget.items[r][e].label),
 | 
				
			||||||
              Switch(
 | 
					              Switch(
 | 
				
			||||||
                  value: values[r][e] == "true",
 | 
					                  value: values[r][e] == 'true',
 | 
				
			||||||
                  onChanged: (value) {
 | 
					                  onChanged: (value) {
 | 
				
			||||||
                    setState(() {
 | 
					                    setState(() {
 | 
				
			||||||
                      values[r][e] = value ? "true" : "";
 | 
					                      values[r][e] = value ? 'true' : '';
 | 
				
			||||||
                      someValueChanged();
 | 
					                      someValueChanged();
 | 
				
			||||||
                    });
 | 
					                    });
 | 
				
			||||||
                  })
 | 
					                  })
 | 
				
			||||||
@@ -155,7 +162,13 @@ class _GeneratedFormState extends State<GeneratedForm> {
 | 
				
			|||||||
            width: 20,
 | 
					            width: 20,
 | 
				
			||||||
          ));
 | 
					          ));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        rowItems.add(Expanded(child: rowInput.value));
 | 
					        rowItems.add(Expanded(
 | 
				
			||||||
 | 
					            child: Column(
 | 
				
			||||||
 | 
					                crossAxisAlignment: CrossAxisAlignment.stretch,
 | 
				
			||||||
 | 
					                children: [
 | 
				
			||||||
 | 
					              rowInput.value,
 | 
				
			||||||
 | 
					              ...widget.items[rowInputs.key][rowInput.key].belowWidgets
 | 
				
			||||||
 | 
					            ])));
 | 
				
			||||||
      });
 | 
					      });
 | 
				
			||||||
      rows.add(rowItems);
 | 
					      rows.add(rowItems);
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,11 +7,15 @@ class GeneratedFormModal extends StatefulWidget {
 | 
				
			|||||||
      {super.key,
 | 
					      {super.key,
 | 
				
			||||||
      required this.title,
 | 
					      required this.title,
 | 
				
			||||||
      required this.items,
 | 
					      required this.items,
 | 
				
			||||||
      required this.defaultValues});
 | 
					      required this.defaultValues,
 | 
				
			||||||
 | 
					      this.initValid = false,
 | 
				
			||||||
 | 
					      this.message = ''});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  final String title;
 | 
					  final String title;
 | 
				
			||||||
 | 
					  final String message;
 | 
				
			||||||
  final List<List<GeneratedFormItem>> items;
 | 
					  final List<List<GeneratedFormItem>> items;
 | 
				
			||||||
  final List<String> defaultValues;
 | 
					  final List<String> defaultValues;
 | 
				
			||||||
 | 
					  final bool initValid;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  State<GeneratedFormModal> createState() => _GeneratedFormModalState();
 | 
					  State<GeneratedFormModal> createState() => _GeneratedFormModalState();
 | 
				
			||||||
@@ -21,12 +25,26 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
 | 
				
			|||||||
  List<String> values = [];
 | 
					  List<String> values = [];
 | 
				
			||||||
  bool valid = false;
 | 
					  bool valid = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  void initState() {
 | 
				
			||||||
 | 
					    super.initState();
 | 
				
			||||||
 | 
					    values = widget.defaultValues;
 | 
				
			||||||
 | 
					    valid = widget.initValid;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Widget build(BuildContext context) {
 | 
					  Widget build(BuildContext context) {
 | 
				
			||||||
    return AlertDialog(
 | 
					    return AlertDialog(
 | 
				
			||||||
      scrollable: true,
 | 
					      scrollable: true,
 | 
				
			||||||
      title: Text(widget.title),
 | 
					      title: Text(widget.title),
 | 
				
			||||||
      content: GeneratedForm(
 | 
					      content:
 | 
				
			||||||
 | 
					          Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
 | 
				
			||||||
 | 
					        if (widget.message.isNotEmpty) Text(widget.message),
 | 
				
			||||||
 | 
					        if (widget.message.isNotEmpty)
 | 
				
			||||||
 | 
					          const SizedBox(
 | 
				
			||||||
 | 
					            height: 16,
 | 
				
			||||||
 | 
					          ),
 | 
				
			||||||
 | 
					        GeneratedForm(
 | 
				
			||||||
            items: widget.items,
 | 
					            items: widget.items,
 | 
				
			||||||
            onValueChanges: (values, valid) {
 | 
					            onValueChanges: (values, valid) {
 | 
				
			||||||
              setState(() {
 | 
					              setState(() {
 | 
				
			||||||
@@ -34,7 +52,8 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
 | 
				
			|||||||
                this.valid = valid;
 | 
					                this.valid = valid;
 | 
				
			||||||
              });
 | 
					              });
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
          defaultValues: widget.defaultValues),
 | 
					            defaultValues: widget.defaultValues)
 | 
				
			||||||
 | 
					      ]),
 | 
				
			||||||
      actions: [
 | 
					      actions: [
 | 
				
			||||||
        TextButton(
 | 
					        TextButton(
 | 
				
			||||||
            onPressed: () {
 | 
					            onPressed: () {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										114
									
								
								lib/custom_errors.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						@@ -0,0 +1,114 @@
 | 
				
			|||||||
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/providers/apps_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class ObtainiumError {
 | 
				
			||||||
 | 
					  late String message;
 | 
				
			||||||
 | 
					  ObtainiumError(this.message);
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String toString() {
 | 
				
			||||||
 | 
					    return message;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class RateLimitError {
 | 
				
			||||||
 | 
					  late int remainingMinutes;
 | 
				
			||||||
 | 
					  RateLimitError(this.remainingMinutes);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String toString() =>
 | 
				
			||||||
 | 
					      'Too many requests (rate limited) - try again in $remainingMinutes minutes';
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class InvalidURLError extends ObtainiumError {
 | 
				
			||||||
 | 
					  InvalidURLError(String sourceName) : super('Not a valid $sourceName App URL');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class NoReleasesError extends ObtainiumError {
 | 
				
			||||||
 | 
					  NoReleasesError() : super('Could not find a suitable release');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class NoAPKError extends ObtainiumError {
 | 
				
			||||||
 | 
					  NoAPKError() : super('Could not find a suitable release');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class NoVersionError extends ObtainiumError {
 | 
				
			||||||
 | 
					  NoVersionError() : super('Could not determine release version');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class UnsupportedURLError extends ObtainiumError {
 | 
				
			||||||
 | 
					  UnsupportedURLError() : super('URL does not match a known source');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class DowngradeError extends ObtainiumError {
 | 
				
			||||||
 | 
					  DowngradeError() : super('Cannot install an older version of an App');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class IDChangedError extends ObtainiumError {
 | 
				
			||||||
 | 
					  IDChangedError()
 | 
				
			||||||
 | 
					      : super('Downloaded package ID does not match existing App ID');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class MultiAppMultiError extends ObtainiumError {
 | 
				
			||||||
 | 
					  Map<String, List<String>> content = {};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  MultiAppMultiError() : super('Multiple Errors Placeholder');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  add(String appId, String string) {
 | 
				
			||||||
 | 
					    var tempIds = content.remove(string);
 | 
				
			||||||
 | 
					    tempIds ??= [];
 | 
				
			||||||
 | 
					    tempIds.add(appId);
 | 
				
			||||||
 | 
					    content.putIfAbsent(string, () => tempIds!);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  String toString() {
 | 
				
			||||||
 | 
					    String finalString = '';
 | 
				
			||||||
 | 
					    for (var e in content.keys) {
 | 
				
			||||||
 | 
					      finalString += '$e: ${content[e].toString()}\n\n';
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return finalString;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					showError(dynamic e, BuildContext context) {
 | 
				
			||||||
 | 
					  if (e is String || (e is ObtainiumError && e is! MultiAppMultiError)) {
 | 
				
			||||||
 | 
					    ScaffoldMessenger.of(context).showSnackBar(
 | 
				
			||||||
 | 
					      SnackBar(content: Text(e.toString())),
 | 
				
			||||||
 | 
					    );
 | 
				
			||||||
 | 
					  } else {
 | 
				
			||||||
 | 
					    showDialog(
 | 
				
			||||||
 | 
					        context: context,
 | 
				
			||||||
 | 
					        builder: (BuildContext ctx) {
 | 
				
			||||||
 | 
					          return AlertDialog(
 | 
				
			||||||
 | 
					            scrollable: true,
 | 
				
			||||||
 | 
					            title: Text(e is MultiAppMultiError
 | 
				
			||||||
 | 
					                ? 'Some Errors Occurred'
 | 
				
			||||||
 | 
					                : 'Unexpected Error'),
 | 
				
			||||||
 | 
					            content: Text(e.toString()),
 | 
				
			||||||
 | 
					            actions: [
 | 
				
			||||||
 | 
					              TextButton(
 | 
				
			||||||
 | 
					                  onPressed: () {
 | 
				
			||||||
 | 
					                    Navigator.of(context).pop(null);
 | 
				
			||||||
 | 
					                  },
 | 
				
			||||||
 | 
					                  child: const Text('Ok')),
 | 
				
			||||||
 | 
					            ],
 | 
				
			||||||
 | 
					          );
 | 
				
			||||||
 | 
					        });
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					String list2FriendlyString(List<String> list) {
 | 
				
			||||||
 | 
					  return list.length == 2
 | 
				
			||||||
 | 
					      ? '${list[0]} and ${list[1]}'
 | 
				
			||||||
 | 
					      : list
 | 
				
			||||||
 | 
					          .asMap()
 | 
				
			||||||
 | 
					          .entries
 | 
				
			||||||
 | 
					          .map((e) =>
 | 
				
			||||||
 | 
					              e.value +
 | 
				
			||||||
 | 
					              (e.key == list.length - 1
 | 
				
			||||||
 | 
					                  ? ''
 | 
				
			||||||
 | 
					                  : e.key == list.length - 2
 | 
				
			||||||
 | 
					                      ? ', and '
 | 
				
			||||||
 | 
					                      : ', '))
 | 
				
			||||||
 | 
					          .join('');
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										144
									
								
								lib/main.dart
									
									
									
									
									
								
							
							
						
						@@ -1,6 +1,9 @@
 | 
				
			|||||||
 | 
					import 'dart:io';
 | 
				
			||||||
 | 
					import 'dart:math';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import 'package:flutter/material.dart';
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
import 'package:flutter/services.dart';
 | 
					import 'package:flutter/services.dart';
 | 
				
			||||||
import 'package:obtainium/app_sources/github.dart';
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/pages/home.dart';
 | 
					import 'package:obtainium/pages/home.dart';
 | 
				
			||||||
import 'package:obtainium/providers/apps_provider.dart';
 | 
					import 'package:obtainium/providers/apps_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/notifications_provider.dart';
 | 
					import 'package:obtainium/providers/notifications_provider.dart';
 | 
				
			||||||
@@ -8,70 +11,114 @@ import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			|||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
import 'package:permission_handler/permission_handler.dart';
 | 
					import 'package:permission_handler/permission_handler.dart';
 | 
				
			||||||
import 'package:provider/provider.dart';
 | 
					import 'package:provider/provider.dart';
 | 
				
			||||||
import 'package:workmanager/workmanager.dart';
 | 
					 | 
				
			||||||
import 'package:dynamic_color/dynamic_color.dart';
 | 
					import 'package:dynamic_color/dynamic_color.dart';
 | 
				
			||||||
import 'package:device_info_plus/device_info_plus.dart';
 | 
					import 'package:device_info_plus/device_info_plus.dart';
 | 
				
			||||||
 | 
					import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const String currentVersion = '0.6.11';
 | 
				
			||||||
const String currentReleaseTag =
 | 
					const String currentReleaseTag =
 | 
				
			||||||
    'v0.3.1-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 | 
					    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const int bgUpdateCheckAlarmId = 666;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@pragma('vm:entry-point')
 | 
					@pragma('vm:entry-point')
 | 
				
			||||||
void bgTaskCallback() {
 | 
					Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
 | 
				
			||||||
  // Background update checking process
 | 
					  int? ignoreAfterMicroseconds = params?['ignoreAfterMicroseconds'];
 | 
				
			||||||
  Workmanager().executeTask((task, taskName) async {
 | 
					  WidgetsFlutterBinding.ensureInitialized();
 | 
				
			||||||
 | 
					  await AndroidAlarmManager.initialize();
 | 
				
			||||||
 | 
					  DateTime? ignoreAfter = ignoreAfterMicroseconds != null
 | 
				
			||||||
 | 
					      ? DateTime.fromMicrosecondsSinceEpoch(ignoreAfterMicroseconds)
 | 
				
			||||||
 | 
					      : null;
 | 
				
			||||||
  var notificationsProvider = NotificationsProvider();
 | 
					  var notificationsProvider = NotificationsProvider();
 | 
				
			||||||
  await notificationsProvider.notify(checkingUpdatesNotification);
 | 
					  await notificationsProvider.notify(checkingUpdatesNotification);
 | 
				
			||||||
  try {
 | 
					  try {
 | 
				
			||||||
      var appsProvider = AppsProvider();
 | 
					    var appsProvider = AppsProvider(forBGTask: true);
 | 
				
			||||||
      await notificationsProvider
 | 
					    await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id);
 | 
				
			||||||
          .cancel(ErrorCheckingUpdatesNotification('').id);
 | 
					 | 
				
			||||||
    await appsProvider.loadApps();
 | 
					    await appsProvider.loadApps();
 | 
				
			||||||
      List<App> updates = await appsProvider.checkUpdates();
 | 
					    List<String> existingUpdateIds =
 | 
				
			||||||
      if (updates.isNotEmpty) {
 | 
					        appsProvider.findExistingUpdates(installedOnly: true);
 | 
				
			||||||
        notificationsProvider.notify(UpdateNotification(updates),
 | 
					    DateTime nextIgnoreAfter = DateTime.now();
 | 
				
			||||||
            cancelExisting: true);
 | 
					    String? err;
 | 
				
			||||||
      }
 | 
					    try {
 | 
				
			||||||
      return Future.value(true);
 | 
					      await appsProvider.checkUpdates(
 | 
				
			||||||
 | 
					          ignoreAppsCheckedAfter: ignoreAfter, throwErrorsForRetry: true);
 | 
				
			||||||
    } catch (e) {
 | 
					    } catch (e) {
 | 
				
			||||||
      notificationsProvider.notify(
 | 
					      if (e is RateLimitError || e is SocketException) {
 | 
				
			||||||
          ErrorCheckingUpdatesNotification(e.toString()),
 | 
					        AndroidAlarmManager.oneShot(
 | 
				
			||||||
          cancelExisting: true);
 | 
					            Duration(minutes: e is RateLimitError ? e.remainingMinutes : 15),
 | 
				
			||||||
      return Future.value(false);
 | 
					            Random().nextInt(pow(2, 31) as int),
 | 
				
			||||||
 | 
					            bgUpdateCheck,
 | 
				
			||||||
 | 
					            params: {
 | 
				
			||||||
 | 
					              'ignoreAfterMicroseconds': nextIgnoreAfter.microsecondsSinceEpoch
 | 
				
			||||||
 | 
					            });
 | 
				
			||||||
 | 
					      } else {
 | 
				
			||||||
 | 
					        err = e.toString();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    List<App> newUpdates = appsProvider
 | 
				
			||||||
 | 
					        .findExistingUpdates(installedOnly: true)
 | 
				
			||||||
 | 
					        .where((id) => !existingUpdateIds.contains(id))
 | 
				
			||||||
 | 
					        .map((e) => appsProvider.apps[e]!.app)
 | 
				
			||||||
 | 
					        .toList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // TODO: This silent update code doesn't work yet
 | 
				
			||||||
 | 
					    // List<String> silentlyUpdated = await appsProvider
 | 
				
			||||||
 | 
					    //     .downloadAndInstallLatestApp(
 | 
				
			||||||
 | 
					    //         [...newUpdates.map((e) => e.id), ...existingUpdateIds], null);
 | 
				
			||||||
 | 
					    // if (silentlyUpdated.isNotEmpty) {
 | 
				
			||||||
 | 
					    //   newUpdates = newUpdates
 | 
				
			||||||
 | 
					    //       .where((element) => !silentlyUpdated.contains(element.id))
 | 
				
			||||||
 | 
					    //       .toList();
 | 
				
			||||||
 | 
					    //   notificationsProvider.notify(
 | 
				
			||||||
 | 
					    //       SilentUpdateNotification(
 | 
				
			||||||
 | 
					    //           silentlyUpdated.map((e) => appsProvider.apps[e]!.app).toList()),
 | 
				
			||||||
 | 
					    //       cancelExisting: true);
 | 
				
			||||||
 | 
					    // }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (newUpdates.isNotEmpty) {
 | 
				
			||||||
 | 
					      notificationsProvider.notify(UpdateNotification(newUpdates));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (err != null) {
 | 
				
			||||||
 | 
					      throw err;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  } catch (e) {
 | 
				
			||||||
 | 
					    notificationsProvider
 | 
				
			||||||
 | 
					        .notify(ErrorCheckingUpdatesNotification(e.toString()));
 | 
				
			||||||
  } finally {
 | 
					  } finally {
 | 
				
			||||||
    await notificationsProvider.cancel(checkingUpdatesNotification.id);
 | 
					    await notificationsProvider.cancel(checkingUpdatesNotification.id);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  });
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void main() async {
 | 
					void main() async {
 | 
				
			||||||
  WidgetsFlutterBinding.ensureInitialized();
 | 
					  WidgetsFlutterBinding.ensureInitialized();
 | 
				
			||||||
  if ((await DeviceInfoPlugin().androidInfo).version.sdkInt! >= 29) {
 | 
					  if ((await DeviceInfoPlugin().androidInfo).version.sdkInt >= 29) {
 | 
				
			||||||
    SystemChrome.setSystemUIOverlayStyle(
 | 
					    SystemChrome.setSystemUIOverlayStyle(
 | 
				
			||||||
      const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent),
 | 
					      const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent),
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
 | 
					    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  Workmanager().initialize(
 | 
					  await AndroidAlarmManager.initialize();
 | 
				
			||||||
    bgTaskCallback,
 | 
					 | 
				
			||||||
  );
 | 
					 | 
				
			||||||
  runApp(MultiProvider(
 | 
					  runApp(MultiProvider(
 | 
				
			||||||
    providers: [
 | 
					    providers: [
 | 
				
			||||||
      ChangeNotifierProvider(
 | 
					      ChangeNotifierProvider(create: (context) => AppsProvider()),
 | 
				
			||||||
          create: (context) => AppsProvider(
 | 
					 | 
				
			||||||
              shouldLoadApps: true,
 | 
					 | 
				
			||||||
              shouldCheckUpdatesAfterLoad: false,
 | 
					 | 
				
			||||||
              shouldDeleteAPKs: true)),
 | 
					 | 
				
			||||||
      ChangeNotifierProvider(create: (context) => SettingsProvider()),
 | 
					      ChangeNotifierProvider(create: (context) => SettingsProvider()),
 | 
				
			||||||
      Provider(create: (context) => NotificationsProvider())
 | 
					      Provider(create: (context) => NotificationsProvider())
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    child: const MyApp(),
 | 
					    child: const Obtainium(),
 | 
				
			||||||
  ));
 | 
					  ));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var defaultThemeColour = Colors.deepPurple;
 | 
					var defaultThemeColour = Colors.deepPurple;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class MyApp extends StatelessWidget {
 | 
					class Obtainium extends StatefulWidget {
 | 
				
			||||||
  const MyApp({super.key});
 | 
					  const Obtainium({super.key});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  State<Obtainium> createState() => _ObtainiumState();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class _ObtainiumState extends State<Obtainium> {
 | 
				
			||||||
 | 
					  var existingUpdateInterval = -1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Widget build(BuildContext context) {
 | 
					  Widget build(BuildContext context) {
 | 
				
			||||||
@@ -81,22 +128,13 @@ class MyApp extends StatelessWidget {
 | 
				
			|||||||
    if (settingsProvider.prefs == null) {
 | 
					    if (settingsProvider.prefs == null) {
 | 
				
			||||||
      settingsProvider.initializeSettings();
 | 
					      settingsProvider.initializeSettings();
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      // Register the background update task according to the user's setting
 | 
					 | 
				
			||||||
      if (settingsProvider.updateInterval > 0) {
 | 
					 | 
				
			||||||
        Workmanager().registerPeriodicTask('bg-update-check', 'bg-update-check',
 | 
					 | 
				
			||||||
            frequency: Duration(minutes: settingsProvider.updateInterval),
 | 
					 | 
				
			||||||
            initialDelay: Duration(minutes: settingsProvider.updateInterval),
 | 
					 | 
				
			||||||
            constraints: Constraints(networkType: NetworkType.connected),
 | 
					 | 
				
			||||||
            existingWorkPolicy: ExistingWorkPolicy.replace);
 | 
					 | 
				
			||||||
      } else {
 | 
					 | 
				
			||||||
        Workmanager().cancelByUniqueName('bg-update-check');
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
      bool isFirstRun = settingsProvider.checkAndFlipFirstRun();
 | 
					      bool isFirstRun = settingsProvider.checkAndFlipFirstRun();
 | 
				
			||||||
      if (isFirstRun) {
 | 
					      if (isFirstRun) {
 | 
				
			||||||
        // If this is the first run, ask for notification permissions and add Obtainium to the Apps list
 | 
					        // If this is the first run, ask for notification permissions and add Obtainium to the Apps list
 | 
				
			||||||
        Permission.notification.request();
 | 
					        Permission.notification.request();
 | 
				
			||||||
        appsProvider.saveApp(App(
 | 
					        appsProvider.saveApps([
 | 
				
			||||||
            'imranr98_obtainium_${GitHub().host}',
 | 
					          App(
 | 
				
			||||||
 | 
					              'dev.imranr.obtainium',
 | 
				
			||||||
              'https://github.com/ImranR98/Obtainium',
 | 
					              'https://github.com/ImranR98/Obtainium',
 | 
				
			||||||
              'ImranR98',
 | 
					              'ImranR98',
 | 
				
			||||||
              'Obtainium',
 | 
					              'Obtainium',
 | 
				
			||||||
@@ -104,7 +142,23 @@ class MyApp extends StatelessWidget {
 | 
				
			|||||||
              currentReleaseTag,
 | 
					              currentReleaseTag,
 | 
				
			||||||
              [],
 | 
					              [],
 | 
				
			||||||
              0,
 | 
					              0,
 | 
				
			||||||
            ["true"]));
 | 
					              ['true'],
 | 
				
			||||||
 | 
					              null)
 | 
				
			||||||
 | 
					        ]);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      // Register the background update task according to the user's setting
 | 
				
			||||||
 | 
					      if (existingUpdateInterval != settingsProvider.updateInterval) {
 | 
				
			||||||
 | 
					        existingUpdateInterval = settingsProvider.updateInterval;
 | 
				
			||||||
 | 
					        if (existingUpdateInterval == 0) {
 | 
				
			||||||
 | 
					          AndroidAlarmManager.cancel(bgUpdateCheckAlarmId);
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					          AndroidAlarmManager.periodic(
 | 
				
			||||||
 | 
					              Duration(minutes: existingUpdateInterval),
 | 
				
			||||||
 | 
					              bgUpdateCheckAlarmId,
 | 
				
			||||||
 | 
					              bgUpdateCheck,
 | 
				
			||||||
 | 
					              rescheduleOnReboot: true,
 | 
				
			||||||
 | 
					              wakeup: true);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,32 +1,51 @@
 | 
				
			|||||||
import 'dart:convert';
 | 
					import 'dart:convert';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/app_sources/github.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class GitHubStars implements MassAppSource {
 | 
					class GitHubStars implements MassAppUrlSource {
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  late String name = 'GitHub Starred Repos';
 | 
					  late String name = 'GitHub Starred Repos';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  late List<String> requiredArgs = ['Username'];
 | 
					  late List<String> requiredArgs = ['Username'];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  Future<List<String>> getOnePageOfUserStarredUrls(
 | 
				
			||||||
  Future<List<String>> getUrls(List<String> args) async {
 | 
					      String username, int page) async {
 | 
				
			||||||
    if (args.length != requiredArgs.length) {
 | 
					    Response res = await get(Uri.parse(
 | 
				
			||||||
      throw 'Wrong number of arguments provided';
 | 
					        'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    Response res =
 | 
					 | 
				
			||||||
        await get(Uri.parse('https://api.github.com/users/${args[0]}/starred'));
 | 
					 | 
				
			||||||
    if (res.statusCode == 200) {
 | 
					    if (res.statusCode == 200) {
 | 
				
			||||||
      return (jsonDecode(res.body) as List<dynamic>)
 | 
					      return (jsonDecode(res.body) as List<dynamic>)
 | 
				
			||||||
          .map((e) => e['html_url'] as String)
 | 
					          .map((e) => e['html_url'] as String)
 | 
				
			||||||
          .toList();
 | 
					          .toList();
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      if (res.headers['x-ratelimit-remaining'] == '0') {
 | 
					      if (res.headers['x-ratelimit-remaining'] == '0') {
 | 
				
			||||||
        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
 | 
					        throw RateLimitError(
 | 
				
			||||||
 | 
					            (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
 | 
				
			||||||
 | 
					                    60000000)
 | 
				
			||||||
 | 
					                .round());
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      throw 'Unable to find user\'s starred repos';
 | 
					      throw ObtainiumError('Unable to find user\'s starred repos');
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Future<List<String>> getUrls(List<String> args) async {
 | 
				
			||||||
 | 
					    if (args.length != requiredArgs.length) {
 | 
				
			||||||
 | 
					      throw ObtainiumError('Wrong number of arguments provided');
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    List<String> urls = [];
 | 
				
			||||||
 | 
					    var page = 1;
 | 
				
			||||||
 | 
					    while (true) {
 | 
				
			||||||
 | 
					      var pageUrls = await getOnePageOfUserStarredUrls(args[0], page++);
 | 
				
			||||||
 | 
					      urls.addAll(pageUrls);
 | 
				
			||||||
 | 
					      if (pageUrls.length < 100) {
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return urls;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 | 
				
			|||||||
import 'package:flutter/services.dart';
 | 
					import 'package:flutter/services.dart';
 | 
				
			||||||
import 'package:obtainium/components/custom_app_bar.dart';
 | 
					import 'package:obtainium/components/custom_app_bar.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/pages/app.dart';
 | 
					import 'package:obtainium/pages/app.dart';
 | 
				
			||||||
import 'package:obtainium/providers/apps_provider.dart';
 | 
					import 'package:obtainium/providers/apps_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/settings_provider.dart';
 | 
					import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			||||||
@@ -19,7 +20,7 @@ class AddAppPage extends StatefulWidget {
 | 
				
			|||||||
class _AddAppPageState extends State<AddAppPage> {
 | 
					class _AddAppPageState extends State<AddAppPage> {
 | 
				
			||||||
  bool gettingAppInfo = false;
 | 
					  bool gettingAppInfo = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  String userInput = "";
 | 
					  String userInput = '';
 | 
				
			||||||
  AppSource? pickedSource;
 | 
					  AppSource? pickedSource;
 | 
				
			||||||
  List<String> additionalData = [];
 | 
					  List<String> additionalData = [];
 | 
				
			||||||
  bool validAdditionalData = true;
 | 
					  bool validAdditionalData = true;
 | 
				
			||||||
@@ -44,19 +45,21 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                                  items: [
 | 
					                                  items: [
 | 
				
			||||||
                                    [
 | 
					                                    [
 | 
				
			||||||
                                      GeneratedFormItem(
 | 
					                                      GeneratedFormItem(
 | 
				
			||||||
                                          label: "App Source Url",
 | 
					                                          label: 'App Source Url',
 | 
				
			||||||
                                          additionalValidators: [
 | 
					                                          additionalValidators: [
 | 
				
			||||||
                                            (value) {
 | 
					                                            (value) {
 | 
				
			||||||
                                              try {
 | 
					                                              try {
 | 
				
			||||||
                                                sourceProvider
 | 
					                                                sourceProvider
 | 
				
			||||||
                                                    .getSource(value ?? "")
 | 
					                                                    .getSource(value ?? '')
 | 
				
			||||||
                                                    .standardizeURL(
 | 
					                                                    .standardizeURL(
 | 
				
			||||||
                                                        makeUrlHttps(
 | 
					                                                        preStandardizeUrl(
 | 
				
			||||||
                                                            value ?? ""));
 | 
					                                                            value ?? ''));
 | 
				
			||||||
                                              } catch (e) {
 | 
					                                              } catch (e) {
 | 
				
			||||||
                                                return e is String
 | 
					                                                return e is String
 | 
				
			||||||
                                                    ? e
 | 
					                                                    ? e
 | 
				
			||||||
                                                    : "Error";
 | 
					                                                    : e is ObtainiumError
 | 
				
			||||||
 | 
					                                                        ? e.toString()
 | 
				
			||||||
 | 
					                                                        : 'Error';
 | 
				
			||||||
                                              }
 | 
					                                              }
 | 
				
			||||||
                                              return null;
 | 
					                                              return null;
 | 
				
			||||||
                                            }
 | 
					                                            }
 | 
				
			||||||
@@ -76,7 +79,7 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                                            : [];
 | 
					                                            : [];
 | 
				
			||||||
                                        validAdditionalData = source != null
 | 
					                                        validAdditionalData = source != null
 | 
				
			||||||
                                            ? sourceProvider
 | 
					                                            ? sourceProvider
 | 
				
			||||||
                                                .doesSourceHaveRequiredAdditionalData(
 | 
					                                                .ifSourceAppsRequireAdditionalData(
 | 
				
			||||||
                                                    source)
 | 
					                                                    source)
 | 
				
			||||||
                                            : true;
 | 
					                                            : true;
 | 
				
			||||||
                                      }
 | 
					                                      }
 | 
				
			||||||
@@ -86,47 +89,62 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                          const SizedBox(
 | 
					                          const SizedBox(
 | 
				
			||||||
                            width: 16,
 | 
					                            width: 16,
 | 
				
			||||||
                          ),
 | 
					                          ),
 | 
				
			||||||
                          ElevatedButton(
 | 
					                          gettingAppInfo
 | 
				
			||||||
 | 
					                              ? const CircularProgressIndicator()
 | 
				
			||||||
 | 
					                              : ElevatedButton(
 | 
				
			||||||
                                  onPressed: gettingAppInfo ||
 | 
					                                  onPressed: gettingAppInfo ||
 | 
				
			||||||
                                          pickedSource == null ||
 | 
					                                          pickedSource == null ||
 | 
				
			||||||
                                          (pickedSource!.additionalDataFormItems
 | 
					                                          (pickedSource!.additionalDataFormItems
 | 
				
			||||||
                                                  .isNotEmpty &&
 | 
					                                                  .isNotEmpty &&
 | 
				
			||||||
                                              !validAdditionalData)
 | 
					                                              !validAdditionalData)
 | 
				
			||||||
                                      ? null
 | 
					                                      ? null
 | 
				
			||||||
                                  : () {
 | 
					                                      : () async {
 | 
				
			||||||
                                      HapticFeedback.selectionClick();
 | 
					 | 
				
			||||||
                                          setState(() {
 | 
					                                          setState(() {
 | 
				
			||||||
                                            gettingAppInfo = true;
 | 
					                                            gettingAppInfo = true;
 | 
				
			||||||
                                          });
 | 
					                                          });
 | 
				
			||||||
                                      sourceProvider
 | 
					 | 
				
			||||||
                                          .getApp(pickedSource!, userInput,
 | 
					 | 
				
			||||||
                                              additionalData)
 | 
					 | 
				
			||||||
                                          .then((app) {
 | 
					 | 
				
			||||||
                                          var appsProvider =
 | 
					                                          var appsProvider =
 | 
				
			||||||
                                              context.read<AppsProvider>();
 | 
					                                              context.read<AppsProvider>();
 | 
				
			||||||
                                          var settingsProvider =
 | 
					                                          var settingsProvider =
 | 
				
			||||||
                                              context.read<SettingsProvider>();
 | 
					                                              context.read<SettingsProvider>();
 | 
				
			||||||
 | 
					                                          () async {
 | 
				
			||||||
 | 
					                                            HapticFeedback.selectionClick();
 | 
				
			||||||
 | 
					                                            App app =
 | 
				
			||||||
 | 
					                                                await sourceProvider.getApp(
 | 
				
			||||||
 | 
					                                                    pickedSource!,
 | 
				
			||||||
 | 
					                                                    userInput,
 | 
				
			||||||
 | 
					                                                    additionalData);
 | 
				
			||||||
 | 
					                                            await settingsProvider
 | 
				
			||||||
 | 
					                                                .getInstallPermission();
 | 
				
			||||||
 | 
					                                            // ignore: use_build_context_synchronously
 | 
				
			||||||
 | 
					                                            var apkUrl = await appsProvider
 | 
				
			||||||
 | 
					                                                .confirmApkUrl(app, context);
 | 
				
			||||||
 | 
					                                            if (apkUrl == null) {
 | 
				
			||||||
 | 
					                                              throw ObtainiumError('Cancelled');
 | 
				
			||||||
 | 
					                                            }
 | 
				
			||||||
 | 
					                                            app.preferredApkIndex =
 | 
				
			||||||
 | 
					                                                app.apkUrls.indexOf(apkUrl);
 | 
				
			||||||
 | 
					                                            var downloadedApk =
 | 
				
			||||||
 | 
					                                                await appsProvider
 | 
				
			||||||
 | 
					                                                    .downloadApp(app);
 | 
				
			||||||
 | 
					                                            app.id = downloadedApk.appId;
 | 
				
			||||||
                                            if (appsProvider.apps
 | 
					                                            if (appsProvider.apps
 | 
				
			||||||
                                                .containsKey(app.id)) {
 | 
					                                                .containsKey(app.id)) {
 | 
				
			||||||
                                          throw 'App already added';
 | 
					                                              throw ObtainiumError(
 | 
				
			||||||
 | 
					                                                  'App already added');
 | 
				
			||||||
                                            }
 | 
					                                            }
 | 
				
			||||||
                                        settingsProvider
 | 
					                                            await appsProvider.saveApps([app]);
 | 
				
			||||||
                                            .getInstallPermission()
 | 
					
 | 
				
			||||||
                                            .then((_) {
 | 
					                                            return app;
 | 
				
			||||||
                                          appsProvider.saveApp(app).then((_) {
 | 
					                                          }()
 | 
				
			||||||
 | 
					                                              .then((app) {
 | 
				
			||||||
                                            Navigator.push(
 | 
					                                            Navigator.push(
 | 
				
			||||||
                                                context,
 | 
					                                                context,
 | 
				
			||||||
                                                MaterialPageRoute(
 | 
					                                                MaterialPageRoute(
 | 
				
			||||||
                                                    builder: (context) =>
 | 
					                                                    builder: (context) =>
 | 
				
			||||||
                                                        AppPage(
 | 
					                                                        AppPage(
 | 
				
			||||||
                                                            appId: app.id)));
 | 
					                                                            appId: app.id)));
 | 
				
			||||||
                                          });
 | 
					 | 
				
			||||||
                                        });
 | 
					 | 
				
			||||||
                                          }).catchError((e) {
 | 
					                                          }).catchError((e) {
 | 
				
			||||||
                                        ScaffoldMessenger.of(context)
 | 
					                                            showError(e, context);
 | 
				
			||||||
                                            .showSnackBar(
 | 
					 | 
				
			||||||
                                          SnackBar(content: Text(e.toString())),
 | 
					 | 
				
			||||||
                                        );
 | 
					 | 
				
			||||||
                                          }).whenComplete(() {
 | 
					                                          }).whenComplete(() {
 | 
				
			||||||
                                            setState(() {
 | 
					                                            setState(() {
 | 
				
			||||||
                                              gettingAppInfo = false;
 | 
					                                              gettingAppInfo = false;
 | 
				
			||||||
@@ -137,7 +155,7 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                        ],
 | 
					                        ],
 | 
				
			||||||
                      ),
 | 
					                      ),
 | 
				
			||||||
                      if (pickedSource != null &&
 | 
					                      if (pickedSource != null &&
 | 
				
			||||||
                          (pickedSource!.additionalDataFormItems.isNotEmpty))
 | 
					                          pickedSource!.additionalDataDefaults.isNotEmpty)
 | 
				
			||||||
                        Column(
 | 
					                        Column(
 | 
				
			||||||
                          crossAxisAlignment: CrossAxisAlignment.stretch,
 | 
					                          crossAxisAlignment: CrossAxisAlignment.stretch,
 | 
				
			||||||
                          children: [
 | 
					                          children: [
 | 
				
			||||||
@@ -152,6 +170,8 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                            const SizedBox(
 | 
					                            const SizedBox(
 | 
				
			||||||
                              height: 16,
 | 
					                              height: 16,
 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
 | 
					                            if (pickedSource!
 | 
				
			||||||
 | 
					                                .additionalDataFormItems.isNotEmpty)
 | 
				
			||||||
                              GeneratedForm(
 | 
					                              GeneratedForm(
 | 
				
			||||||
                                  items: pickedSource!.additionalDataFormItems,
 | 
					                                  items: pickedSource!.additionalDataFormItems,
 | 
				
			||||||
                                  onValueChanges: (values, valid) {
 | 
					                                  onValueChanges: (values, valid) {
 | 
				
			||||||
@@ -161,7 +181,12 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                                    });
 | 
					                                    });
 | 
				
			||||||
                                  },
 | 
					                                  },
 | 
				
			||||||
                                  defaultValues:
 | 
					                                  defaultValues:
 | 
				
			||||||
                                    pickedSource!.additionalDataDefaults)
 | 
					                                      pickedSource!.additionalDataDefaults),
 | 
				
			||||||
 | 
					                            if (pickedSource!
 | 
				
			||||||
 | 
					                                .additionalDataFormItems.isNotEmpty)
 | 
				
			||||||
 | 
					                              const SizedBox(
 | 
				
			||||||
 | 
					                                height: 8,
 | 
				
			||||||
 | 
					                              ),
 | 
				
			||||||
                          ],
 | 
					                          ],
 | 
				
			||||||
                        )
 | 
					                        )
 | 
				
			||||||
                      else
 | 
					                      else
 | 
				
			||||||
@@ -170,9 +195,6 @@ class _AddAppPageState extends State<AddAppPage> {
 | 
				
			|||||||
                                crossAxisAlignment: CrossAxisAlignment.center,
 | 
					                                crossAxisAlignment: CrossAxisAlignment.center,
 | 
				
			||||||
                                mainAxisAlignment: MainAxisAlignment.center,
 | 
					                                mainAxisAlignment: MainAxisAlignment.center,
 | 
				
			||||||
                                children: [
 | 
					                                children: [
 | 
				
			||||||
                              // const SizedBox(
 | 
					 | 
				
			||||||
                              //   height: 48,
 | 
					 | 
				
			||||||
                              // ),
 | 
					 | 
				
			||||||
                              const Text(
 | 
					                              const Text(
 | 
				
			||||||
                                'Supported Sources:',
 | 
					                                'Supported Sources:',
 | 
				
			||||||
                              ),
 | 
					                              ),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,7 @@
 | 
				
			|||||||
import 'package:flutter/material.dart';
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
import 'package:flutter/services.dart';
 | 
					import 'package:flutter/services.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form_modal.dart';
 | 
					import 'package:obtainium/components/generated_form_modal.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/apps_provider.dart';
 | 
					import 'package:obtainium/providers/apps_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/settings_provider.dart';
 | 
					import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
@@ -18,30 +19,58 @@ class AppPage extends StatefulWidget {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class _AppPageState extends State<AppPage> {
 | 
					class _AppPageState extends State<AppPage> {
 | 
				
			||||||
 | 
					  AppInMemory? prevApp;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Widget build(BuildContext context) {
 | 
					  Widget build(BuildContext context) {
 | 
				
			||||||
    var appsProvider = context.watch<AppsProvider>();
 | 
					    var appsProvider = context.watch<AppsProvider>();
 | 
				
			||||||
    var settingsProvider = context.watch<SettingsProvider>();
 | 
					    var settingsProvider = context.watch<SettingsProvider>();
 | 
				
			||||||
 | 
					    getUpdate(String id) {
 | 
				
			||||||
 | 
					      appsProvider.checkUpdate(id).catchError((e) {
 | 
				
			||||||
 | 
					        showError(e, context);
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    var sourceProvider = SourceProvider();
 | 
					    var sourceProvider = SourceProvider();
 | 
				
			||||||
    AppInMemory? app = appsProvider.apps[widget.appId];
 | 
					    AppInMemory? app = appsProvider.apps[widget.appId];
 | 
				
			||||||
    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
 | 
					    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
 | 
				
			||||||
    if (app?.app.installedVersion != null) {
 | 
					    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
 | 
				
			||||||
      appsProvider.getUpdate(app!.app.id);
 | 
					      prevApp = app;
 | 
				
			||||||
 | 
					      getUpdate(app.app.id);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return Scaffold(
 | 
					    return Scaffold(
 | 
				
			||||||
      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
 | 
					      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
 | 
				
			||||||
      backgroundColor: Theme.of(context).colorScheme.surface,
 | 
					      backgroundColor: Theme.of(context).colorScheme.surface,
 | 
				
			||||||
      body: settingsProvider.showAppWebpage
 | 
					      body: RefreshIndicator(
 | 
				
			||||||
 | 
					          child: settingsProvider.showAppWebpage
 | 
				
			||||||
              ? WebView(
 | 
					              ? WebView(
 | 
				
			||||||
 | 
					                  backgroundColor: Theme.of(context).colorScheme.background,
 | 
				
			||||||
                  initialUrl: app?.app.url,
 | 
					                  initialUrl: app?.app.url,
 | 
				
			||||||
                  javascriptMode: JavascriptMode.unrestricted,
 | 
					                  javascriptMode: JavascriptMode.unrestricted,
 | 
				
			||||||
                )
 | 
					                )
 | 
				
			||||||
          : Column(
 | 
					              : CustomScrollView(
 | 
				
			||||||
 | 
					                  slivers: [
 | 
				
			||||||
 | 
					                    SliverFillRemaining(
 | 
				
			||||||
 | 
					                        child: Column(
 | 
				
			||||||
                      mainAxisAlignment: MainAxisAlignment.center,
 | 
					                      mainAxisAlignment: MainAxisAlignment.center,
 | 
				
			||||||
                      crossAxisAlignment: CrossAxisAlignment.stretch,
 | 
					                      crossAxisAlignment: CrossAxisAlignment.stretch,
 | 
				
			||||||
                      children: [
 | 
					                      children: [
 | 
				
			||||||
 | 
					                        app?.installedInfo != null
 | 
				
			||||||
 | 
					                            ? Row(
 | 
				
			||||||
 | 
					                                mainAxisAlignment: MainAxisAlignment.center,
 | 
				
			||||||
 | 
					                                children: [
 | 
				
			||||||
 | 
					                                    Image.memory(
 | 
				
			||||||
 | 
					                                      app!.installedInfo!.icon!,
 | 
				
			||||||
 | 
					                                      height: 150,
 | 
				
			||||||
 | 
					                                      gaplessPlayback: true,
 | 
				
			||||||
 | 
					                                    )
 | 
				
			||||||
 | 
					                                  ])
 | 
				
			||||||
 | 
					                            : Container(),
 | 
				
			||||||
 | 
					                        const SizedBox(
 | 
				
			||||||
 | 
					                          height: 25,
 | 
				
			||||||
 | 
					                        ),
 | 
				
			||||||
                        Text(
 | 
					                        Text(
 | 
				
			||||||
                  app?.app.name ?? 'App',
 | 
					                          app?.installedInfo?.name ?? app?.app.name ?? 'App',
 | 
				
			||||||
                          textAlign: TextAlign.center,
 | 
					                          textAlign: TextAlign.center,
 | 
				
			||||||
                          style: Theme.of(context).textTheme.displayLarge,
 | 
					                          style: Theme.of(context).textTheme.displayLarge,
 | 
				
			||||||
                        ),
 | 
					                        ),
 | 
				
			||||||
@@ -81,8 +110,24 @@ class _AppPageState extends State<AppPage> {
 | 
				
			|||||||
                          textAlign: TextAlign.center,
 | 
					                          textAlign: TextAlign.center,
 | 
				
			||||||
                          style: Theme.of(context).textTheme.bodyLarge,
 | 
					                          style: Theme.of(context).textTheme.bodyLarge,
 | 
				
			||||||
                        ),
 | 
					                        ),
 | 
				
			||||||
 | 
					                        const SizedBox(
 | 
				
			||||||
 | 
					                          height: 32,
 | 
				
			||||||
 | 
					                        ),
 | 
				
			||||||
 | 
					                        Text(
 | 
				
			||||||
 | 
					                          'Last Update Check: ${app?.app.lastUpdateCheck == null ? 'Never' : '\n${app?.app.lastUpdateCheck?.toLocal()}'}',
 | 
				
			||||||
 | 
					                          textAlign: TextAlign.center,
 | 
				
			||||||
 | 
					                          style: const TextStyle(
 | 
				
			||||||
 | 
					                              fontStyle: FontStyle.italic, fontSize: 12),
 | 
				
			||||||
 | 
					                        )
 | 
				
			||||||
 | 
					                      ],
 | 
				
			||||||
 | 
					                    )),
 | 
				
			||||||
                  ],
 | 
					                  ],
 | 
				
			||||||
                ),
 | 
					                ),
 | 
				
			||||||
 | 
					          onRefresh: () async {
 | 
				
			||||||
 | 
					            if (app != null) {
 | 
				
			||||||
 | 
					              getUpdate(app.app.id);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					          }),
 | 
				
			||||||
      bottomSheet: Padding(
 | 
					      bottomSheet: Padding(
 | 
				
			||||||
          padding: EdgeInsets.fromLTRB(
 | 
					          padding: EdgeInsets.fromLTRB(
 | 
				
			||||||
              0, 0, 0, MediaQuery.of(context).padding.bottom),
 | 
					              0, 0, 0, MediaQuery.of(context).padding.bottom),
 | 
				
			||||||
@@ -94,123 +139,97 @@ class _AppPageState extends State<AppPage> {
 | 
				
			|||||||
                  child: Row(
 | 
					                  child: Row(
 | 
				
			||||||
                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
 | 
					                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
 | 
				
			||||||
                      children: [
 | 
					                      children: [
 | 
				
			||||||
                        if (app?.app.installedVersion != app?.app.latestVersion)
 | 
					                        if (app?.app.installedVersion != null &&
 | 
				
			||||||
 | 
					                            app?.app.installedVersion != app?.app.latestVersion)
 | 
				
			||||||
                          IconButton(
 | 
					                          IconButton(
 | 
				
			||||||
                              onPressed: () {
 | 
					                              onPressed: app?.downloadProgress != null
 | 
				
			||||||
 | 
					                                  ? null
 | 
				
			||||||
 | 
					                                  : () {
 | 
				
			||||||
                                      showDialog(
 | 
					                                      showDialog(
 | 
				
			||||||
                                          context: context,
 | 
					                                          context: context,
 | 
				
			||||||
                                          builder: (BuildContext ctx) {
 | 
					                                          builder: (BuildContext ctx) {
 | 
				
			||||||
                                            return AlertDialog(
 | 
					                                            return AlertDialog(
 | 
				
			||||||
                                        title: Text(
 | 
					                                              title: const Text(
 | 
				
			||||||
                                            'App Already ${app?.app.installedVersion == null ? 'Installed' : 'Updated'}?'),
 | 
					                                                  'App Already up to Date?'),
 | 
				
			||||||
                                              actions: [
 | 
					                                              actions: [
 | 
				
			||||||
                                                TextButton(
 | 
					                                                TextButton(
 | 
				
			||||||
                                                    onPressed: () {
 | 
					                                                    onPressed: () {
 | 
				
			||||||
                                                Navigator.of(context).pop();
 | 
					                                                      Navigator.of(context)
 | 
				
			||||||
 | 
					                                                          .pop();
 | 
				
			||||||
                                                    },
 | 
					                                                    },
 | 
				
			||||||
                                                    child: const Text('No')),
 | 
					                                                    child: const Text('No')),
 | 
				
			||||||
                                                TextButton(
 | 
					                                                TextButton(
 | 
				
			||||||
                                                    onPressed: () {
 | 
					                                                    onPressed: () {
 | 
				
			||||||
                                                HapticFeedback.selectionClick();
 | 
					                                                      HapticFeedback
 | 
				
			||||||
 | 
					                                                          .selectionClick();
 | 
				
			||||||
                                                      var updatedApp = app?.app;
 | 
					                                                      var updatedApp = app?.app;
 | 
				
			||||||
                                                      if (updatedApp != null) {
 | 
					                                                      if (updatedApp != null) {
 | 
				
			||||||
                                                  updatedApp.installedVersion =
 | 
					                                                        updatedApp
 | 
				
			||||||
                                                      updatedApp.latestVersion;
 | 
					                                                                .installedVersion =
 | 
				
			||||||
                                                  appsProvider
 | 
					                                                            updatedApp
 | 
				
			||||||
                                                      .saveApp(updatedApp);
 | 
					                                                                .latestVersion;
 | 
				
			||||||
 | 
					                                                        appsProvider.saveApps(
 | 
				
			||||||
 | 
					                                                            [updatedApp]);
 | 
				
			||||||
                                                      }
 | 
					                                                      }
 | 
				
			||||||
                                                Navigator.of(context).pop();
 | 
					                                                      Navigator.of(context)
 | 
				
			||||||
 | 
					                                                          .pop();
 | 
				
			||||||
                                                    },
 | 
					                                                    },
 | 
				
			||||||
                                                    child: const Text(
 | 
					                                                    child: const Text(
 | 
				
			||||||
                                                  'Yes, Mark as Installed'))
 | 
					                                                        'Yes, Mark as Updated'))
 | 
				
			||||||
                                              ],
 | 
					                                              ],
 | 
				
			||||||
                                            );
 | 
					                                            );
 | 
				
			||||||
                                          });
 | 
					                                          });
 | 
				
			||||||
                                    },
 | 
					                                    },
 | 
				
			||||||
                              tooltip: 'Mark as Installed',
 | 
					                              tooltip: 'Mark as Updated',
 | 
				
			||||||
                              icon: const Icon(Icons.done))
 | 
					                              icon: const Icon(Icons.done)),
 | 
				
			||||||
                        else
 | 
					 | 
				
			||||||
                          IconButton(
 | 
					 | 
				
			||||||
                              onPressed: () {
 | 
					 | 
				
			||||||
                                showDialog(
 | 
					 | 
				
			||||||
                                    context: context,
 | 
					 | 
				
			||||||
                                    builder: (BuildContext ctx) {
 | 
					 | 
				
			||||||
                                      return AlertDialog(
 | 
					 | 
				
			||||||
                                        title: const Text('App Not Installed?'),
 | 
					 | 
				
			||||||
                                        actions: [
 | 
					 | 
				
			||||||
                                          TextButton(
 | 
					 | 
				
			||||||
                                              onPressed: () {
 | 
					 | 
				
			||||||
                                                Navigator.of(context).pop();
 | 
					 | 
				
			||||||
                                              },
 | 
					 | 
				
			||||||
                                              child: const Text('No')),
 | 
					 | 
				
			||||||
                                          TextButton(
 | 
					 | 
				
			||||||
                                              onPressed: () {
 | 
					 | 
				
			||||||
                                                HapticFeedback.selectionClick();
 | 
					 | 
				
			||||||
                                                var updatedApp = app?.app;
 | 
					 | 
				
			||||||
                                                if (updatedApp != null) {
 | 
					 | 
				
			||||||
                                                  updatedApp.installedVersion =
 | 
					 | 
				
			||||||
                                                      null;
 | 
					 | 
				
			||||||
                                                  appsProvider
 | 
					 | 
				
			||||||
                                                      .saveApp(updatedApp);
 | 
					 | 
				
			||||||
                                                }
 | 
					 | 
				
			||||||
                                                Navigator.of(context).pop();
 | 
					 | 
				
			||||||
                                              },
 | 
					 | 
				
			||||||
                                              child: const Text(
 | 
					 | 
				
			||||||
                                                  'Yes, Mark as Not Installed'))
 | 
					 | 
				
			||||||
                                        ],
 | 
					 | 
				
			||||||
                                      );
 | 
					 | 
				
			||||||
                                    });
 | 
					 | 
				
			||||||
                              },
 | 
					 | 
				
			||||||
                              tooltip: 'Mark as Not Installed',
 | 
					 | 
				
			||||||
                              icon: const Icon(Icons.no_cell_outlined)),
 | 
					 | 
				
			||||||
                        if (source != null &&
 | 
					                        if (source != null &&
 | 
				
			||||||
                            source.additionalDataFormItems.isNotEmpty)
 | 
					                            source.additionalDataFormItems.isNotEmpty)
 | 
				
			||||||
                          IconButton(
 | 
					                          IconButton(
 | 
				
			||||||
                              onPressed: () {
 | 
					                              onPressed: app?.downloadProgress != null
 | 
				
			||||||
                                showDialog(
 | 
					                                  ? null
 | 
				
			||||||
 | 
					                                  : () {
 | 
				
			||||||
 | 
					                                      showDialog<List<String>>(
 | 
				
			||||||
                                          context: context,
 | 
					                                          context: context,
 | 
				
			||||||
                                          builder: (BuildContext ctx) {
 | 
					                                          builder: (BuildContext ctx) {
 | 
				
			||||||
                                            return GeneratedFormModal(
 | 
					                                            return GeneratedFormModal(
 | 
				
			||||||
                                                title: 'Additional Options',
 | 
					                                                title: 'Additional Options',
 | 
				
			||||||
                                          items: source.additionalDataFormItems,
 | 
					                                                items: source
 | 
				
			||||||
                                          defaultValues:
 | 
					                                                    .additionalDataFormItems,
 | 
				
			||||||
                                              source.additionalDataDefaults);
 | 
					                                                defaultValues: app != null
 | 
				
			||||||
 | 
					                                                    ? app.app.additionalData
 | 
				
			||||||
 | 
					                                                    : source
 | 
				
			||||||
 | 
					                                                        .additionalDataDefaults);
 | 
				
			||||||
                                          }).then((values) {
 | 
					                                          }).then((values) {
 | 
				
			||||||
                                        if (app != null && values != null) {
 | 
					                                        if (app != null && values != null) {
 | 
				
			||||||
                                          var changedApp = app.app;
 | 
					                                          var changedApp = app.app;
 | 
				
			||||||
                                          changedApp.additionalData = values;
 | 
					                                          changedApp.additionalData = values;
 | 
				
			||||||
                                    sourceProvider
 | 
					                                          appsProvider.saveApps(
 | 
				
			||||||
                                        .getApp(source, changedApp.url,
 | 
					                                              [changedApp]).then((value) {
 | 
				
			||||||
                                            changedApp.additionalData)
 | 
					                                            getUpdate(changedApp.id);
 | 
				
			||||||
                                        .then((finalChangedApp) {
 | 
					 | 
				
			||||||
                                      appsProvider.saveApp(finalChangedApp);
 | 
					 | 
				
			||||||
                                    }).catchError((e) {
 | 
					 | 
				
			||||||
                                      ScaffoldMessenger.of(context)
 | 
					 | 
				
			||||||
                                          .showSnackBar(
 | 
					 | 
				
			||||||
                                        SnackBar(content: Text(e.toString())),
 | 
					 | 
				
			||||||
                                      );
 | 
					 | 
				
			||||||
                                          });
 | 
					                                          });
 | 
				
			||||||
                                        }
 | 
					                                        }
 | 
				
			||||||
                                      });
 | 
					                                      });
 | 
				
			||||||
                                    },
 | 
					                                    },
 | 
				
			||||||
 | 
					                              tooltip: 'Additional Options',
 | 
				
			||||||
                              icon: const Icon(Icons.settings)),
 | 
					                              icon: const Icon(Icons.settings)),
 | 
				
			||||||
                        const SizedBox(width: 16.0),
 | 
					                        const SizedBox(width: 16.0),
 | 
				
			||||||
                        Expanded(
 | 
					                        Expanded(
 | 
				
			||||||
                            child: ElevatedButton(
 | 
					                            child: ElevatedButton(
 | 
				
			||||||
                                onPressed: (app?.app.installedVersion == null ||
 | 
					                                onPressed: (app?.app.installedVersion == null ||
 | 
				
			||||||
                                            appsProvider
 | 
					                                            app?.app.installedVersion !=
 | 
				
			||||||
                                                .checkAppObjectForUpdate(
 | 
					                                                app?.app.latestVersion) &&
 | 
				
			||||||
                                                    app!.app)) &&
 | 
					 | 
				
			||||||
                                        !appsProvider.areDownloadsRunning()
 | 
					                                        !appsProvider.areDownloadsRunning()
 | 
				
			||||||
                                    ? () {
 | 
					                                    ? () {
 | 
				
			||||||
                                        HapticFeedback.heavyImpact();
 | 
					                                        HapticFeedback.heavyImpact();
 | 
				
			||||||
                                        appsProvider
 | 
					                                        appsProvider
 | 
				
			||||||
                                            .downloadAndInstallLatestApp(
 | 
					                                            .downloadAndInstallLatestApps(
 | 
				
			||||||
                                                [app!.app.id],
 | 
					                                                [app!.app.id],
 | 
				
			||||||
                                                context).then((res) {
 | 
					                                                context).then((res) {
 | 
				
			||||||
                                          if (res && mounted) {
 | 
					                                          if (res.isNotEmpty && mounted) {
 | 
				
			||||||
                                            Navigator.of(context).pop();
 | 
					                                            Navigator.of(context).pop();
 | 
				
			||||||
                                          }
 | 
					                                          }
 | 
				
			||||||
 | 
					                                        }).catchError((e) {
 | 
				
			||||||
 | 
					                                          showError(e, context);
 | 
				
			||||||
                                        });
 | 
					                                        });
 | 
				
			||||||
                                      }
 | 
					                                      }
 | 
				
			||||||
                                    : null,
 | 
					                                    : null,
 | 
				
			||||||
@@ -228,15 +247,14 @@ class _AppPageState extends State<AppPage> {
 | 
				
			|||||||
                                        return AlertDialog(
 | 
					                                        return AlertDialog(
 | 
				
			||||||
                                          title: const Text('Remove App?'),
 | 
					                                          title: const Text('Remove App?'),
 | 
				
			||||||
                                          content: Text(
 | 
					                                          content: Text(
 | 
				
			||||||
                                              'This will remove \'${app?.app.name}\' from Obtainium.${app?.app.installedVersion != null ? '\n\nNote that while Obtainium will no longer track its updates, the App will remain installed.' : ''}'),
 | 
					                                              'This will remove \'${app?.installedInfo?.name ?? app?.app.name}\' from Obtainium.${app?.app.installedVersion != null ? '\n\nNote that while Obtainium will no longer track its updates, the App will remain installed.' : ''}'),
 | 
				
			||||||
                                          actions: [
 | 
					                                          actions: [
 | 
				
			||||||
                                            TextButton(
 | 
					                                            TextButton(
 | 
				
			||||||
                                                onPressed: () {
 | 
					                                                onPressed: () {
 | 
				
			||||||
                                                  HapticFeedback
 | 
					                                                  HapticFeedback
 | 
				
			||||||
                                                      .selectionClick();
 | 
					                                                      .selectionClick();
 | 
				
			||||||
                                                  appsProvider
 | 
					                                                  appsProvider.removeApps(
 | 
				
			||||||
                                                      .removeApp(app!.app.id)
 | 
					                                                      [app!.app.id]).then((_) {
 | 
				
			||||||
                                                      .then((_) {
 | 
					 | 
				
			||||||
                                                    int count = 0;
 | 
					                                                    int count = 0;
 | 
				
			||||||
                                                    Navigator.of(context)
 | 
					                                                    Navigator.of(context)
 | 
				
			||||||
                                                        .popUntil((_) =>
 | 
					                                                        .popUntil((_) =>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,32 +3,79 @@ import 'package:flutter/services.dart';
 | 
				
			|||||||
import 'package:obtainium/components/custom_app_bar.dart';
 | 
					import 'package:obtainium/components/custom_app_bar.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form_modal.dart';
 | 
					import 'package:obtainium/components/generated_form_modal.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/pages/app.dart';
 | 
					import 'package:obtainium/pages/app.dart';
 | 
				
			||||||
import 'package:obtainium/providers/apps_provider.dart';
 | 
					import 'package:obtainium/providers/apps_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/settings_provider.dart';
 | 
					import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
import 'package:provider/provider.dart';
 | 
					import 'package:provider/provider.dart';
 | 
				
			||||||
 | 
					import 'package:share_plus/share_plus.dart';
 | 
				
			||||||
 | 
					import 'package:url_launcher/url_launcher_string.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class AppsPage extends StatefulWidget {
 | 
					class AppsPage extends StatefulWidget {
 | 
				
			||||||
  const AppsPage({super.key});
 | 
					  const AppsPage({super.key});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  State<AppsPage> createState() => _AppsPageState();
 | 
					  State<AppsPage> createState() => AppsPageState();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class _AppsPageState extends State<AppsPage> {
 | 
					class AppsPageState extends State<AppsPage> {
 | 
				
			||||||
  AppsFilter? filter;
 | 
					  AppsFilter? filter;
 | 
				
			||||||
 | 
					  var updatesOnlyFilter =
 | 
				
			||||||
 | 
					      AppsFilter(includeUptodate: false, includeNonInstalled: false);
 | 
				
			||||||
 | 
					  Set<String> selectedIds = {};
 | 
				
			||||||
 | 
					  DateTime? refreshingSince;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  clearSelected() {
 | 
				
			||||||
 | 
					    if (selectedIds.isNotEmpty) {
 | 
				
			||||||
 | 
					      setState(() {
 | 
				
			||||||
 | 
					        selectedIds.clear();
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
 | 
					      return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  selectThese(List<String> appIds) {
 | 
				
			||||||
 | 
					    if (selectedIds.isEmpty) {
 | 
				
			||||||
 | 
					      setState(() {
 | 
				
			||||||
 | 
					        for (var a in appIds) {
 | 
				
			||||||
 | 
					          selectedIds.add(a);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Widget build(BuildContext context) {
 | 
					  Widget build(BuildContext context) {
 | 
				
			||||||
    var appsProvider = context.watch<AppsProvider>();
 | 
					    var appsProvider = context.watch<AppsProvider>();
 | 
				
			||||||
    var settingsProvider = context.watch<SettingsProvider>();
 | 
					    var settingsProvider = context.watch<SettingsProvider>();
 | 
				
			||||||
    var existingUpdateAppIds = appsProvider.getExistingUpdates();
 | 
					 | 
				
			||||||
    var sortedApps = appsProvider.apps.values.toList();
 | 
					    var sortedApps = appsProvider.apps.values.toList();
 | 
				
			||||||
 | 
					    var currentFilterIsUpdatesOnly =
 | 
				
			||||||
 | 
					        filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    selectedIds = selectedIds
 | 
				
			||||||
 | 
					        .where((element) => sortedApps.map((e) => e.app.id).contains(element))
 | 
				
			||||||
 | 
					        .toSet();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    toggleAppSelected(String appId) {
 | 
				
			||||||
 | 
					      setState(() {
 | 
				
			||||||
 | 
					        if (selectedIds.contains(appId)) {
 | 
				
			||||||
 | 
					          selectedIds.remove(appId);
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					          selectedIds.add(appId);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (filter != null) {
 | 
					    if (filter != null) {
 | 
				
			||||||
      sortedApps = sortedApps.where((app) {
 | 
					      sortedApps = sortedApps.where((app) {
 | 
				
			||||||
        if (app.app.installedVersion == app.app.latestVersion &&
 | 
					        if (app.app.installedVersion == app.app.latestVersion &&
 | 
				
			||||||
            filter!.onlyNonLatest) {
 | 
					            !(filter!.includeUptodate)) {
 | 
				
			||||||
 | 
					          return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if (app.app.installedVersion == null &&
 | 
				
			||||||
 | 
					            !(filter!.includeNonInstalled)) {
 | 
				
			||||||
          return false;
 | 
					          return false;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) {
 | 
					        if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) {
 | 
				
			||||||
@@ -44,7 +91,8 @@ class _AppsPageState extends State<AppsPage> {
 | 
				
			|||||||
            .toList();
 | 
					            .toList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for (var t in nameTokens) {
 | 
					        for (var t in nameTokens) {
 | 
				
			||||||
          if (!app.app.name.toLowerCase().contains(t.toLowerCase())) {
 | 
					          var name = app.installedInfo?.name ?? app.app.name;
 | 
				
			||||||
 | 
					          if (!name.toLowerCase().contains(t.toLowerCase())) {
 | 
				
			||||||
            return false;
 | 
					            return false;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@@ -58,100 +106,61 @@ class _AppsPageState extends State<AppsPage> {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    sortedApps.sort((a, b) {
 | 
					    sortedApps.sort((a, b) {
 | 
				
			||||||
 | 
					      var nameA = a.installedInfo?.name ?? a.app.name;
 | 
				
			||||||
 | 
					      var nameB = b.installedInfo?.name ?? b.app.name;
 | 
				
			||||||
      int result = 0;
 | 
					      int result = 0;
 | 
				
			||||||
      if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
 | 
					      if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
 | 
				
			||||||
        result =
 | 
					        result = (a.app.author + nameA).compareTo(b.app.author + nameB);
 | 
				
			||||||
            (a.app.author + a.app.name).compareTo(b.app.author + b.app.name);
 | 
					 | 
				
			||||||
      } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
 | 
					      } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
 | 
				
			||||||
        result =
 | 
					        result = (nameA + a.app.author).compareTo(nameB + b.app.author);
 | 
				
			||||||
            (a.app.name + a.app.author).compareTo(b.app.name + b.app.author);
 | 
					 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      return result;
 | 
					      return result;
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (settingsProvider.sortOrder == SortOrderSettings.ascending) {
 | 
					    if (settingsProvider.sortOrder == SortOrderSettings.descending) {
 | 
				
			||||||
      sortedApps = sortedApps.reversed.toList();
 | 
					      sortedApps = sortedApps.reversed.toList();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    var existingUpdateIdsAllOrSelected = existingUpdates
 | 
				
			||||||
 | 
					        .where((element) => selectedIds.isEmpty
 | 
				
			||||||
 | 
					            ? sortedApps.where((a) => a.app.id == element).isNotEmpty
 | 
				
			||||||
 | 
					            : selectedIds.contains(element))
 | 
				
			||||||
 | 
					        .toList();
 | 
				
			||||||
 | 
					    var newInstallIdsAllOrSelected = appsProvider
 | 
				
			||||||
 | 
					        .findExistingUpdates(nonInstalledOnly: true)
 | 
				
			||||||
 | 
					        .where((element) => selectedIds.isEmpty
 | 
				
			||||||
 | 
					            ? sortedApps.where((a) => a.app.id == element).isNotEmpty
 | 
				
			||||||
 | 
					            : selectedIds.contains(element))
 | 
				
			||||||
 | 
					        .toList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (settingsProvider.pinUpdates) {
 | 
				
			||||||
 | 
					      var temp = [];
 | 
				
			||||||
 | 
					      sortedApps = sortedApps.where((sa) {
 | 
				
			||||||
 | 
					        if (existingUpdates.contains(sa.app.id)) {
 | 
				
			||||||
 | 
					          temp.add(sa);
 | 
				
			||||||
 | 
					          return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					      }).toList();
 | 
				
			||||||
 | 
					      sortedApps = [...temp, ...sortedApps];
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return Scaffold(
 | 
					    return Scaffold(
 | 
				
			||||||
      backgroundColor: Theme.of(context).colorScheme.surface,
 | 
					      backgroundColor: Theme.of(context).colorScheme.surface,
 | 
				
			||||||
        floatingActionButton:
 | 
					 | 
				
			||||||
            Row(mainAxisAlignment: MainAxisAlignment.end, children: [
 | 
					 | 
				
			||||||
          existingUpdateAppIds.isEmpty || filter != null
 | 
					 | 
				
			||||||
              ? const SizedBox()
 | 
					 | 
				
			||||||
              : ElevatedButton.icon(
 | 
					 | 
				
			||||||
                  onPressed: appsProvider.areDownloadsRunning()
 | 
					 | 
				
			||||||
                      ? null
 | 
					 | 
				
			||||||
                      : () {
 | 
					 | 
				
			||||||
                          HapticFeedback.heavyImpact();
 | 
					 | 
				
			||||||
                          settingsProvider.getInstallPermission().then((_) {
 | 
					 | 
				
			||||||
                            appsProvider.downloadAndInstallLatestApp(
 | 
					 | 
				
			||||||
                                existingUpdateAppIds, context);
 | 
					 | 
				
			||||||
                          });
 | 
					 | 
				
			||||||
                        },
 | 
					 | 
				
			||||||
                  icon: const Icon(Icons.install_mobile_outlined),
 | 
					 | 
				
			||||||
                  label: const Text('Install All')),
 | 
					 | 
				
			||||||
          const SizedBox(
 | 
					 | 
				
			||||||
            width: 16,
 | 
					 | 
				
			||||||
          ),
 | 
					 | 
				
			||||||
          appsProvider.apps.isEmpty
 | 
					 | 
				
			||||||
              ? const SizedBox()
 | 
					 | 
				
			||||||
              : ElevatedButton.icon(
 | 
					 | 
				
			||||||
                  onPressed: () {
 | 
					 | 
				
			||||||
                    showDialog<List<String>?>(
 | 
					 | 
				
			||||||
                        context: context,
 | 
					 | 
				
			||||||
                        builder: (BuildContext ctx) {
 | 
					 | 
				
			||||||
                          return GeneratedFormModal(
 | 
					 | 
				
			||||||
                              title: 'Filter Apps',
 | 
					 | 
				
			||||||
                              items: [
 | 
					 | 
				
			||||||
                                [
 | 
					 | 
				
			||||||
                                  GeneratedFormItem(
 | 
					 | 
				
			||||||
                                      label: "App Name", required: false),
 | 
					 | 
				
			||||||
                                  GeneratedFormItem(
 | 
					 | 
				
			||||||
                                      label: "Author", required: false)
 | 
					 | 
				
			||||||
                                ],
 | 
					 | 
				
			||||||
                                [
 | 
					 | 
				
			||||||
                                  GeneratedFormItem(
 | 
					 | 
				
			||||||
                                      label: "Ignore Up-to-Date Apps",
 | 
					 | 
				
			||||||
                                      type: FormItemType.bool)
 | 
					 | 
				
			||||||
                                ]
 | 
					 | 
				
			||||||
                              ],
 | 
					 | 
				
			||||||
                              defaultValues: filter == null
 | 
					 | 
				
			||||||
                                  ? []
 | 
					 | 
				
			||||||
                                  : [
 | 
					 | 
				
			||||||
                                      filter!.nameFilter,
 | 
					 | 
				
			||||||
                                      filter!.authorFilter,
 | 
					 | 
				
			||||||
                                      filter!.onlyNonLatest ? 'true' : ''
 | 
					 | 
				
			||||||
                                    ]);
 | 
					 | 
				
			||||||
                        }).then((values) {
 | 
					 | 
				
			||||||
                      if (values != null &&
 | 
					 | 
				
			||||||
                          values
 | 
					 | 
				
			||||||
                              .where((element) => element.isNotEmpty)
 | 
					 | 
				
			||||||
                              .isNotEmpty) {
 | 
					 | 
				
			||||||
                        setState(() {
 | 
					 | 
				
			||||||
                          filter = AppsFilter(
 | 
					 | 
				
			||||||
                              nameFilter: values[0],
 | 
					 | 
				
			||||||
                              authorFilter: values[1],
 | 
					 | 
				
			||||||
                              onlyNonLatest: values[2] == "true");
 | 
					 | 
				
			||||||
                        });
 | 
					 | 
				
			||||||
                      } else {
 | 
					 | 
				
			||||||
                        setState(() {
 | 
					 | 
				
			||||||
                          filter = null;
 | 
					 | 
				
			||||||
                        });
 | 
					 | 
				
			||||||
                      }
 | 
					 | 
				
			||||||
                    });
 | 
					 | 
				
			||||||
                  },
 | 
					 | 
				
			||||||
                  label: Text(filter == null ? 'Search' : 'Modify Search'),
 | 
					 | 
				
			||||||
                  icon: Icon(
 | 
					 | 
				
			||||||
                      filter == null ? Icons.search : Icons.manage_search)),
 | 
					 | 
				
			||||||
        ]),
 | 
					 | 
				
			||||||
      body: RefreshIndicator(
 | 
					      body: RefreshIndicator(
 | 
				
			||||||
          onRefresh: () {
 | 
					          onRefresh: () {
 | 
				
			||||||
            HapticFeedback.lightImpact();
 | 
					            HapticFeedback.lightImpact();
 | 
				
			||||||
 | 
					            setState(() {
 | 
				
			||||||
 | 
					              refreshingSince = DateTime.now();
 | 
				
			||||||
 | 
					            });
 | 
				
			||||||
            return appsProvider.checkUpdates().catchError((e) {
 | 
					            return appsProvider.checkUpdates().catchError((e) {
 | 
				
			||||||
                ScaffoldMessenger.of(context).showSnackBar(
 | 
					              showError(e, context);
 | 
				
			||||||
                  SnackBar(content: Text(e.toString())),
 | 
					            }).whenComplete(() {
 | 
				
			||||||
                );
 | 
					              setState(() {
 | 
				
			||||||
 | 
					                refreshingSince = null;
 | 
				
			||||||
 | 
					              });
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
          child: CustomScrollView(slivers: <Widget>[
 | 
					          child: CustomScrollView(slivers: <Widget>[
 | 
				
			||||||
@@ -164,15 +173,39 @@ class _AppsPageState extends State<AppsPage> {
 | 
				
			|||||||
                          : Text(
 | 
					                          : Text(
 | 
				
			||||||
                              appsProvider.apps.isEmpty
 | 
					                              appsProvider.apps.isEmpty
 | 
				
			||||||
                                  ? 'No Apps'
 | 
					                                  ? 'No Apps'
 | 
				
			||||||
                                    : 'No Search Results',
 | 
					                                  : 'No Apps for Filter',
 | 
				
			||||||
                                style:
 | 
					                              style: Theme.of(context).textTheme.headlineMedium,
 | 
				
			||||||
                                    Theme.of(context).textTheme.headlineMedium,
 | 
					                              textAlign: TextAlign.center,
 | 
				
			||||||
                            ))),
 | 
					                            ))),
 | 
				
			||||||
 | 
					            if (refreshingSince != null)
 | 
				
			||||||
 | 
					              SliverToBoxAdapter(
 | 
				
			||||||
 | 
					                child: LinearProgressIndicator(
 | 
				
			||||||
 | 
					                  value: appsProvider.apps.values
 | 
				
			||||||
 | 
					                          .where((element) => !(element.app.lastUpdateCheck
 | 
				
			||||||
 | 
					                                  ?.isBefore(refreshingSince!) ??
 | 
				
			||||||
 | 
					                              true))
 | 
				
			||||||
 | 
					                          .length /
 | 
				
			||||||
 | 
					                      appsProvider.apps.length,
 | 
				
			||||||
 | 
					                ),
 | 
				
			||||||
 | 
					              ),
 | 
				
			||||||
            SliverList(
 | 
					            SliverList(
 | 
				
			||||||
                delegate: SliverChildBuilderDelegate(
 | 
					                delegate: SliverChildBuilderDelegate(
 | 
				
			||||||
                    (BuildContext context, int index) {
 | 
					                    (BuildContext context, int index) {
 | 
				
			||||||
              return ListTile(
 | 
					              return ListTile(
 | 
				
			||||||
                  title: Text(sortedApps[index].app.name),
 | 
					                selectedTileColor:
 | 
				
			||||||
 | 
					                    Theme.of(context).colorScheme.primary.withOpacity(0.1),
 | 
				
			||||||
 | 
					                selected: selectedIds.contains(sortedApps[index].app.id),
 | 
				
			||||||
 | 
					                onLongPress: () {
 | 
				
			||||||
 | 
					                  toggleAppSelected(sortedApps[index].app.id);
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                leading: sortedApps[index].installedInfo != null
 | 
				
			||||||
 | 
					                    ? Image.memory(
 | 
				
			||||||
 | 
					                        sortedApps[index].installedInfo!.icon!,
 | 
				
			||||||
 | 
					                        gaplessPlayback: true,
 | 
				
			||||||
 | 
					                      )
 | 
				
			||||||
 | 
					                    : null,
 | 
				
			||||||
 | 
					                title: Text(sortedApps[index].installedInfo?.name ??
 | 
				
			||||||
 | 
					                    sortedApps[index].app.name),
 | 
				
			||||||
                subtitle: Text('By ${sortedApps[index].app.author}'),
 | 
					                subtitle: Text('By ${sortedApps[index].app.author}'),
 | 
				
			||||||
                trailing: sortedApps[index].downloadProgress != null
 | 
					                trailing: sortedApps[index].downloadProgress != null
 | 
				
			||||||
                    ? Text(
 | 
					                    ? Text(
 | 
				
			||||||
@@ -180,30 +213,388 @@ class _AppsPageState extends State<AppsPage> {
 | 
				
			|||||||
                    : (sortedApps[index].app.installedVersion != null &&
 | 
					                    : (sortedApps[index].app.installedVersion != null &&
 | 
				
			||||||
                            sortedApps[index].app.installedVersion !=
 | 
					                            sortedApps[index].app.installedVersion !=
 | 
				
			||||||
                                sortedApps[index].app.latestVersion
 | 
					                                sortedApps[index].app.latestVersion
 | 
				
			||||||
                          ? const Text('Update Available')
 | 
					                        ? Column(
 | 
				
			||||||
                          : Text(sortedApps[index].app.installedVersion ??
 | 
					                            mainAxisAlignment: MainAxisAlignment.center,
 | 
				
			||||||
                              'Not Installed')),
 | 
					                            crossAxisAlignment: CrossAxisAlignment.end,
 | 
				
			||||||
 | 
					                            children: [
 | 
				
			||||||
 | 
					                              Text(appsProvider.areDownloadsRunning()
 | 
				
			||||||
 | 
					                                  ? 'Please Wait...'
 | 
				
			||||||
 | 
					                                  : 'Update Available'),
 | 
				
			||||||
 | 
					                              SourceProvider()
 | 
				
			||||||
 | 
					                                          .getSource(sortedApps[index].app.url)
 | 
				
			||||||
 | 
					                                          .changeLogPageFromStandardUrl(
 | 
				
			||||||
 | 
					                                              sortedApps[index].app.url) ==
 | 
				
			||||||
 | 
					                                      null
 | 
				
			||||||
 | 
					                                  ? const SizedBox()
 | 
				
			||||||
 | 
					                                  : GestureDetector(
 | 
				
			||||||
                                      onTap: () {
 | 
					                                      onTap: () {
 | 
				
			||||||
 | 
					                                        launchUrlString(
 | 
				
			||||||
 | 
					                                            SourceProvider()
 | 
				
			||||||
 | 
					                                                .getSource(
 | 
				
			||||||
 | 
					                                                    sortedApps[index].app.url)
 | 
				
			||||||
 | 
					                                                .changeLogPageFromStandardUrl(
 | 
				
			||||||
 | 
					                                                    sortedApps[index].app.url)!,
 | 
				
			||||||
 | 
					                                            mode:
 | 
				
			||||||
 | 
					                                                LaunchMode.externalApplication);
 | 
				
			||||||
 | 
					                                      },
 | 
				
			||||||
 | 
					                                      child: const Text(
 | 
				
			||||||
 | 
					                                        'See Changes',
 | 
				
			||||||
 | 
					                                        style: TextStyle(
 | 
				
			||||||
 | 
					                                            fontStyle: FontStyle.italic,
 | 
				
			||||||
 | 
					                                            decoration:
 | 
				
			||||||
 | 
					                                                TextDecoration.underline),
 | 
				
			||||||
 | 
					                                      )),
 | 
				
			||||||
 | 
					                            ],
 | 
				
			||||||
 | 
					                          )
 | 
				
			||||||
 | 
					                        : SingleChildScrollView(
 | 
				
			||||||
 | 
					                            child: SizedBox(
 | 
				
			||||||
 | 
					                                width: 80,
 | 
				
			||||||
 | 
					                                child: Text(
 | 
				
			||||||
 | 
					                                  sortedApps[index].app.installedVersion ??
 | 
				
			||||||
 | 
					                                      'Not Installed',
 | 
				
			||||||
 | 
					                                  overflow: TextOverflow.fade,
 | 
				
			||||||
 | 
					                                  textAlign: TextAlign.end,
 | 
				
			||||||
 | 
					                                )))),
 | 
				
			||||||
 | 
					                onTap: () {
 | 
				
			||||||
 | 
					                  if (selectedIds.isNotEmpty) {
 | 
				
			||||||
 | 
					                    toggleAppSelected(sortedApps[index].app.id);
 | 
				
			||||||
 | 
					                  } else {
 | 
				
			||||||
                    Navigator.push(
 | 
					                    Navigator.push(
 | 
				
			||||||
                      context,
 | 
					                      context,
 | 
				
			||||||
                      MaterialPageRoute(
 | 
					                      MaterialPageRoute(
 | 
				
			||||||
                          builder: (context) =>
 | 
					                          builder: (context) =>
 | 
				
			||||||
                              AppPage(appId: sortedApps[index].app.id)),
 | 
					                              AppPage(appId: sortedApps[index].app.id)),
 | 
				
			||||||
                    );
 | 
					                    );
 | 
				
			||||||
 | 
					                  }
 | 
				
			||||||
                },
 | 
					                },
 | 
				
			||||||
              );
 | 
					              );
 | 
				
			||||||
            }, childCount: sortedApps.length))
 | 
					            }, childCount: sortedApps.length))
 | 
				
			||||||
            ])));
 | 
					          ])),
 | 
				
			||||||
 | 
					      persistentFooterButtons: [
 | 
				
			||||||
 | 
					        Row(
 | 
				
			||||||
 | 
					          children: [
 | 
				
			||||||
 | 
					            IconButton(
 | 
				
			||||||
 | 
					                onPressed: () {
 | 
				
			||||||
 | 
					                  selectedIds.isEmpty
 | 
				
			||||||
 | 
					                      ? selectThese(sortedApps.map((e) => e.app.id).toList())
 | 
				
			||||||
 | 
					                      : clearSelected();
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                icon: Icon(
 | 
				
			||||||
 | 
					                  selectedIds.isEmpty
 | 
				
			||||||
 | 
					                      ? Icons.select_all_outlined
 | 
				
			||||||
 | 
					                      : Icons.deselect_outlined,
 | 
				
			||||||
 | 
					                  color: Theme.of(context).colorScheme.primary,
 | 
				
			||||||
 | 
					                ),
 | 
				
			||||||
 | 
					                tooltip: selectedIds.isEmpty
 | 
				
			||||||
 | 
					                    ? 'Select All'
 | 
				
			||||||
 | 
					                    : 'Deselect ${selectedIds.length.toString()}'),
 | 
				
			||||||
 | 
					            const VerticalDivider(),
 | 
				
			||||||
 | 
					            Expanded(
 | 
				
			||||||
 | 
					                child: Row(
 | 
				
			||||||
 | 
					              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
 | 
				
			||||||
 | 
					              children: [
 | 
				
			||||||
 | 
					                selectedIds.isEmpty
 | 
				
			||||||
 | 
					                    ? const SizedBox()
 | 
				
			||||||
 | 
					                    : IconButton(
 | 
				
			||||||
 | 
					                        visualDensity: VisualDensity.compact,
 | 
				
			||||||
 | 
					                        onPressed: () {
 | 
				
			||||||
 | 
					                          showDialog<List<String>?>(
 | 
				
			||||||
 | 
					                              context: context,
 | 
				
			||||||
 | 
					                              builder: (BuildContext ctx) {
 | 
				
			||||||
 | 
					                                return GeneratedFormModal(
 | 
				
			||||||
 | 
					                                  title: 'Remove Selected Apps?',
 | 
				
			||||||
 | 
					                                  items: const [],
 | 
				
			||||||
 | 
					                                  defaultValues: const [],
 | 
				
			||||||
 | 
					                                  initValid: true,
 | 
				
			||||||
 | 
					                                  message:
 | 
				
			||||||
 | 
					                                      '${selectedIds.length} App${selectedIds.length == 1 ? '' : 's'} will be removed from Obtainium but remain installed. You still need to uninstall ${selectedIds.length == 1 ? 'it' : 'them'} manually.',
 | 
				
			||||||
 | 
					                                );
 | 
				
			||||||
 | 
					                              }).then((values) {
 | 
				
			||||||
 | 
					                            if (values != null) {
 | 
				
			||||||
 | 
					                              appsProvider.removeApps(selectedIds.toList());
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                          });
 | 
				
			||||||
 | 
					                        },
 | 
				
			||||||
 | 
					                        tooltip: 'Remove Selected Apps',
 | 
				
			||||||
 | 
					                        icon: const Icon(Icons.delete_outline_outlined),
 | 
				
			||||||
 | 
					                      ),
 | 
				
			||||||
 | 
					                IconButton(
 | 
				
			||||||
 | 
					                    visualDensity: VisualDensity.compact,
 | 
				
			||||||
 | 
					                    onPressed: appsProvider.areDownloadsRunning() ||
 | 
				
			||||||
 | 
					                            (existingUpdateIdsAllOrSelected.isEmpty &&
 | 
				
			||||||
 | 
					                                newInstallIdsAllOrSelected.isEmpty)
 | 
				
			||||||
 | 
					                        ? null
 | 
				
			||||||
 | 
					                        : () {
 | 
				
			||||||
 | 
					                            HapticFeedback.heavyImpact();
 | 
				
			||||||
 | 
					                            List<List<GeneratedFormItem>> formInputs = [];
 | 
				
			||||||
 | 
					                            if (existingUpdateIdsAllOrSelected.isNotEmpty &&
 | 
				
			||||||
 | 
					                                newInstallIdsAllOrSelected.isNotEmpty) {
 | 
				
			||||||
 | 
					                              formInputs.add([
 | 
				
			||||||
 | 
					                                GeneratedFormItem(
 | 
				
			||||||
 | 
					                                    label:
 | 
				
			||||||
 | 
					                                        'Update ${existingUpdateIdsAllOrSelected.length} App${existingUpdateIdsAllOrSelected.length == 1 ? '' : 's'}',
 | 
				
			||||||
 | 
					                                    type: FormItemType.bool)
 | 
				
			||||||
 | 
					                              ]);
 | 
				
			||||||
 | 
					                              formInputs.add([
 | 
				
			||||||
 | 
					                                GeneratedFormItem(
 | 
				
			||||||
 | 
					                                    label:
 | 
				
			||||||
 | 
					                                        'Install ${newInstallIdsAllOrSelected.length} new App${newInstallIdsAllOrSelected.length == 1 ? '' : 's'}',
 | 
				
			||||||
 | 
					                                    type: FormItemType.bool)
 | 
				
			||||||
 | 
					                              ]);
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                            showDialog<List<String>?>(
 | 
				
			||||||
 | 
					                                context: context,
 | 
				
			||||||
 | 
					                                builder: (BuildContext ctx) {
 | 
				
			||||||
 | 
					                                  return GeneratedFormModal(
 | 
				
			||||||
 | 
					                                    title:
 | 
				
			||||||
 | 
					                                        'Install${selectedIds.isEmpty ? ' ' : ' Selected '}Apps?',
 | 
				
			||||||
 | 
					                                    message:
 | 
				
			||||||
 | 
					                                        '${existingUpdateIdsAllOrSelected.length} update${existingUpdateIdsAllOrSelected.length == 1 ? '' : 's'} and ${newInstallIdsAllOrSelected.length} new install${newInstallIdsAllOrSelected.length == 1 ? '' : 's'}.',
 | 
				
			||||||
 | 
					                                    items: formInputs,
 | 
				
			||||||
 | 
					                                    defaultValues: [
 | 
				
			||||||
 | 
					                                      'true',
 | 
				
			||||||
 | 
					                                      existingUpdateIdsAllOrSelected.isEmpty
 | 
				
			||||||
 | 
					                                          ? 'true'
 | 
				
			||||||
 | 
					                                          : ''
 | 
				
			||||||
 | 
					                                    ],
 | 
				
			||||||
 | 
					                                    initValid: true,
 | 
				
			||||||
 | 
					                                  );
 | 
				
			||||||
 | 
					                                }).then((values) {
 | 
				
			||||||
 | 
					                              if (values != null) {
 | 
				
			||||||
 | 
					                                bool shouldInstallUpdates = values[0] == 'true';
 | 
				
			||||||
 | 
					                                bool shouldInstallNew = values[1] == 'true';
 | 
				
			||||||
 | 
					                                settingsProvider
 | 
				
			||||||
 | 
					                                    .getInstallPermission()
 | 
				
			||||||
 | 
					                                    .then((_) {
 | 
				
			||||||
 | 
					                                  List<String> toInstall = [];
 | 
				
			||||||
 | 
					                                  if (shouldInstallUpdates) {
 | 
				
			||||||
 | 
					                                    toInstall
 | 
				
			||||||
 | 
					                                        .addAll(existingUpdateIdsAllOrSelected);
 | 
				
			||||||
 | 
					                                  }
 | 
				
			||||||
 | 
					                                  if (shouldInstallNew) {
 | 
				
			||||||
 | 
					                                    toInstall
 | 
				
			||||||
 | 
					                                        .addAll(newInstallIdsAllOrSelected);
 | 
				
			||||||
 | 
					                                  }
 | 
				
			||||||
 | 
					                                  appsProvider
 | 
				
			||||||
 | 
					                                      .downloadAndInstallLatestApps(
 | 
				
			||||||
 | 
					                                          toInstall, context)
 | 
				
			||||||
 | 
					                                      .catchError((e) {
 | 
				
			||||||
 | 
					                                    showError(e, context);
 | 
				
			||||||
 | 
					                                  });
 | 
				
			||||||
 | 
					                                });
 | 
				
			||||||
 | 
					                              }
 | 
				
			||||||
 | 
					                            });
 | 
				
			||||||
 | 
					                          },
 | 
				
			||||||
 | 
					                    tooltip:
 | 
				
			||||||
 | 
					                        'Install/Update${selectedIds.isEmpty ? ' ' : ' Selected '}Apps',
 | 
				
			||||||
 | 
					                    icon: const Icon(
 | 
				
			||||||
 | 
					                      Icons.file_download_outlined,
 | 
				
			||||||
 | 
					                    )),
 | 
				
			||||||
 | 
					                selectedIds.isEmpty
 | 
				
			||||||
 | 
					                    ? const SizedBox()
 | 
				
			||||||
 | 
					                    : IconButton(
 | 
				
			||||||
 | 
					                        visualDensity: VisualDensity.compact,
 | 
				
			||||||
 | 
					                        onPressed: () {
 | 
				
			||||||
 | 
					                          showDialog(
 | 
				
			||||||
 | 
					                              context: context,
 | 
				
			||||||
 | 
					                              builder: (BuildContext ctx) {
 | 
				
			||||||
 | 
					                                return AlertDialog(
 | 
				
			||||||
 | 
					                                  scrollable: true,
 | 
				
			||||||
 | 
					                                  content: Padding(
 | 
				
			||||||
 | 
					                                    padding: const EdgeInsets.only(top: 6),
 | 
				
			||||||
 | 
					                                    child: Row(
 | 
				
			||||||
 | 
					                                        mainAxisAlignment:
 | 
				
			||||||
 | 
					                                            MainAxisAlignment.spaceAround,
 | 
				
			||||||
 | 
					                                        children: [
 | 
				
			||||||
 | 
					                                          IconButton(
 | 
				
			||||||
 | 
					                                              onPressed:
 | 
				
			||||||
 | 
					                                                  appsProvider
 | 
				
			||||||
 | 
					                                                          .areDownloadsRunning()
 | 
				
			||||||
 | 
					                                                      ? null
 | 
				
			||||||
 | 
					                                                      : () {
 | 
				
			||||||
 | 
					                                                          showDialog(
 | 
				
			||||||
 | 
					                                                              context: context,
 | 
				
			||||||
 | 
					                                                              builder:
 | 
				
			||||||
 | 
					                                                                  (BuildContext
 | 
				
			||||||
 | 
					                                                                      ctx) {
 | 
				
			||||||
 | 
					                                                                return AlertDialog(
 | 
				
			||||||
 | 
					                                                                  title: Text(
 | 
				
			||||||
 | 
					                                                                      'Mark ${selectedIds.length} Selected Apps as Updated?'),
 | 
				
			||||||
 | 
					                                                                  content:
 | 
				
			||||||
 | 
					                                                                      const Text(
 | 
				
			||||||
 | 
					                                                                          'Only applies to installed but out of date Apps.'),
 | 
				
			||||||
 | 
					                                                                  actions: [
 | 
				
			||||||
 | 
					                                                                    TextButton(
 | 
				
			||||||
 | 
					                                                                        onPressed:
 | 
				
			||||||
 | 
					                                                                            () {
 | 
				
			||||||
 | 
					                                                                          Navigator.of(context)
 | 
				
			||||||
 | 
					                                                                              .pop();
 | 
				
			||||||
 | 
					                                                                        },
 | 
				
			||||||
 | 
					                                                                        child: const Text(
 | 
				
			||||||
 | 
					                                                                            'No')),
 | 
				
			||||||
 | 
					                                                                    TextButton(
 | 
				
			||||||
 | 
					                                                                        onPressed:
 | 
				
			||||||
 | 
					                                                                            () {
 | 
				
			||||||
 | 
					                                                                          HapticFeedback
 | 
				
			||||||
 | 
					                                                                              .selectionClick();
 | 
				
			||||||
 | 
					                                                                          appsProvider
 | 
				
			||||||
 | 
					                                                                              .saveApps(selectedIds.map((e) {
 | 
				
			||||||
 | 
					                                                                            var a =
 | 
				
			||||||
 | 
					                                                                                appsProvider.apps[e]!.app;
 | 
				
			||||||
 | 
					                                                                            if (a.installedVersion !=
 | 
				
			||||||
 | 
					                                                                                null) {
 | 
				
			||||||
 | 
					                                                                              a.installedVersion = a.latestVersion;
 | 
				
			||||||
 | 
					                                                                            }
 | 
				
			||||||
 | 
					                                                                            return a;
 | 
				
			||||||
 | 
					                                                                          }).toList());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                                                                          Navigator.of(context)
 | 
				
			||||||
 | 
					                                                                              .pop();
 | 
				
			||||||
 | 
					                                                                        },
 | 
				
			||||||
 | 
					                                                                        child: const Text(
 | 
				
			||||||
 | 
					                                                                            'Yes'))
 | 
				
			||||||
 | 
					                                                                  ],
 | 
				
			||||||
 | 
					                                                                );
 | 
				
			||||||
 | 
					                                                              });
 | 
				
			||||||
 | 
					                                                        },
 | 
				
			||||||
 | 
					                                              tooltip:
 | 
				
			||||||
 | 
					                                                  'Mark Selected Apps as Updated',
 | 
				
			||||||
 | 
					                                              icon: const Icon(Icons.done)),
 | 
				
			||||||
 | 
					                                          IconButton(
 | 
				
			||||||
 | 
					                                            onPressed: () {
 | 
				
			||||||
 | 
					                                              String urls = '';
 | 
				
			||||||
 | 
					                                              for (var id in selectedIds) {
 | 
				
			||||||
 | 
					                                                urls +=
 | 
				
			||||||
 | 
					                                                    '${appsProvider.apps[id]!.app.url}\n';
 | 
				
			||||||
 | 
					                                              }
 | 
				
			||||||
 | 
					                                              urls = urls.substring(
 | 
				
			||||||
 | 
					                                                  0, urls.length - 1);
 | 
				
			||||||
 | 
					                                              Share.share(urls,
 | 
				
			||||||
 | 
					                                                  subject:
 | 
				
			||||||
 | 
					                                                      '${selectedIds.length} Selected App URLs from Obtainium');
 | 
				
			||||||
 | 
					                                            },
 | 
				
			||||||
 | 
					                                            tooltip: 'Share Selected App URLs',
 | 
				
			||||||
 | 
					                                            icon: const Icon(Icons.share),
 | 
				
			||||||
 | 
					                                          ),
 | 
				
			||||||
 | 
					                                        ]),
 | 
				
			||||||
 | 
					                                  ),
 | 
				
			||||||
 | 
					                                );
 | 
				
			||||||
 | 
					                              });
 | 
				
			||||||
 | 
					                        },
 | 
				
			||||||
 | 
					                        tooltip: 'More',
 | 
				
			||||||
 | 
					                        icon: const Icon(Icons.more_horiz),
 | 
				
			||||||
 | 
					                      ),
 | 
				
			||||||
 | 
					              ],
 | 
				
			||||||
 | 
					            )),
 | 
				
			||||||
 | 
					            const VerticalDivider(),
 | 
				
			||||||
 | 
					            IconButton(
 | 
				
			||||||
 | 
					              visualDensity: VisualDensity.compact,
 | 
				
			||||||
 | 
					              onPressed: () {
 | 
				
			||||||
 | 
					                setState(() {
 | 
				
			||||||
 | 
					                  if (currentFilterIsUpdatesOnly) {
 | 
				
			||||||
 | 
					                    filter = null;
 | 
				
			||||||
 | 
					                  } else {
 | 
				
			||||||
 | 
					                    filter = updatesOnlyFilter;
 | 
				
			||||||
 | 
					                  }
 | 
				
			||||||
 | 
					                });
 | 
				
			||||||
 | 
					              },
 | 
				
			||||||
 | 
					              tooltip: currentFilterIsUpdatesOnly
 | 
				
			||||||
 | 
					                  ? 'Remove Out-of-Date App Filter'
 | 
				
			||||||
 | 
					                  : 'Show Out-of-Date Apps Only',
 | 
				
			||||||
 | 
					              icon: Icon(
 | 
				
			||||||
 | 
					                currentFilterIsUpdatesOnly
 | 
				
			||||||
 | 
					                    ? Icons.update_disabled_rounded
 | 
				
			||||||
 | 
					                    : Icons.update_rounded,
 | 
				
			||||||
 | 
					                color: Theme.of(context).colorScheme.primary,
 | 
				
			||||||
 | 
					              ),
 | 
				
			||||||
 | 
					            ),
 | 
				
			||||||
 | 
					            appsProvider.apps.isEmpty
 | 
				
			||||||
 | 
					                ? const SizedBox()
 | 
				
			||||||
 | 
					                : TextButton.icon(
 | 
				
			||||||
 | 
					                    label: Text(
 | 
				
			||||||
 | 
					                      filter == null ? 'Filter' : 'Filter *',
 | 
				
			||||||
 | 
					                      style: TextStyle(
 | 
				
			||||||
 | 
					                          fontWeight: filter == null
 | 
				
			||||||
 | 
					                              ? FontWeight.normal
 | 
				
			||||||
 | 
					                              : FontWeight.bold),
 | 
				
			||||||
 | 
					                    ),
 | 
				
			||||||
 | 
					                    onPressed: () {
 | 
				
			||||||
 | 
					                      showDialog<List<String>?>(
 | 
				
			||||||
 | 
					                          context: context,
 | 
				
			||||||
 | 
					                          builder: (BuildContext ctx) {
 | 
				
			||||||
 | 
					                            return GeneratedFormModal(
 | 
				
			||||||
 | 
					                                title: 'Filter Apps',
 | 
				
			||||||
 | 
					                                items: [
 | 
				
			||||||
 | 
					                                  [
 | 
				
			||||||
 | 
					                                    GeneratedFormItem(
 | 
				
			||||||
 | 
					                                        label: 'App Name', required: false),
 | 
				
			||||||
 | 
					                                    GeneratedFormItem(
 | 
				
			||||||
 | 
					                                        label: 'Author', required: false)
 | 
				
			||||||
 | 
					                                  ],
 | 
				
			||||||
 | 
					                                  [
 | 
				
			||||||
 | 
					                                    GeneratedFormItem(
 | 
				
			||||||
 | 
					                                        label: 'Up to Date Apps',
 | 
				
			||||||
 | 
					                                        type: FormItemType.bool)
 | 
				
			||||||
 | 
					                                  ],
 | 
				
			||||||
 | 
					                                  [
 | 
				
			||||||
 | 
					                                    GeneratedFormItem(
 | 
				
			||||||
 | 
					                                        label: 'Non-Installed Apps',
 | 
				
			||||||
 | 
					                                        type: FormItemType.bool)
 | 
				
			||||||
 | 
					                                  ]
 | 
				
			||||||
 | 
					                                ],
 | 
				
			||||||
 | 
					                                defaultValues: filter == null
 | 
				
			||||||
 | 
					                                    ? AppsFilter().toValuesArray()
 | 
				
			||||||
 | 
					                                    : filter!.toValuesArray());
 | 
				
			||||||
 | 
					                          }).then((values) {
 | 
				
			||||||
 | 
					                        if (values != null) {
 | 
				
			||||||
 | 
					                          setState(() {
 | 
				
			||||||
 | 
					                            filter = AppsFilter.fromValuesArray(values);
 | 
				
			||||||
 | 
					                            if (AppsFilter().isIdenticalTo(filter!)) {
 | 
				
			||||||
 | 
					                              filter = null;
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                          });
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                      });
 | 
				
			||||||
 | 
					                    },
 | 
				
			||||||
 | 
					                    icon: const Icon(Icons.filter_list_rounded))
 | 
				
			||||||
 | 
					          ],
 | 
				
			||||||
 | 
					        ),
 | 
				
			||||||
 | 
					      ],
 | 
				
			||||||
 | 
					    );
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class AppsFilter {
 | 
					class AppsFilter {
 | 
				
			||||||
  late String nameFilter;
 | 
					  late String nameFilter;
 | 
				
			||||||
  late String authorFilter;
 | 
					  late String authorFilter;
 | 
				
			||||||
  late bool onlyNonLatest;
 | 
					  late bool includeUptodate;
 | 
				
			||||||
 | 
					  late bool includeNonInstalled;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AppsFilter(
 | 
					  AppsFilter(
 | 
				
			||||||
      {this.nameFilter = "",
 | 
					      {this.nameFilter = '',
 | 
				
			||||||
      this.authorFilter = "",
 | 
					      this.authorFilter = '',
 | 
				
			||||||
      this.onlyNonLatest = false});
 | 
					      this.includeUptodate = true,
 | 
				
			||||||
 | 
					      this.includeNonInstalled = true});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  List<String> toValuesArray() {
 | 
				
			||||||
 | 
					    return [
 | 
				
			||||||
 | 
					      nameFilter,
 | 
				
			||||||
 | 
					      authorFilter,
 | 
				
			||||||
 | 
					      includeUptodate ? 'true' : '',
 | 
				
			||||||
 | 
					      includeNonInstalled ? 'true' : ''
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  AppsFilter.fromValuesArray(List<String> values) {
 | 
				
			||||||
 | 
					    nameFilter = values[0];
 | 
				
			||||||
 | 
					    authorFilter = values[1];
 | 
				
			||||||
 | 
					    includeUptodate = values[2] == 'true';
 | 
				
			||||||
 | 
					    includeNonInstalled = values[3] == 'true';
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  bool isIdenticalTo(AppsFilter other) =>
 | 
				
			||||||
 | 
					      authorFilter.trim() == other.authorFilter.trim() &&
 | 
				
			||||||
 | 
					      nameFilter.trim() == other.nameFilter.trim() &&
 | 
				
			||||||
 | 
					      includeUptodate == other.includeUptodate &&
 | 
				
			||||||
 | 
					      includeNonInstalled == other.includeNonInstalled;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,8 @@ class _HomePageState extends State<HomePage> {
 | 
				
			|||||||
  List<int> selectedIndexHistory = [];
 | 
					  List<int> selectedIndexHistory = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  List<NavigationPageItem> pages = [
 | 
					  List<NavigationPageItem> pages = [
 | 
				
			||||||
    NavigationPageItem('Apps', Icons.apps, const AppsPage()),
 | 
					    NavigationPageItem(
 | 
				
			||||||
 | 
					        'Apps', Icons.apps, AppsPage(key: GlobalKey<AppsPageState>())),
 | 
				
			||||||
    NavigationPageItem('Add App', Icons.add, const AddAppPage()),
 | 
					    NavigationPageItem('Add App', Icons.add, const AddAppPage()),
 | 
				
			||||||
    NavigationPageItem(
 | 
					    NavigationPageItem(
 | 
				
			||||||
        'Import/Export', Icons.import_export, const ImportExportPage()),
 | 
					        'Import/Export', Icons.import_export, const ImportExportPage()),
 | 
				
			||||||
@@ -88,7 +89,9 @@ class _HomePageState extends State<HomePage> {
 | 
				
			|||||||
            });
 | 
					            });
 | 
				
			||||||
            return false;
 | 
					            return false;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
          return true;
 | 
					          return !(pages[0].widget.key as GlobalKey<AppsPageState>)
 | 
				
			||||||
 | 
					              .currentState
 | 
				
			||||||
 | 
					              ?.clearSelected();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
 | 
				
			|||||||
import 'package:obtainium/components/custom_app_bar.dart';
 | 
					import 'package:obtainium/components/custom_app_bar.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form_modal.dart';
 | 
					import 'package:obtainium/components/generated_form_modal.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/providers/apps_provider.dart';
 | 
					import 'package:obtainium/providers/apps_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/settings_provider.dart';
 | 
					import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
@@ -40,14 +41,15 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    Future<List<List<String>>> addApps(List<String> urls) async {
 | 
					    Future<List<List<String>>> addApps(List<String> urls) async {
 | 
				
			||||||
      await settingsProvider.getInstallPermission();
 | 
					      await settingsProvider.getInstallPermission();
 | 
				
			||||||
      List<dynamic> results = await sourceProvider.getApps(urls);
 | 
					      List<dynamic> results = await sourceProvider.getApps(urls,
 | 
				
			||||||
 | 
					          ignoreUrls: appsProvider.apps.values.map((e) => e.app.url).toList());
 | 
				
			||||||
      List<App> apps = results[0];
 | 
					      List<App> apps = results[0];
 | 
				
			||||||
      Map<String, dynamic> errorsMap = results[1];
 | 
					      Map<String, dynamic> errorsMap = results[1];
 | 
				
			||||||
      for (var app in apps) {
 | 
					      for (var app in apps) {
 | 
				
			||||||
        if (appsProvider.apps.containsKey(app.id)) {
 | 
					        if (appsProvider.apps.containsKey(app.id)) {
 | 
				
			||||||
          errorsMap.addAll({app.id: 'App already added'});
 | 
					          errorsMap.addAll({app.id: 'App already added'});
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
          await appsProvider.saveApp(app);
 | 
					          await appsProvider.saveApps([app]);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      List<List<String>> errors =
 | 
					      List<List<String>> errors =
 | 
				
			||||||
@@ -60,7 +62,6 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
        body: CustomScrollView(slivers: <Widget>[
 | 
					        body: CustomScrollView(slivers: <Widget>[
 | 
				
			||||||
          const CustomAppBar(title: 'Import/Export'),
 | 
					          const CustomAppBar(title: 'Import/Export'),
 | 
				
			||||||
          SliverFillRemaining(
 | 
					          SliverFillRemaining(
 | 
				
			||||||
              hasScrollBody: false,
 | 
					 | 
				
			||||||
              child: Padding(
 | 
					              child: Padding(
 | 
				
			||||||
                  padding:
 | 
					                  padding:
 | 
				
			||||||
                      const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
 | 
					                      const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
 | 
				
			||||||
@@ -80,12 +81,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                                          appsProvider
 | 
					                                          appsProvider
 | 
				
			||||||
                                              .exportApps()
 | 
					                                              .exportApps()
 | 
				
			||||||
                                              .then((String path) {
 | 
					                                              .then((String path) {
 | 
				
			||||||
                                            ScaffoldMessenger.of(context)
 | 
					                                            showError(
 | 
				
			||||||
                                                .showSnackBar(
 | 
					                                                'Exported to $path', context);
 | 
				
			||||||
                                              SnackBar(
 | 
					 | 
				
			||||||
                                                  content: Text(
 | 
					 | 
				
			||||||
                                                      'Exported to $path')),
 | 
					 | 
				
			||||||
                                            );
 | 
					 | 
				
			||||||
                                          });
 | 
					                                          });
 | 
				
			||||||
                                        },
 | 
					                                        },
 | 
				
			||||||
                                  child: const Text('Obtainium Export'))),
 | 
					                                  child: const Text('Obtainium Export'))),
 | 
				
			||||||
@@ -112,27 +109,21 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                                              try {
 | 
					                                              try {
 | 
				
			||||||
                                                jsonDecode(data);
 | 
					                                                jsonDecode(data);
 | 
				
			||||||
                                              } catch (e) {
 | 
					                                              } catch (e) {
 | 
				
			||||||
                                                throw 'Invalid input';
 | 
					                                                throw ObtainiumError(
 | 
				
			||||||
 | 
					                                                    'Invalid input');
 | 
				
			||||||
                                              }
 | 
					                                              }
 | 
				
			||||||
                                              appsProvider
 | 
					                                              appsProvider
 | 
				
			||||||
                                                  .importApps(data)
 | 
					                                                  .importApps(data)
 | 
				
			||||||
                                                  .then((value) {
 | 
					                                                  .then((value) {
 | 
				
			||||||
                                                ScaffoldMessenger.of(context)
 | 
					                                                showError(
 | 
				
			||||||
                                                    .showSnackBar(
 | 
					                                                    '$value App${value == 1 ? '' : 's'} Imported',
 | 
				
			||||||
                                                  SnackBar(
 | 
					                                                    context);
 | 
				
			||||||
                                                      content: Text(
 | 
					 | 
				
			||||||
                                                          '$value App${value == 1 ? '' : 's'} Imported')),
 | 
					 | 
				
			||||||
                                                );
 | 
					 | 
				
			||||||
                                              });
 | 
					                                              });
 | 
				
			||||||
                                            } else {
 | 
					                                            } else {
 | 
				
			||||||
                                              // User canceled the picker
 | 
					                                              // User canceled the picker
 | 
				
			||||||
                                            }
 | 
					                                            }
 | 
				
			||||||
                                          }).catchError((e) {
 | 
					                                          }).catchError((e) {
 | 
				
			||||||
                                            ScaffoldMessenger.of(context)
 | 
					                                            showError(e, context);
 | 
				
			||||||
                                                .showSnackBar(
 | 
					 | 
				
			||||||
                                              SnackBar(
 | 
					 | 
				
			||||||
                                                  content: Text(e.toString())),
 | 
					 | 
				
			||||||
                                            );
 | 
					 | 
				
			||||||
                                          }).whenComplete(() {
 | 
					                                          }).whenComplete(() {
 | 
				
			||||||
                                            setState(() {
 | 
					                                            setState(() {
 | 
				
			||||||
                                              importInProgress = false;
 | 
					                                              importInProgress = false;
 | 
				
			||||||
@@ -207,12 +198,9 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                                      });
 | 
					                                      });
 | 
				
			||||||
                                      addApps(urls).then((errors) {
 | 
					                                      addApps(urls).then((errors) {
 | 
				
			||||||
                                        if (errors.isEmpty) {
 | 
					                                        if (errors.isEmpty) {
 | 
				
			||||||
                                          ScaffoldMessenger.of(context)
 | 
					                                          showError(
 | 
				
			||||||
                                              .showSnackBar(
 | 
					                                              'Imported ${urls.length} Apps',
 | 
				
			||||||
                                            SnackBar(
 | 
					                                              context);
 | 
				
			||||||
                                                content: Text(
 | 
					 | 
				
			||||||
                                                    'Imported ${urls.length} Apps')),
 | 
					 | 
				
			||||||
                                          );
 | 
					 | 
				
			||||||
                                        } else {
 | 
					                                        } else {
 | 
				
			||||||
                                          showDialog(
 | 
					                                          showDialog(
 | 
				
			||||||
                                              context: context,
 | 
					                                              context: context,
 | 
				
			||||||
@@ -223,10 +211,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                                              });
 | 
					                                              });
 | 
				
			||||||
                                        }
 | 
					                                        }
 | 
				
			||||||
                                      }).catchError((e) {
 | 
					                                      }).catchError((e) {
 | 
				
			||||||
                                        ScaffoldMessenger.of(context)
 | 
					                                        showError(e, context);
 | 
				
			||||||
                                            .showSnackBar(
 | 
					 | 
				
			||||||
                                          SnackBar(content: Text(e.toString())),
 | 
					 | 
				
			||||||
                                        );
 | 
					 | 
				
			||||||
                                      }).whenComplete(() {
 | 
					                                      }).whenComplete(() {
 | 
				
			||||||
                                        setState(() {
 | 
					                                        setState(() {
 | 
				
			||||||
                                          importInProgress = false;
 | 
					                                          importInProgress = false;
 | 
				
			||||||
@@ -238,7 +223,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                          child: const Text(
 | 
					                          child: const Text(
 | 
				
			||||||
                            'Import from URL List',
 | 
					                            'Import from URL List',
 | 
				
			||||||
                          )),
 | 
					                          )),
 | 
				
			||||||
                      ...sourceProvider.massSources
 | 
					                      ...sourceProvider.massUrlSources
 | 
				
			||||||
                          .map((source) => Column(
 | 
					                          .map((source) => Column(
 | 
				
			||||||
                                  crossAxisAlignment:
 | 
					                                  crossAxisAlignment:
 | 
				
			||||||
                                      CrossAxisAlignment.stretch,
 | 
					                                      CrossAxisAlignment.stretch,
 | 
				
			||||||
@@ -266,30 +251,40 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                                                      );
 | 
					                                                      );
 | 
				
			||||||
                                                    }).then((values) {
 | 
					                                                    }).then((values) {
 | 
				
			||||||
                                                  if (values != null) {
 | 
					                                                  if (values != null) {
 | 
				
			||||||
                                                    source
 | 
					 | 
				
			||||||
                                                        .getUrls(values)
 | 
					 | 
				
			||||||
                                                        .then((urls) {
 | 
					 | 
				
			||||||
                                                    setState(() {
 | 
					                                                    setState(() {
 | 
				
			||||||
                                                      importInProgress = true;
 | 
					                                                      importInProgress = true;
 | 
				
			||||||
                                                    });
 | 
					                                                    });
 | 
				
			||||||
                                                      addApps(urls)
 | 
					                                                    source
 | 
				
			||||||
                                                          .then((errors) {
 | 
					                                                        .getUrls(values)
 | 
				
			||||||
                                                        if (errors.isEmpty) {
 | 
					                                                        .then((urls) {
 | 
				
			||||||
                                                          ScaffoldMessenger.of(
 | 
					                                                      showDialog<List<String>?>(
 | 
				
			||||||
                                                                  context)
 | 
					 | 
				
			||||||
                                                              .showSnackBar(
 | 
					 | 
				
			||||||
                                                            SnackBar(
 | 
					 | 
				
			||||||
                                                                content: Text(
 | 
					 | 
				
			||||||
                                                                    'Imported ${urls.length} Apps')),
 | 
					 | 
				
			||||||
                                                          );
 | 
					 | 
				
			||||||
                                                        } else {
 | 
					 | 
				
			||||||
                                                          showDialog(
 | 
					 | 
				
			||||||
                                                              context: context,
 | 
					                                                              context: context,
 | 
				
			||||||
 | 
					                                                              builder:
 | 
				
			||||||
 | 
					                                                                  (BuildContext
 | 
				
			||||||
 | 
					                                                                      ctx) {
 | 
				
			||||||
 | 
					                                                                return UrlSelectionModal(
 | 
				
			||||||
 | 
					                                                                    urls: urls);
 | 
				
			||||||
 | 
					                                                              })
 | 
				
			||||||
 | 
					                                                          .then((selectedUrls) {
 | 
				
			||||||
 | 
					                                                        if (selectedUrls !=
 | 
				
			||||||
 | 
					                                                            null) {
 | 
				
			||||||
 | 
					                                                          addApps(selectedUrls)
 | 
				
			||||||
 | 
					                                                              .then((errors) {
 | 
				
			||||||
 | 
					                                                            if (errors
 | 
				
			||||||
 | 
					                                                                .isEmpty) {
 | 
				
			||||||
 | 
					                                                              showError(
 | 
				
			||||||
 | 
					                                                                  'Imported ${selectedUrls.length} Apps',
 | 
				
			||||||
 | 
					                                                                  context);
 | 
				
			||||||
 | 
					                                                            } else {
 | 
				
			||||||
 | 
					                                                              showDialog(
 | 
				
			||||||
 | 
					                                                                  context:
 | 
				
			||||||
 | 
					                                                                      context,
 | 
				
			||||||
                                                                  builder:
 | 
					                                                                  builder:
 | 
				
			||||||
                                                                      (BuildContext
 | 
					                                                                      (BuildContext
 | 
				
			||||||
                                                                          ctx) {
 | 
					                                                                          ctx) {
 | 
				
			||||||
                                                                    return ImportErrorDialog(
 | 
					                                                                    return ImportErrorDialog(
 | 
				
			||||||
                                                                    urlsLength: urls
 | 
					                                                                        urlsLength:
 | 
				
			||||||
 | 
					                                                                            selectedUrls
 | 
				
			||||||
                                                                                .length,
 | 
					                                                                                .length,
 | 
				
			||||||
                                                                        errors:
 | 
					                                                                        errors:
 | 
				
			||||||
                                                                            errors);
 | 
					                                                                            errors);
 | 
				
			||||||
@@ -301,21 +296,38 @@ class _ImportExportPageState extends State<ImportExportPage> {
 | 
				
			|||||||
                                                                  false;
 | 
					                                                                  false;
 | 
				
			||||||
                                                            });
 | 
					                                                            });
 | 
				
			||||||
                                                          });
 | 
					                                                          });
 | 
				
			||||||
 | 
					                                                        } else {
 | 
				
			||||||
 | 
					                                                          setState(() {
 | 
				
			||||||
 | 
					                                                            importInProgress =
 | 
				
			||||||
 | 
					                                                                false;
 | 
				
			||||||
 | 
					                                                          });
 | 
				
			||||||
 | 
					                                                        }
 | 
				
			||||||
 | 
					                                                      });
 | 
				
			||||||
                                                    }).catchError((e) {
 | 
					                                                    }).catchError((e) {
 | 
				
			||||||
                                                      ScaffoldMessenger.of(
 | 
					                                                      setState(() {
 | 
				
			||||||
                                                              context)
 | 
					                                                        importInProgress =
 | 
				
			||||||
                                                          .showSnackBar(
 | 
					                                                            false;
 | 
				
			||||||
                                                        SnackBar(
 | 
					                                                      });
 | 
				
			||||||
                                                            content: Text(
 | 
					                                                      showError(e, context);
 | 
				
			||||||
                                                                e.toString())),
 | 
					 | 
				
			||||||
                                                      );
 | 
					 | 
				
			||||||
                                                    });
 | 
					                                                    });
 | 
				
			||||||
                                                  }
 | 
					                                                  }
 | 
				
			||||||
                                                });
 | 
					                                                });
 | 
				
			||||||
                                              },
 | 
					                                              },
 | 
				
			||||||
                                        child: Text('Import ${source.name}'))
 | 
					                                        child: Text('Import ${source.name}'))
 | 
				
			||||||
                                  ]))
 | 
					                                  ]))
 | 
				
			||||||
                          .toList()
 | 
					                          .toList(),
 | 
				
			||||||
 | 
					                      const Spacer(),
 | 
				
			||||||
 | 
					                      const Divider(
 | 
				
			||||||
 | 
					                        height: 32,
 | 
				
			||||||
 | 
					                      ),
 | 
				
			||||||
 | 
					                      const Text(
 | 
				
			||||||
 | 
					                          'Imported Apps may incorrectly show as "Not Installed".\nTo fix this, re-install them through Obtainium.\nThis should not affect App data.\n\nOnly affects URL and third-party import methods.',
 | 
				
			||||||
 | 
					                          textAlign: TextAlign.center,
 | 
				
			||||||
 | 
					                          style: TextStyle(
 | 
				
			||||||
 | 
					                              fontStyle: FontStyle.italic, fontSize: 12)),
 | 
				
			||||||
 | 
					                      const SizedBox(
 | 
				
			||||||
 | 
					                        height: 8,
 | 
				
			||||||
 | 
					                      )
 | 
				
			||||||
                    ],
 | 
					                    ],
 | 
				
			||||||
                  )))
 | 
					                  )))
 | 
				
			||||||
        ]));
 | 
					        ]));
 | 
				
			||||||
@@ -375,3 +387,67 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
 | 
				
			|||||||
    );
 | 
					    );
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// ignore: must_be_immutable
 | 
				
			||||||
 | 
					class UrlSelectionModal extends StatefulWidget {
 | 
				
			||||||
 | 
					  UrlSelectionModal({super.key, required this.urls});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  List<String> urls;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  State<UrlSelectionModal> createState() => _UrlSelectionModalState();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class _UrlSelectionModalState extends State<UrlSelectionModal> {
 | 
				
			||||||
 | 
					  Map<String, bool> urlSelections = {};
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  void initState() {
 | 
				
			||||||
 | 
					    super.initState();
 | 
				
			||||||
 | 
					    for (var url in widget.urls) {
 | 
				
			||||||
 | 
					      urlSelections.putIfAbsent(url, () => true);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @override
 | 
				
			||||||
 | 
					  Widget build(BuildContext context) {
 | 
				
			||||||
 | 
					    return AlertDialog(
 | 
				
			||||||
 | 
					      scrollable: true,
 | 
				
			||||||
 | 
					      title: const Text('Select URLs to Import'),
 | 
				
			||||||
 | 
					      content: Column(children: [
 | 
				
			||||||
 | 
					        ...urlSelections.keys.map((url) {
 | 
				
			||||||
 | 
					          return Row(children: [
 | 
				
			||||||
 | 
					            Checkbox(
 | 
				
			||||||
 | 
					                value: urlSelections[url],
 | 
				
			||||||
 | 
					                onChanged: (value) {
 | 
				
			||||||
 | 
					                  setState(() {
 | 
				
			||||||
 | 
					                    urlSelections[url] = value ?? false;
 | 
				
			||||||
 | 
					                  });
 | 
				
			||||||
 | 
					                }),
 | 
				
			||||||
 | 
					            const SizedBox(
 | 
				
			||||||
 | 
					              width: 8,
 | 
				
			||||||
 | 
					            ),
 | 
				
			||||||
 | 
					            Expanded(
 | 
				
			||||||
 | 
					                child: Text(
 | 
				
			||||||
 | 
					              Uri.parse(url).path.substring(1),
 | 
				
			||||||
 | 
					            ))
 | 
				
			||||||
 | 
					          ]);
 | 
				
			||||||
 | 
					        })
 | 
				
			||||||
 | 
					      ]),
 | 
				
			||||||
 | 
					      actions: [
 | 
				
			||||||
 | 
					        TextButton(
 | 
				
			||||||
 | 
					            onPressed: () {
 | 
				
			||||||
 | 
					              Navigator.of(context).pop();
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            child: const Text('Cancel')),
 | 
				
			||||||
 | 
					        TextButton(
 | 
				
			||||||
 | 
					            onPressed: () {
 | 
				
			||||||
 | 
					              Navigator.of(context).pop(urlSelections.keys
 | 
				
			||||||
 | 
					                  .where((url) => urlSelections[url] ?? false)
 | 
				
			||||||
 | 
					                  .toList());
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            child: Text(
 | 
				
			||||||
 | 
					                'Import ${urlSelections.values.where((b) => b).length} URLs'))
 | 
				
			||||||
 | 
					      ],
 | 
				
			||||||
 | 
					    );
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,8 @@
 | 
				
			|||||||
import 'package:flutter/material.dart';
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
import 'package:obtainium/components/custom_app_bar.dart';
 | 
					import 'package:obtainium/components/custom_app_bar.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
import 'package:obtainium/providers/settings_provider.dart';
 | 
					import 'package:obtainium/providers/settings_provider.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
import 'package:provider/provider.dart';
 | 
					import 'package:provider/provider.dart';
 | 
				
			||||||
import 'package:url_launcher/url_launcher_string.dart';
 | 
					import 'package:url_launcher/url_launcher_string.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -15,30 +17,13 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
  @override
 | 
					  @override
 | 
				
			||||||
  Widget build(BuildContext context) {
 | 
					  Widget build(BuildContext context) {
 | 
				
			||||||
    SettingsProvider settingsProvider = context.watch<SettingsProvider>();
 | 
					    SettingsProvider settingsProvider = context.watch<SettingsProvider>();
 | 
				
			||||||
 | 
					    SourceProvider sourceProvider = SourceProvider();
 | 
				
			||||||
    if (settingsProvider.prefs == null) {
 | 
					    if (settingsProvider.prefs == null) {
 | 
				
			||||||
      settingsProvider.initializeSettings();
 | 
					      settingsProvider.initializeSettings();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return Scaffold(
 | 
					
 | 
				
			||||||
        backgroundColor: Theme.of(context).colorScheme.surface,
 | 
					    var themeDropdown = DropdownButtonFormField(
 | 
				
			||||||
        body: CustomScrollView(slivers: <Widget>[
 | 
					        decoration: const InputDecoration(labelText: 'Theme'),
 | 
				
			||||||
          const CustomAppBar(title: 'Settings'),
 | 
					 | 
				
			||||||
          SliverFillRemaining(
 | 
					 | 
				
			||||||
              hasScrollBody: true,
 | 
					 | 
				
			||||||
              child: Padding(
 | 
					 | 
				
			||||||
                  padding: const EdgeInsets.all(16),
 | 
					 | 
				
			||||||
                  child: settingsProvider.prefs == null
 | 
					 | 
				
			||||||
                      ? const SizedBox()
 | 
					 | 
				
			||||||
                      : Column(
 | 
					 | 
				
			||||||
                          crossAxisAlignment: CrossAxisAlignment.start,
 | 
					 | 
				
			||||||
                          children: [
 | 
					 | 
				
			||||||
                            Text(
 | 
					 | 
				
			||||||
                              'Appearance',
 | 
					 | 
				
			||||||
                              style: TextStyle(
 | 
					 | 
				
			||||||
                                  color: Theme.of(context).colorScheme.primary),
 | 
					 | 
				
			||||||
                            ),
 | 
					 | 
				
			||||||
                            DropdownButtonFormField(
 | 
					 | 
				
			||||||
                                decoration:
 | 
					 | 
				
			||||||
                                    const InputDecoration(labelText: 'Theme'),
 | 
					 | 
				
			||||||
        value: settingsProvider.theme,
 | 
					        value: settingsProvider.theme,
 | 
				
			||||||
        items: const [
 | 
					        items: const [
 | 
				
			||||||
          DropdownMenuItem(
 | 
					          DropdownMenuItem(
 | 
				
			||||||
@@ -58,13 +43,10 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
          if (value != null) {
 | 
					          if (value != null) {
 | 
				
			||||||
            settingsProvider.theme = value;
 | 
					            settingsProvider.theme = value;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
                                }),
 | 
					        });
 | 
				
			||||||
                            const SizedBox(
 | 
					
 | 
				
			||||||
                              height: 16,
 | 
					    var colourDropdown = DropdownButtonFormField(
 | 
				
			||||||
                            ),
 | 
					        decoration: const InputDecoration(labelText: 'Colour'),
 | 
				
			||||||
                            DropdownButtonFormField(
 | 
					 | 
				
			||||||
                                decoration:
 | 
					 | 
				
			||||||
                                    const InputDecoration(labelText: 'Colour'),
 | 
					 | 
				
			||||||
        value: settingsProvider.colour,
 | 
					        value: settingsProvider.colour,
 | 
				
			||||||
        items: const [
 | 
					        items: const [
 | 
				
			||||||
          DropdownMenuItem(
 | 
					          DropdownMenuItem(
 | 
				
			||||||
@@ -80,28 +62,18 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
          if (value != null) {
 | 
					          if (value != null) {
 | 
				
			||||||
            settingsProvider.colour = value;
 | 
					            settingsProvider.colour = value;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
                                }),
 | 
					        });
 | 
				
			||||||
                            const SizedBox(
 | 
					
 | 
				
			||||||
                              height: 16,
 | 
					    var sortDropdown = DropdownButtonFormField(
 | 
				
			||||||
                            ),
 | 
					        decoration: const InputDecoration(labelText: 'App Sort By'),
 | 
				
			||||||
                            Row(
 | 
					 | 
				
			||||||
                              mainAxisAlignment: MainAxisAlignment.start,
 | 
					 | 
				
			||||||
                              crossAxisAlignment: CrossAxisAlignment.start,
 | 
					 | 
				
			||||||
                              children: [
 | 
					 | 
				
			||||||
                                Expanded(
 | 
					 | 
				
			||||||
                                    child: DropdownButtonFormField(
 | 
					 | 
				
			||||||
                                        decoration: const InputDecoration(
 | 
					 | 
				
			||||||
                                            labelText: 'App Sort By'),
 | 
					 | 
				
			||||||
        value: settingsProvider.sortColumn,
 | 
					        value: settingsProvider.sortColumn,
 | 
				
			||||||
        items: const [
 | 
					        items: const [
 | 
				
			||||||
          DropdownMenuItem(
 | 
					          DropdownMenuItem(
 | 
				
			||||||
                                            value:
 | 
					            value: SortColumnSettings.authorName,
 | 
				
			||||||
                                                SortColumnSettings.authorName,
 | 
					 | 
				
			||||||
            child: Text('Author/Name'),
 | 
					            child: Text('Author/Name'),
 | 
				
			||||||
          ),
 | 
					          ),
 | 
				
			||||||
          DropdownMenuItem(
 | 
					          DropdownMenuItem(
 | 
				
			||||||
                                            value:
 | 
					            value: SortColumnSettings.nameAuthor,
 | 
				
			||||||
                                                SortColumnSettings.nameAuthor,
 | 
					 | 
				
			||||||
            child: Text('Name/Author'),
 | 
					            child: Text('Name/Author'),
 | 
				
			||||||
          ),
 | 
					          ),
 | 
				
			||||||
          DropdownMenuItem(
 | 
					          DropdownMenuItem(
 | 
				
			||||||
@@ -113,14 +85,10 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
          if (value != null) {
 | 
					          if (value != null) {
 | 
				
			||||||
            settingsProvider.sortColumn = value;
 | 
					            settingsProvider.sortColumn = value;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
                                        })),
 | 
					        });
 | 
				
			||||||
                                const SizedBox(
 | 
					
 | 
				
			||||||
                                  width: 16,
 | 
					    var orderDropdown = DropdownButtonFormField(
 | 
				
			||||||
                                ),
 | 
					        decoration: const InputDecoration(labelText: 'App Sort Order'),
 | 
				
			||||||
                                Expanded(
 | 
					 | 
				
			||||||
                                    child: DropdownButtonFormField(
 | 
					 | 
				
			||||||
                                        decoration: const InputDecoration(
 | 
					 | 
				
			||||||
                                            labelText: 'App Sort Order'),
 | 
					 | 
				
			||||||
        value: settingsProvider.sortOrder,
 | 
					        value: settingsProvider.sortOrder,
 | 
				
			||||||
        items: const [
 | 
					        items: const [
 | 
				
			||||||
          DropdownMenuItem(
 | 
					          DropdownMenuItem(
 | 
				
			||||||
@@ -136,12 +104,93 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
          if (value != null) {
 | 
					          if (value != null) {
 | 
				
			||||||
            settingsProvider.sortOrder = value;
 | 
					            settingsProvider.sortOrder = value;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
                                        })),
 | 
					        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    var intervalDropdown = DropdownButtonFormField(
 | 
				
			||||||
 | 
					        decoration: const InputDecoration(
 | 
				
			||||||
 | 
					            labelText: 'Background Update Checking Interval'),
 | 
				
			||||||
 | 
					        value: settingsProvider.updateInterval,
 | 
				
			||||||
 | 
					        items: updateIntervals.map((e) {
 | 
				
			||||||
 | 
					          int displayNum = (e < 60
 | 
				
			||||||
 | 
					                  ? e
 | 
				
			||||||
 | 
					                  : e < 1440
 | 
				
			||||||
 | 
					                      ? e / 60
 | 
				
			||||||
 | 
					                      : e / 1440)
 | 
				
			||||||
 | 
					              .round();
 | 
				
			||||||
 | 
					          var displayUnit = (e < 60
 | 
				
			||||||
 | 
					              ? 'Minute'
 | 
				
			||||||
 | 
					              : e < 1440
 | 
				
			||||||
 | 
					                  ? 'Hour'
 | 
				
			||||||
 | 
					                  : 'Day');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          String display = e == 0
 | 
				
			||||||
 | 
					              ? 'Never - Manual Only'
 | 
				
			||||||
 | 
					              : '$displayNum $displayUnit${displayNum == 1 ? '' : 's'}';
 | 
				
			||||||
 | 
					          return DropdownMenuItem(value: e, child: Text(display));
 | 
				
			||||||
 | 
					        }).toList(),
 | 
				
			||||||
 | 
					        onChanged: (value) {
 | 
				
			||||||
 | 
					          if (value != null) {
 | 
				
			||||||
 | 
					            settingsProvider.updateInterval = value;
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    var sourceSpecificFields = sourceProvider.sources.map((e) {
 | 
				
			||||||
 | 
					      if (e.moreSourceSettingsFormItems.isNotEmpty) {
 | 
				
			||||||
 | 
					        return GeneratedForm(
 | 
				
			||||||
 | 
					            items: e.moreSourceSettingsFormItems.map((e) => [e]).toList(),
 | 
				
			||||||
 | 
					            onValueChanges: (values, valid) {
 | 
				
			||||||
 | 
					              if (valid) {
 | 
				
			||||||
 | 
					                for (var i = 0; i < values.length; i++) {
 | 
				
			||||||
 | 
					                  settingsProvider.setSettingString(
 | 
				
			||||||
 | 
					                      e.moreSourceSettingsFormItems[i].id, values[i]);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            defaultValues: e.moreSourceSettingsFormItems.map((e) {
 | 
				
			||||||
 | 
					              return settingsProvider.getSettingString(e.id) ?? '';
 | 
				
			||||||
 | 
					            }).toList());
 | 
				
			||||||
 | 
					      } else {
 | 
				
			||||||
 | 
					        return Container();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const height16 = SizedBox(
 | 
				
			||||||
 | 
					      height: 16,
 | 
				
			||||||
 | 
					    );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return Scaffold(
 | 
				
			||||||
 | 
					        backgroundColor: Theme.of(context).colorScheme.surface,
 | 
				
			||||||
 | 
					        body: CustomScrollView(slivers: <Widget>[
 | 
				
			||||||
 | 
					          const CustomAppBar(title: 'Settings'),
 | 
				
			||||||
 | 
					          SliverToBoxAdapter(
 | 
				
			||||||
 | 
					              child: Padding(
 | 
				
			||||||
 | 
					                  padding: const EdgeInsets.all(16),
 | 
				
			||||||
 | 
					                  child: settingsProvider.prefs == null
 | 
				
			||||||
 | 
					                      ? const SizedBox()
 | 
				
			||||||
 | 
					                      : Column(
 | 
				
			||||||
 | 
					                          crossAxisAlignment: CrossAxisAlignment.start,
 | 
				
			||||||
 | 
					                          children: [
 | 
				
			||||||
 | 
					                            Text(
 | 
				
			||||||
 | 
					                              'Appearance',
 | 
				
			||||||
 | 
					                              style: TextStyle(
 | 
				
			||||||
 | 
					                                  color: Theme.of(context).colorScheme.primary),
 | 
				
			||||||
 | 
					                            ),
 | 
				
			||||||
 | 
					                            themeDropdown,
 | 
				
			||||||
 | 
					                            height16,
 | 
				
			||||||
 | 
					                            colourDropdown,
 | 
				
			||||||
 | 
					                            height16,
 | 
				
			||||||
 | 
					                            Row(
 | 
				
			||||||
 | 
					                              mainAxisAlignment: MainAxisAlignment.start,
 | 
				
			||||||
 | 
					                              crossAxisAlignment: CrossAxisAlignment.start,
 | 
				
			||||||
 | 
					                              children: [
 | 
				
			||||||
 | 
					                                Expanded(child: sortDropdown),
 | 
				
			||||||
 | 
					                                const SizedBox(
 | 
				
			||||||
 | 
					                                  width: 16,
 | 
				
			||||||
 | 
					                                ),
 | 
				
			||||||
 | 
					                                Expanded(child: orderDropdown),
 | 
				
			||||||
                              ],
 | 
					                              ],
 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
                            const SizedBox(
 | 
					                            height16,
 | 
				
			||||||
                              height: 16,
 | 
					 | 
				
			||||||
                            ),
 | 
					 | 
				
			||||||
                            Row(
 | 
					                            Row(
 | 
				
			||||||
                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
 | 
					                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
 | 
				
			||||||
                              children: [
 | 
					                              children: [
 | 
				
			||||||
@@ -153,66 +202,47 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
                                    })
 | 
					                                    })
 | 
				
			||||||
                              ],
 | 
					                              ],
 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
 | 
					                            height16,
 | 
				
			||||||
 | 
					                            Row(
 | 
				
			||||||
 | 
					                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
 | 
				
			||||||
 | 
					                              children: [
 | 
				
			||||||
 | 
					                                const Text('Pin Updates to Top of Apps View'),
 | 
				
			||||||
 | 
					                                Switch(
 | 
				
			||||||
 | 
					                                    value: settingsProvider.pinUpdates,
 | 
				
			||||||
 | 
					                                    onChanged: (value) {
 | 
				
			||||||
 | 
					                                      settingsProvider.pinUpdates = value;
 | 
				
			||||||
 | 
					                                    })
 | 
				
			||||||
 | 
					                              ],
 | 
				
			||||||
 | 
					                            ),
 | 
				
			||||||
                            const Divider(
 | 
					                            const Divider(
 | 
				
			||||||
                              height: 16,
 | 
					                              height: 16,
 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
                            const SizedBox(
 | 
					                            height16,
 | 
				
			||||||
                              height: 16,
 | 
					 | 
				
			||||||
                            ),
 | 
					 | 
				
			||||||
                            Text(
 | 
					                            Text(
 | 
				
			||||||
                              'More',
 | 
					                              'Updates',
 | 
				
			||||||
                              style: TextStyle(
 | 
					                              style: TextStyle(
 | 
				
			||||||
                                  color: Theme.of(context).colorScheme.primary),
 | 
					                                  color: Theme.of(context).colorScheme.primary),
 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
                            DropdownButtonFormField(
 | 
					                            intervalDropdown,
 | 
				
			||||||
                                decoration: const InputDecoration(
 | 
					                            const Divider(
 | 
				
			||||||
                                    labelText:
 | 
					                              height: 48,
 | 
				
			||||||
                                        'Background Update Checking Interval'),
 | 
					 | 
				
			||||||
                                value: settingsProvider.updateInterval,
 | 
					 | 
				
			||||||
                                items: const [
 | 
					 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					 | 
				
			||||||
                                    value: 15,
 | 
					 | 
				
			||||||
                                    child: Text('15 Minutes'),
 | 
					 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					                            Text(
 | 
				
			||||||
                                    value: 30,
 | 
					                              'Source-Specific',
 | 
				
			||||||
                                    child: Text('30 Minutes'),
 | 
					                              style: TextStyle(
 | 
				
			||||||
                                  ),
 | 
					                                  color: Theme.of(context).colorScheme.primary),
 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					 | 
				
			||||||
                                    value: 60,
 | 
					 | 
				
			||||||
                                    child: Text('1 Hour'),
 | 
					 | 
				
			||||||
                                  ),
 | 
					 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					 | 
				
			||||||
                                    value: 360,
 | 
					 | 
				
			||||||
                                    child: Text('6 Hours'),
 | 
					 | 
				
			||||||
                                  ),
 | 
					 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					 | 
				
			||||||
                                    value: 720,
 | 
					 | 
				
			||||||
                                    child: Text('12 Hours'),
 | 
					 | 
				
			||||||
                                  ),
 | 
					 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					 | 
				
			||||||
                                    value: 1440,
 | 
					 | 
				
			||||||
                                    child: Text('1 Day'),
 | 
					 | 
				
			||||||
                                  ),
 | 
					 | 
				
			||||||
                                  DropdownMenuItem(
 | 
					 | 
				
			||||||
                                    value: 0,
 | 
					 | 
				
			||||||
                                    child: Text('Never - Manual Only'),
 | 
					 | 
				
			||||||
                            ),
 | 
					                            ),
 | 
				
			||||||
 | 
					                            ...sourceSpecificFields,
 | 
				
			||||||
                          ],
 | 
					                          ],
 | 
				
			||||||
                                onChanged: (value) {
 | 
					                        ))),
 | 
				
			||||||
                                  if (value != null) {
 | 
					          SliverToBoxAdapter(
 | 
				
			||||||
                                    settingsProvider.updateInterval = value;
 | 
					            child: Column(
 | 
				
			||||||
                                  }
 | 
					 | 
				
			||||||
                                }),
 | 
					 | 
				
			||||||
                            const Spacer(),
 | 
					 | 
				
			||||||
                            Row(
 | 
					 | 
				
			||||||
                              mainAxisAlignment: MainAxisAlignment.center,
 | 
					 | 
				
			||||||
              children: [
 | 
					              children: [
 | 
				
			||||||
 | 
					                height16,
 | 
				
			||||||
                TextButton.icon(
 | 
					                TextButton.icon(
 | 
				
			||||||
                  style: ButtonStyle(
 | 
					                  style: ButtonStyle(
 | 
				
			||||||
                                    foregroundColor:
 | 
					                    foregroundColor: MaterialStateProperty.resolveWith<Color>(
 | 
				
			||||||
                                        MaterialStateProperty.resolveWith<
 | 
					                        (Set<MaterialState> states) {
 | 
				
			||||||
                                            Color>((Set<MaterialState> states) {
 | 
					 | 
				
			||||||
                      return Colors.grey;
 | 
					                      return Colors.grey;
 | 
				
			||||||
                    }),
 | 
					                    }),
 | 
				
			||||||
                  ),
 | 
					                  ),
 | 
				
			||||||
@@ -223,14 +253,13 @@ class _SettingsPageState extends State<SettingsPage> {
 | 
				
			|||||||
                  icon: const Icon(Icons.code),
 | 
					                  icon: const Icon(Icons.code),
 | 
				
			||||||
                  label: Text(
 | 
					                  label: Text(
 | 
				
			||||||
                    'Source',
 | 
					                    'Source',
 | 
				
			||||||
                                    style:
 | 
					                    style: Theme.of(context).textTheme.bodySmall,
 | 
				
			||||||
                                        Theme.of(context).textTheme.bodySmall,
 | 
					                  ),
 | 
				
			||||||
 | 
					                ),
 | 
				
			||||||
 | 
					                height16,
 | 
				
			||||||
 | 
					              ],
 | 
				
			||||||
            ),
 | 
					            ),
 | 
				
			||||||
          )
 | 
					          )
 | 
				
			||||||
                              ],
 | 
					 | 
				
			||||||
                            ),
 | 
					 | 
				
			||||||
                          ],
 | 
					 | 
				
			||||||
                        )))
 | 
					 | 
				
			||||||
        ]));
 | 
					        ]));
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,53 +0,0 @@
 | 
				
			|||||||
import 'package:flutter/material.dart';
 | 
					 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class TestPage extends StatefulWidget {
 | 
					 | 
				
			||||||
  const TestPage({super.key});
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  @override
 | 
					 | 
				
			||||||
  State<TestPage> createState() => _TestPageState();
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class _TestPageState extends State<TestPage> {
 | 
					 | 
				
			||||||
  List<String?>? sourceSpecificData;
 | 
					 | 
				
			||||||
  bool valid = false;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  List<List<GeneratedFormItem>> sourceSpecificInputs = [
 | 
					 | 
				
			||||||
    [GeneratedFormItem(label: 'Test Item 1')],
 | 
					 | 
				
			||||||
    [
 | 
					 | 
				
			||||||
      GeneratedFormItem(label: 'Test Item 2', required: false),
 | 
					 | 
				
			||||||
      GeneratedFormItem(label: 'Test Item 3')
 | 
					 | 
				
			||||||
    ],
 | 
					 | 
				
			||||||
    [GeneratedFormItem(label: 'Test Item 4', type: FormItemType.bool)]
 | 
					 | 
				
			||||||
  ];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  List<String> defaultInputValues = ["ABC"];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  void onSourceSpecificDataChanges(
 | 
					 | 
				
			||||||
      List<String?> valuesFromForm, bool formValid) {
 | 
					 | 
				
			||||||
    setState(() {
 | 
					 | 
				
			||||||
      sourceSpecificData = valuesFromForm;
 | 
					 | 
				
			||||||
      valid = formValid;
 | 
					 | 
				
			||||||
    });
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  @override
 | 
					 | 
				
			||||||
  Widget build(BuildContext context) {
 | 
					 | 
				
			||||||
    return Scaffold(
 | 
					 | 
				
			||||||
        appBar: AppBar(title: const Text('Test Page')),
 | 
					 | 
				
			||||||
        backgroundColor: Theme.of(context).colorScheme.surface,
 | 
					 | 
				
			||||||
        body: Padding(
 | 
					 | 
				
			||||||
            padding: const EdgeInsets.symmetric(horizontal: 16),
 | 
					 | 
				
			||||||
            child: Column(children: [
 | 
					 | 
				
			||||||
              GeneratedForm(
 | 
					 | 
				
			||||||
                items: sourceSpecificInputs,
 | 
					 | 
				
			||||||
                onValueChanges: onSourceSpecificDataChanges,
 | 
					 | 
				
			||||||
                defaultValues: defaultInputValues,
 | 
					 | 
				
			||||||
              ),
 | 
					 | 
				
			||||||
              ...(sourceSpecificData != null
 | 
					 | 
				
			||||||
                  ? (sourceSpecificData as List<String?>)
 | 
					 | 
				
			||||||
                      .map((e) => Text(e ?? ""))
 | 
					 | 
				
			||||||
                  : [Container()])
 | 
					 | 
				
			||||||
            ])));
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -5,27 +5,35 @@ import 'dart:async';
 | 
				
			|||||||
import 'dart:convert';
 | 
					import 'dart:convert';
 | 
				
			||||||
import 'dart:io';
 | 
					import 'dart:io';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import 'package:device_info_plus/device_info_plus.dart';
 | 
				
			||||||
import 'package:flutter/material.dart';
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
import 'package:flutter/services.dart';
 | 
					import 'package:flutter/services.dart';
 | 
				
			||||||
 | 
					import 'package:fluttertoast/fluttertoast.dart';
 | 
				
			||||||
 | 
					import 'package:install_plugin_v2/install_plugin_v2.dart';
 | 
				
			||||||
 | 
					import 'package:installed_apps/app_info.dart';
 | 
				
			||||||
 | 
					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/notifications_provider.dart';
 | 
				
			||||||
 | 
					import 'package:package_archive_info/package_archive_info.dart';
 | 
				
			||||||
import 'package:provider/provider.dart';
 | 
					import 'package:provider/provider.dart';
 | 
				
			||||||
import 'package:path_provider/path_provider.dart';
 | 
					import 'package:path_provider/path_provider.dart';
 | 
				
			||||||
import 'package:flutter_fgbg/flutter_fgbg.dart';
 | 
					import 'package:flutter_fgbg/flutter_fgbg.dart';
 | 
				
			||||||
import 'package:obtainium/providers/source_provider.dart';
 | 
					import 'package:obtainium/providers/source_provider.dart';
 | 
				
			||||||
import 'package:http/http.dart';
 | 
					import 'package:http/http.dart';
 | 
				
			||||||
import 'package:install_plugin_v2/install_plugin_v2.dart';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
class AppInMemory {
 | 
					class AppInMemory {
 | 
				
			||||||
  late App app;
 | 
					  late App app;
 | 
				
			||||||
  double? downloadProgress;
 | 
					  double? downloadProgress;
 | 
				
			||||||
 | 
					  AppInfo? installedInfo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AppInMemory(this.app, this.downloadProgress);
 | 
					  AppInMemory(this.app, this.downloadProgress, this.installedInfo);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ApkFile {
 | 
					class DownloadedApk {
 | 
				
			||||||
  String appId;
 | 
					  String appId;
 | 
				
			||||||
  File file;
 | 
					  File file;
 | 
				
			||||||
  ApkFile(this.appId, this.file);
 | 
					  DownloadedApk(this.appId, this.file);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class AppsProvider with ChangeNotifier {
 | 
					class AppsProvider with ChangeNotifier {
 | 
				
			||||||
@@ -33,136 +41,308 @@ class AppsProvider with ChangeNotifier {
 | 
				
			|||||||
  Map<String, AppInMemory> apps = {};
 | 
					  Map<String, AppInMemory> apps = {};
 | 
				
			||||||
  bool loadingApps = false;
 | 
					  bool loadingApps = false;
 | 
				
			||||||
  bool gettingUpdates = false;
 | 
					  bool gettingUpdates = false;
 | 
				
			||||||
 | 
					  bool forBGTask = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Variables to keep track of the app foreground status (installs can't run in the background)
 | 
					  // Variables to keep track of the app foreground status (installs can't run in the background)
 | 
				
			||||||
  bool isForeground = true;
 | 
					  bool isForeground = true;
 | 
				
			||||||
  late Stream<FGBGType> foregroundStream;
 | 
					  late Stream<FGBGType>? foregroundStream;
 | 
				
			||||||
  late StreamSubscription<FGBGType> foregroundSubscription;
 | 
					  late StreamSubscription<FGBGType>? foregroundSubscription;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AppsProvider(
 | 
					  AppsProvider({this.forBGTask = false}) {
 | 
				
			||||||
      {bool shouldLoadApps = false,
 | 
					    // Many setup tasks should only be done in the foreground isolate
 | 
				
			||||||
      bool shouldCheckUpdatesAfterLoad = false,
 | 
					    if (!forBGTask) {
 | 
				
			||||||
      bool shouldDeleteAPKs = false}) {
 | 
					 | 
				
			||||||
      // Subscribe to changes in the app foreground status
 | 
					      // Subscribe to changes in the app foreground status
 | 
				
			||||||
      foregroundStream = FGBGEvents.stream.asBroadcastStream();
 | 
					      foregroundStream = FGBGEvents.stream.asBroadcastStream();
 | 
				
			||||||
    foregroundSubscription = foregroundStream.listen((event) async {
 | 
					      foregroundSubscription = foregroundStream?.listen((event) async {
 | 
				
			||||||
        isForeground = event == FGBGType.foreground;
 | 
					        isForeground = event == FGBGType.foreground;
 | 
				
			||||||
        if (isForeground) await loadApps();
 | 
					        if (isForeground) await loadApps();
 | 
				
			||||||
      });
 | 
					      });
 | 
				
			||||||
    if (shouldDeleteAPKs) {
 | 
					      () async {
 | 
				
			||||||
      deleteSavedAPKs();
 | 
					        // Load Apps into memory (in background, this is done later instead of in the constructor)
 | 
				
			||||||
    }
 | 
					        await loadApps();
 | 
				
			||||||
    if (shouldLoadApps) {
 | 
					        // Delete existing APKs
 | 
				
			||||||
      loadApps().then((_) {
 | 
					        (await getExternalStorageDirectory())
 | 
				
			||||||
        if (shouldCheckUpdatesAfterLoad) {
 | 
					            ?.listSync()
 | 
				
			||||||
          checkUpdates();
 | 
					            .where((element) => element.path.endsWith('.apk'))
 | 
				
			||||||
        }
 | 
					            .forEach((apk) {
 | 
				
			||||||
 | 
					          apk.delete();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
 | 
					      }();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<ApkFile> downloadApp(String apkUrl, String appId) async {
 | 
					  downloadFile(String url, String fileName, Function? onProgress) async {
 | 
				
			||||||
 | 
					    var destDir = (await getExternalStorageDirectory())!.path;
 | 
				
			||||||
    StreamedResponse response =
 | 
					    StreamedResponse response =
 | 
				
			||||||
        await Client().send(Request('GET', Uri.parse(apkUrl)));
 | 
					        await Client().send(Request('GET', Uri.parse(url)));
 | 
				
			||||||
    File downloadFile =
 | 
					    File downloadedFile = File('$destDir/$fileName');
 | 
				
			||||||
        File('${(await getExternalStorageDirectory())!.path}/$appId.apk');
 | 
					
 | 
				
			||||||
    if (downloadFile.existsSync()) {
 | 
					    if (downloadedFile.existsSync()) {
 | 
				
			||||||
      downloadFile.deleteSync();
 | 
					      downloadedFile.deleteSync();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    var length = response.contentLength;
 | 
					    var length = response.contentLength;
 | 
				
			||||||
    var received = 0;
 | 
					    var received = 0;
 | 
				
			||||||
    var sink = downloadFile.openWrite();
 | 
					    double? progress;
 | 
				
			||||||
 | 
					    var sink = downloadedFile.openWrite();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    await response.stream.map((s) {
 | 
					    await response.stream.map((s) {
 | 
				
			||||||
      received += s.length;
 | 
					      received += s.length;
 | 
				
			||||||
      apps[appId]!.downloadProgress =
 | 
					      progress = (length != null ? received / length * 100 : 30);
 | 
				
			||||||
          (length != null ? received / length * 100 : 30);
 | 
					      if (onProgress != null) {
 | 
				
			||||||
      notifyListeners();
 | 
					        onProgress(progress);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
      return s;
 | 
					      return s;
 | 
				
			||||||
    }).pipe(sink);
 | 
					    }).pipe(sink);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    await sink.close();
 | 
					    await sink.close();
 | 
				
			||||||
    apps[appId]!.downloadProgress = null;
 | 
					    progress = null;
 | 
				
			||||||
    notifyListeners();
 | 
					    if (onProgress != null) {
 | 
				
			||||||
 | 
					      onProgress(progress);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (response.statusCode != 200) {
 | 
					    if (response.statusCode != 200) {
 | 
				
			||||||
      downloadFile.deleteSync();
 | 
					      downloadedFile.deleteSync();
 | 
				
			||||||
      throw response.reasonPhrase ?? 'Unknown Error';
 | 
					      throw response.reasonPhrase ?? 'Unknown Error';
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return ApkFile(appId, downloadFile);
 | 
					    return downloadedFile;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  Future<DownloadedApk> downloadApp(App app) async {
 | 
				
			||||||
 | 
					    var fileName =
 | 
				
			||||||
 | 
					        '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
 | 
				
			||||||
 | 
					    String downloadUrl = await SourceProvider()
 | 
				
			||||||
 | 
					        .getSource(app.url)
 | 
				
			||||||
 | 
					        .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
 | 
				
			||||||
 | 
					    int? prevProg;
 | 
				
			||||||
 | 
					    File downloadedFile =
 | 
				
			||||||
 | 
					        await downloadFile(downloadUrl, fileName, (double? progress) {
 | 
				
			||||||
 | 
					      int? prog = progress?.ceil();
 | 
				
			||||||
 | 
					      if (apps[app.id] != null) {
 | 
				
			||||||
 | 
					        apps[app.id]!.downloadProgress = progress;
 | 
				
			||||||
 | 
					        notifyListeners();
 | 
				
			||||||
 | 
					      } else if ((prog == 25 || prog == 50 || prog == 75) && prevProg != prog) {
 | 
				
			||||||
 | 
					        Fluttertoast.showToast(
 | 
				
			||||||
 | 
					            msg: 'Progress: $prog%', toastLength: Toast.LENGTH_SHORT);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      prevProg = prog;
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					    // Delete older versions of the APK if any
 | 
				
			||||||
 | 
					    for (var file in downloadedFile.parent.listSync()) {
 | 
				
			||||||
 | 
					      var fn = file.path.split('/').last;
 | 
				
			||||||
 | 
					      if (fn.startsWith('${app.id}-') &&
 | 
				
			||||||
 | 
					          fn.endsWith('.apk') &&
 | 
				
			||||||
 | 
					          fn != fileName) {
 | 
				
			||||||
 | 
					        file.delete();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
 | 
				
			||||||
 | 
					    // The former case should be handled (give the App its real ID), the latter is a security issue
 | 
				
			||||||
 | 
					    var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
 | 
				
			||||||
 | 
					    if (app.id != newInfo.packageName) {
 | 
				
			||||||
 | 
					      if (apps[app.id] != null && !SourceProvider().isTempId(app.id)) {
 | 
				
			||||||
 | 
					        throw IDChangedError();
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      var originalAppId = app.id;
 | 
				
			||||||
 | 
					      app.id = newInfo.packageName;
 | 
				
			||||||
 | 
					      downloadedFile = downloadedFile.renameSync(
 | 
				
			||||||
 | 
					          '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
 | 
				
			||||||
 | 
					      if (apps[originalAppId] != null) {
 | 
				
			||||||
 | 
					        await removeApps([originalAppId]);
 | 
				
			||||||
 | 
					        await saveApps([app]);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return DownloadedApk(app.id, downloadedFile);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool areDownloadsRunning() => apps.values
 | 
					  bool areDownloadsRunning() => apps.values
 | 
				
			||||||
      .where((element) => element.downloadProgress != null)
 | 
					      .where((element) => element.downloadProgress != null)
 | 
				
			||||||
      .isNotEmpty;
 | 
					      .isNotEmpty;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Given an AppId, uses stored info about the app to download an APK (with user input if needed) and install it
 | 
					  Future<bool> canInstallSilently(App app) async {
 | 
				
			||||||
  // Installs can only be done in the foreground, so a notification is sent to get the user's attention if needed
 | 
					    return false;
 | 
				
			||||||
  // Returns upon successful download, regardless of installation result
 | 
					    // TODO: Uncomment the below once silentupdates are ever figured out
 | 
				
			||||||
  Future<bool> downloadAndInstallLatestApp(
 | 
					    // // TODO: This is unreliable - try to get from OS in the future
 | 
				
			||||||
      List<String> appIds, BuildContext context) async {
 | 
					    // if (app.apkUrls.length > 1) {
 | 
				
			||||||
 | 
					    //    return false;
 | 
				
			||||||
 | 
					    // }
 | 
				
			||||||
 | 
					    // var osInfo = await DeviceInfoPlugin().androidInfo;
 | 
				
			||||||
 | 
					    // return app.installedVersion != null &&
 | 
				
			||||||
 | 
					    //     osInfo.version.sdkInt >= 30 &&
 | 
				
			||||||
 | 
					    //     osInfo.version.release.compareTo('12') >= 0;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  Future<void> waitForUserToReturnToForeground(BuildContext context) async {
 | 
				
			||||||
    NotificationsProvider notificationsProvider =
 | 
					    NotificationsProvider notificationsProvider =
 | 
				
			||||||
        context.read<NotificationsProvider>();
 | 
					        context.read<NotificationsProvider>();
 | 
				
			||||||
    Map<String, String> appsToInstall = {};
 | 
					    if (!isForeground) {
 | 
				
			||||||
    for (var id in appIds) {
 | 
					      await notificationsProvider.notify(completeInstallationNotification,
 | 
				
			||||||
      if (apps[id] == null) {
 | 
					          cancelExisting: true);
 | 
				
			||||||
        throw 'App not found';
 | 
					      while (await FGBGEvents.stream.first != FGBGType.foreground) {}
 | 
				
			||||||
 | 
					      await notificationsProvider.cancel(completeInstallationNotification.id);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
      // If the App has more than one APK, the user should pick one
 | 
					  }
 | 
				
			||||||
      String? apkUrl = apps[id]!.app.apkUrls[apps[id]!.app.preferredApkIndex];
 | 
					
 | 
				
			||||||
      if (apps[id]!.app.apkUrls.length > 1) {
 | 
					  // Unfortunately this 'await' does not actually wait for the APK to finish installing
 | 
				
			||||||
 | 
					  // So we only know that the install prompt was shown, but the user could still cancel w/o us knowing
 | 
				
			||||||
 | 
					  // 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(DownloadedApk file) async {
 | 
				
			||||||
 | 
					    var newInfo = await PackageArchiveInfo.fromPath(file.file.path);
 | 
				
			||||||
 | 
					    AppInfo? appInfo;
 | 
				
			||||||
 | 
					    try {
 | 
				
			||||||
 | 
					      appInfo = await InstalledApps.getAppInfo(apps[file.appId]!.app.id);
 | 
				
			||||||
 | 
					    } catch (e) {
 | 
				
			||||||
 | 
					      // OK
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (appInfo != null &&
 | 
				
			||||||
 | 
					        int.parse(newInfo.buildNumber) < appInfo.versionCode!) {
 | 
				
			||||||
 | 
					      throw DowngradeError();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (appInfo == null ||
 | 
				
			||||||
 | 
					        int.parse(newInfo.buildNumber) > appInfo.versionCode!) {
 | 
				
			||||||
 | 
					      await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    apps[file.appId]!.app.installedVersion =
 | 
				
			||||||
 | 
					        apps[file.appId]!.app.latestVersion;
 | 
				
			||||||
 | 
					    // Don't correct install status as installation may not be done yet
 | 
				
			||||||
 | 
					    await saveApps([apps[file.appId]!.app],
 | 
				
			||||||
 | 
					        attemptToCorrectInstallStatus: false);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  Future<String?> confirmApkUrl(App app, BuildContext? context) async {
 | 
				
			||||||
 | 
					    // If the App has more than one APK, the user should pick one (if context provided)
 | 
				
			||||||
 | 
					    String? apkUrl = app.apkUrls[app.preferredApkIndex];
 | 
				
			||||||
 | 
					    // get device supported architecture
 | 
				
			||||||
 | 
					    List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (app.apkUrls.length > 1 && context != null) {
 | 
				
			||||||
      apkUrl = await showDialog(
 | 
					      apkUrl = await showDialog(
 | 
				
			||||||
          context: context,
 | 
					          context: context,
 | 
				
			||||||
          builder: (BuildContext ctx) {
 | 
					          builder: (BuildContext ctx) {
 | 
				
			||||||
              return APKPicker(app: apps[id]!.app, initVal: apkUrl);
 | 
					            return APKPicker(
 | 
				
			||||||
 | 
					              app: app,
 | 
				
			||||||
 | 
					              initVal: apkUrl,
 | 
				
			||||||
 | 
					              archs: archs,
 | 
				
			||||||
 | 
					            );
 | 
				
			||||||
          });
 | 
					          });
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
      // If the picked APK comes from an origin different from the source, get user confirmation
 | 
					    // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
 | 
				
			||||||
    if (apkUrl != null &&
 | 
					    if (apkUrl != null &&
 | 
				
			||||||
          Uri.parse(apkUrl).origin != Uri.parse(apps[id]!.app.url).origin) {
 | 
					        Uri.parse(apkUrl).origin != Uri.parse(app.url).origin &&
 | 
				
			||||||
 | 
					        context != null) {
 | 
				
			||||||
      if (await showDialog(
 | 
					      if (await showDialog(
 | 
				
			||||||
              context: context,
 | 
					              context: context,
 | 
				
			||||||
              builder: (BuildContext ctx) {
 | 
					              builder: (BuildContext ctx) {
 | 
				
			||||||
                return APKOriginWarningDialog(
 | 
					                return APKOriginWarningDialog(
 | 
				
			||||||
                      sourceUrl: apps[id]!.app.url, apkUrl: apkUrl!);
 | 
					                    sourceUrl: app.url, apkUrl: apkUrl!);
 | 
				
			||||||
              }) !=
 | 
					              }) !=
 | 
				
			||||||
          true) {
 | 
					          true) {
 | 
				
			||||||
        apkUrl = null;
 | 
					        apkUrl = null;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    return apkUrl;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  // Given a list of AppIds, uses stored info about the apps to download APKs and install them
 | 
				
			||||||
 | 
					  // If the APKs can be installed silently, they are
 | 
				
			||||||
 | 
					  // If no BuildContext is provided, apps that require user interaction are ignored
 | 
				
			||||||
 | 
					  // If user input is needed and the App is in the background, a notification is sent to get the user's attention
 | 
				
			||||||
 | 
					  // Returns an array of Ids for Apps that were successfully downloaded, regardless of installation result
 | 
				
			||||||
 | 
					  Future<List<String>> downloadAndInstallLatestApps(
 | 
				
			||||||
 | 
					      List<String> appIds, BuildContext? context) async {
 | 
				
			||||||
 | 
					    List<String> appsToInstall = [];
 | 
				
			||||||
 | 
					    // For all specified Apps, filter out those for which:
 | 
				
			||||||
 | 
					    // 1. A URL cannot be picked
 | 
				
			||||||
 | 
					    // 2. That cannot be installed silently (IF no buildContext was given for interactive install)
 | 
				
			||||||
 | 
					    for (var id in appIds) {
 | 
				
			||||||
 | 
					      if (apps[id] == null) {
 | 
				
			||||||
 | 
					        throw ObtainiumError('App not found');
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      String? apkUrl = await confirmApkUrl(apps[id]!.app, context);
 | 
				
			||||||
      if (apkUrl != null) {
 | 
					      if (apkUrl != null) {
 | 
				
			||||||
        int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
 | 
					        int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
 | 
				
			||||||
        if (urlInd != apps[id]!.app.preferredApkIndex) {
 | 
					        if (urlInd != apps[id]!.app.preferredApkIndex) {
 | 
				
			||||||
          apps[id]!.app.preferredApkIndex = urlInd;
 | 
					          apps[id]!.app.preferredApkIndex = urlInd;
 | 
				
			||||||
          await saveApp(apps[id]!.app);
 | 
					          await saveApps([apps[id]!.app]);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        appsToInstall.putIfAbsent(id, () => apkUrl!);
 | 
					        if (context != null || await canInstallSilently(apps[id]!.app)) {
 | 
				
			||||||
 | 
					          appsToInstall.add(id);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries
 | 
					 | 
				
			||||||
        .map((entry) => downloadApp(entry.value, entry.key)));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (!isForeground) {
 | 
					 | 
				
			||||||
      await notificationsProvider.notify(completeInstallationNotification,
 | 
					 | 
				
			||||||
          cancelExisting: true);
 | 
					 | 
				
			||||||
      await FGBGEvents.stream.first == FGBGType.foreground;
 | 
					 | 
				
			||||||
      await notificationsProvider.cancel(completeInstallationNotification.id);
 | 
					 | 
				
			||||||
      // We need to wait for the App to come to the foreground to install it
 | 
					 | 
				
			||||||
      // Can't try to call install plugin in a background isolate (may not have worked anyways) because of:
 | 
					 | 
				
			||||||
      // https://github.com/flutter/flutter/issues/13937
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    // Download APKs for all Apps to be installed
 | 
				
			||||||
    // Unfortunately this 'await' does not actually wait for the APK to finish installing
 | 
					    MultiAppMultiError errors = MultiAppMultiError();
 | 
				
			||||||
    // So we only know that the install prompt was shown, but the user could still cancel w/o us knowing
 | 
					    List<DownloadedApk?> downloadedFiles =
 | 
				
			||||||
    // This also does not use the 'session-based' installer API, so background/silent updates are impossible
 | 
					        await Future.wait(appsToInstall.map((id) async {
 | 
				
			||||||
 | 
					      try {
 | 
				
			||||||
 | 
					        return await downloadApp(apps[id]!.app);
 | 
				
			||||||
 | 
					      } catch (e) {
 | 
				
			||||||
 | 
					        errors.add(id, e.toString());
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      return null;
 | 
				
			||||||
 | 
					    }));
 | 
				
			||||||
 | 
					    downloadedFiles =
 | 
				
			||||||
 | 
					        downloadedFiles.where((element) => element != null).toList();
 | 
				
			||||||
 | 
					    // Separate the Apps to install into silent and regular lists
 | 
				
			||||||
 | 
					    List<DownloadedApk> silentUpdates = [];
 | 
				
			||||||
 | 
					    List<DownloadedApk> regularInstalls = [];
 | 
				
			||||||
    for (var f in downloadedFiles) {
 | 
					    for (var f in downloadedFiles) {
 | 
				
			||||||
      await InstallPlugin.installApk(f.file.path, 'dev.imranr.obtainium');
 | 
					      bool willBeSilent = await canInstallSilently(apps[f!.appId]!.app);
 | 
				
			||||||
      apps[f.appId]!.app.installedVersion = apps[f.appId]!.app.latestVersion;
 | 
					      if (willBeSilent) {
 | 
				
			||||||
      await saveApp(apps[f.appId]!.app);
 | 
					        silentUpdates.add(f);
 | 
				
			||||||
 | 
					      } else {
 | 
				
			||||||
 | 
					        regularInstalls.add(f);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return downloadedFiles.isNotEmpty;
 | 
					    // Move everything to the regular install list (since silent updates don't currently work) - TODO
 | 
				
			||||||
 | 
					    regularInstalls.addAll(silentUpdates);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // If Obtainium is being installed, it should be the last one
 | 
				
			||||||
 | 
					    List<DownloadedApk> moveObtainiumToStart(List<DownloadedApk> items) {
 | 
				
			||||||
 | 
					      String obtainiumId = 'imranr98_obtainium_${GitHub().host}';
 | 
				
			||||||
 | 
					      DownloadedApk? temp;
 | 
				
			||||||
 | 
					      items.removeWhere((element) {
 | 
				
			||||||
 | 
					        bool res = element.appId == obtainiumId;
 | 
				
			||||||
 | 
					        if (res) {
 | 
				
			||||||
 | 
					          temp = element;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return res;
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
 | 
					      if (temp != null) {
 | 
				
			||||||
 | 
					        items = [temp!, ...items];
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      return items;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    silentUpdates = moveObtainiumToStart(silentUpdates);
 | 
				
			||||||
 | 
					    regularInstalls = moveObtainiumToStart(regularInstalls);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // // Install silent updates (uncomment when it works - TODO)
 | 
				
			||||||
 | 
					    // for (var u in silentUpdates) {
 | 
				
			||||||
 | 
					    //   await installApk(u, silent: true); // Would need to add silent option
 | 
				
			||||||
 | 
					    // }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Do regular installs
 | 
				
			||||||
 | 
					    if (regularInstalls.isNotEmpty && context != null) {
 | 
				
			||||||
 | 
					      // ignore: use_build_context_synchronously
 | 
				
			||||||
 | 
					      await waitForUserToReturnToForeground(context);
 | 
				
			||||||
 | 
					      for (var i in regularInstalls) {
 | 
				
			||||||
 | 
					        try {
 | 
				
			||||||
 | 
					          await installApk(i);
 | 
				
			||||||
 | 
					        } catch (e) {
 | 
				
			||||||
 | 
					          errors.add(i.appId, e.toString());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (errors.content.isNotEmpty) {
 | 
				
			||||||
 | 
					      throw errors;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    NotificationsProvider().cancel(UpdateNotification([]).id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return downloadedFiles.map((e) => e!.appId).toList();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<Directory> getAppsDir() async {
 | 
					  Future<Directory> getAppsDir() async {
 | 
				
			||||||
@@ -174,16 +354,62 @@ class AppsProvider with ChangeNotifier {
 | 
				
			|||||||
    return appsDir;
 | 
					    return appsDir;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<void> deleteSavedAPKs() async {
 | 
					  Future<AppInfo?> getInstalledInfo(String? packageName) async {
 | 
				
			||||||
    (await getExternalStorageDirectory())
 | 
					    if (packageName != null) {
 | 
				
			||||||
        ?.listSync()
 | 
					      try {
 | 
				
			||||||
        .where((element) => element.path.endsWith('.apk'))
 | 
					        return await InstalledApps.getAppInfo(packageName);
 | 
				
			||||||
        .forEach((element) {
 | 
					      } catch (e) {
 | 
				
			||||||
      element.deleteSync();
 | 
					        // OK
 | 
				
			||||||
    });
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return null;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  // If the App says it is installed but installedInfo is null, set it to not installed
 | 
				
			||||||
 | 
					  // If the App says is is not installed but installedInfo exists, try to set it to installed as latest version...
 | 
				
			||||||
 | 
					  // ...if the latestVersion seems to match the version in installedInfo (not guaranteed)
 | 
				
			||||||
 | 
					  // If that fails, just set it to the actual version string (all we can do at that point)
 | 
				
			||||||
 | 
					  // Don't save changes, just return the object if changes were made (else null)
 | 
				
			||||||
 | 
					  // If in a background isolate, return null straight away as the required plugin won't work anyways
 | 
				
			||||||
 | 
					  App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
 | 
				
			||||||
 | 
					    if (forBGTask) {
 | 
				
			||||||
 | 
					      return null; // Can't correct in the background isolate
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    var modded = false;
 | 
				
			||||||
 | 
					    if (installedInfo == null && app.installedVersion != null) {
 | 
				
			||||||
 | 
					      app.installedVersion = null;
 | 
				
			||||||
 | 
					      modded = true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (installedInfo != null && app.installedVersion == null) {
 | 
				
			||||||
 | 
					      if (app.latestVersion.characters
 | 
				
			||||||
 | 
					              .where((p0) => [
 | 
				
			||||||
 | 
					                    '0',
 | 
				
			||||||
 | 
					                    '1',
 | 
				
			||||||
 | 
					                    '2',
 | 
				
			||||||
 | 
					                    '3',
 | 
				
			||||||
 | 
					                    '4',
 | 
				
			||||||
 | 
					                    '5',
 | 
				
			||||||
 | 
					                    '6',
 | 
				
			||||||
 | 
					                    '7',
 | 
				
			||||||
 | 
					                    '8',
 | 
				
			||||||
 | 
					                    '9',
 | 
				
			||||||
 | 
					                    '.'
 | 
				
			||||||
 | 
					                  ].contains(p0))
 | 
				
			||||||
 | 
					              .join('') ==
 | 
				
			||||||
 | 
					          installedInfo.versionName) {
 | 
				
			||||||
 | 
					        app.installedVersion = app.latestVersion;
 | 
				
			||||||
 | 
					      } else {
 | 
				
			||||||
 | 
					        app.installedVersion = installedInfo.versionName;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      modded = true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return modded ? app : null;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<void> loadApps() async {
 | 
					  Future<void> loadApps() async {
 | 
				
			||||||
 | 
					    while (loadingApps) {
 | 
				
			||||||
 | 
					      await Future.delayed(const Duration(microseconds: 1));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    loadingApps = true;
 | 
					    loadingApps = true;
 | 
				
			||||||
    notifyListeners();
 | 
					    notifyListeners();
 | 
				
			||||||
    List<FileSystemEntity> appFiles = (await getAppsDir())
 | 
					    List<FileSystemEntity> appFiles = (await getAppsDir())
 | 
				
			||||||
@@ -191,24 +417,58 @@ class AppsProvider with ChangeNotifier {
 | 
				
			|||||||
        .where((item) => item.path.toLowerCase().endsWith('.json'))
 | 
					        .where((item) => item.path.toLowerCase().endsWith('.json'))
 | 
				
			||||||
        .toList();
 | 
					        .toList();
 | 
				
			||||||
    apps.clear();
 | 
					    apps.clear();
 | 
				
			||||||
 | 
					    var sp = SourceProvider();
 | 
				
			||||||
 | 
					    List<List<String>> errors = [];
 | 
				
			||||||
    for (int i = 0; i < appFiles.length; i++) {
 | 
					    for (int i = 0; i < appFiles.length; i++) {
 | 
				
			||||||
      App app =
 | 
					      App app =
 | 
				
			||||||
          App.fromJson(jsonDecode(File(appFiles[i].path).readAsStringSync()));
 | 
					          App.fromJson(jsonDecode(File(appFiles[i].path).readAsStringSync()));
 | 
				
			||||||
      apps.putIfAbsent(app.id, () => AppInMemory(app, null));
 | 
					      var info = await getInstalledInfo(app.id);
 | 
				
			||||||
 | 
					      try {
 | 
				
			||||||
 | 
					        sp.getSource(app.url);
 | 
				
			||||||
 | 
					        apps.putIfAbsent(app.id, () => AppInMemory(app, null, info));
 | 
				
			||||||
 | 
					      } catch (e) {
 | 
				
			||||||
 | 
					        errors.add([app.id, app.name, e.toString()]);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (errors.isNotEmpty) {
 | 
				
			||||||
 | 
					      removeApps(errors.map((e) => e[0]).toList());
 | 
				
			||||||
 | 
					      NotificationsProvider().notify(
 | 
				
			||||||
 | 
					          AppsRemovedNotification(errors.map((e) => [e[1], e[2]]).toList()));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    loadingApps = false;
 | 
					    loadingApps = false;
 | 
				
			||||||
    notifyListeners();
 | 
					    notifyListeners();
 | 
				
			||||||
 | 
					    List<App> modifiedApps = [];
 | 
				
			||||||
 | 
					    for (var app in apps.values) {
 | 
				
			||||||
 | 
					      var moddedApp =
 | 
				
			||||||
 | 
					          getCorrectedInstallStatusAppIfPossible(app.app, app.installedInfo);
 | 
				
			||||||
 | 
					      if (moddedApp != null) {
 | 
				
			||||||
 | 
					        modifiedApps.add(moddedApp);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (modifiedApps.isNotEmpty) {
 | 
				
			||||||
 | 
					      await saveApps(modifiedApps);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<void> saveApp(App app) async {
 | 
					  Future<void> saveApps(List<App> apps,
 | 
				
			||||||
 | 
					      {bool attemptToCorrectInstallStatus = true}) async {
 | 
				
			||||||
 | 
					    for (var app in apps) {
 | 
				
			||||||
 | 
					      AppInfo? info = await getInstalledInfo(app.id);
 | 
				
			||||||
 | 
					      app.name = info?.name ?? app.name;
 | 
				
			||||||
 | 
					      if (attemptToCorrectInstallStatus) {
 | 
				
			||||||
 | 
					        app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
      File('${(await getAppsDir()).path}/${app.id}.json')
 | 
					      File('${(await getAppsDir()).path}/${app.id}.json')
 | 
				
			||||||
          .writeAsStringSync(jsonEncode(app.toJson()));
 | 
					          .writeAsStringSync(jsonEncode(app.toJson()));
 | 
				
			||||||
    apps.update(app.id, (value) => AppInMemory(app, value.downloadProgress),
 | 
					      this.apps.update(
 | 
				
			||||||
        ifAbsent: () => AppInMemory(app, null));
 | 
					          app.id, (value) => AppInMemory(app, value.downloadProgress, info),
 | 
				
			||||||
 | 
					          ifAbsent: () => AppInMemory(app, null, info));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    notifyListeners();
 | 
					    notifyListeners();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<void> removeApp(String appId) async {
 | 
					  Future<void> removeApps(List<String> appIds) async {
 | 
				
			||||||
 | 
					    for (var appId in appIds) {
 | 
				
			||||||
      File file = File('${(await getAppsDir()).path}/$appId.json');
 | 
					      File file = File('${(await getAppsDir()).path}/$appId.json');
 | 
				
			||||||
      if (file.existsSync()) {
 | 
					      if (file.existsSync()) {
 | 
				
			||||||
        file.deleteSync();
 | 
					        file.deleteSync();
 | 
				
			||||||
@@ -216,60 +476,89 @@ class AppsProvider with ChangeNotifier {
 | 
				
			|||||||
      if (apps.containsKey(appId)) {
 | 
					      if (apps.containsKey(appId)) {
 | 
				
			||||||
        apps.remove(appId);
 | 
					        apps.remove(appId);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (appIds.isNotEmpty) {
 | 
				
			||||||
      notifyListeners();
 | 
					      notifyListeners();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					 | 
				
			||||||
  bool checkAppObjectForUpdate(App app) {
 | 
					 | 
				
			||||||
    if (!apps.containsKey(app.id)) {
 | 
					 | 
				
			||||||
      throw 'App not found';
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    return app.latestVersion != apps[app.id]?.app.installedVersion;
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<App?> getUpdate(String appId) async {
 | 
					  Future<App?> checkUpdate(String appId) async {
 | 
				
			||||||
    App? currentApp = apps[appId]!.app;
 | 
					    App? currentApp = apps[appId]!.app;
 | 
				
			||||||
    SourceProvider sourceProvider = SourceProvider();
 | 
					    SourceProvider sourceProvider = SourceProvider();
 | 
				
			||||||
    App newApp = await sourceProvider.getApp(
 | 
					    App newApp = await sourceProvider.getApp(
 | 
				
			||||||
        sourceProvider.getSource(currentApp.url),
 | 
					        sourceProvider.getSource(currentApp.url),
 | 
				
			||||||
        currentApp.url,
 | 
					        currentApp.url,
 | 
				
			||||||
        currentApp.additionalData);
 | 
					        currentApp.additionalData,
 | 
				
			||||||
    if (newApp.latestVersion != currentApp.latestVersion) {
 | 
					        name: currentApp.name,
 | 
				
			||||||
 | 
					        id: currentApp.id);
 | 
				
			||||||
    newApp.installedVersion = currentApp.installedVersion;
 | 
					    newApp.installedVersion = currentApp.installedVersion;
 | 
				
			||||||
    if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
 | 
					    if (currentApp.preferredApkIndex < newApp.apkUrls.length) {
 | 
				
			||||||
      newApp.preferredApkIndex = currentApp.preferredApkIndex;
 | 
					      newApp.preferredApkIndex = currentApp.preferredApkIndex;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
      await saveApp(newApp);
 | 
					    await saveApps([newApp]);
 | 
				
			||||||
      return newApp;
 | 
					    return newApp.latestVersion != currentApp.latestVersion ? newApp : null;
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    return null;
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<List<App>> checkUpdates() async {
 | 
					  Future<List<App>> checkUpdates(
 | 
				
			||||||
 | 
					      {DateTime? ignoreAppsCheckedAfter,
 | 
				
			||||||
 | 
					      bool throwErrorsForRetry = false}) async {
 | 
				
			||||||
    List<App> updates = [];
 | 
					    List<App> updates = [];
 | 
				
			||||||
 | 
					    MultiAppMultiError errors = MultiAppMultiError();
 | 
				
			||||||
    if (!gettingUpdates) {
 | 
					    if (!gettingUpdates) {
 | 
				
			||||||
      gettingUpdates = true;
 | 
					      gettingUpdates = true;
 | 
				
			||||||
 | 
					      try {
 | 
				
			||||||
      List<String> appIds = apps.keys.toList();
 | 
					        List<String> appIds = apps.values
 | 
				
			||||||
 | 
					            .where((app) =>
 | 
				
			||||||
 | 
					                app.app.lastUpdateCheck == null ||
 | 
				
			||||||
 | 
					                ignoreAppsCheckedAfter == null ||
 | 
				
			||||||
 | 
					                app.app.lastUpdateCheck!.isBefore(ignoreAppsCheckedAfter))
 | 
				
			||||||
 | 
					            .map((e) => e.app.id)
 | 
				
			||||||
 | 
					            .toList();
 | 
				
			||||||
 | 
					        appIds.sort((a, b) => (apps[a]!.app.lastUpdateCheck ??
 | 
				
			||||||
 | 
					                DateTime.fromMicrosecondsSinceEpoch(0))
 | 
				
			||||||
 | 
					            .compareTo(apps[b]!.app.lastUpdateCheck ??
 | 
				
			||||||
 | 
					                DateTime.fromMicrosecondsSinceEpoch(0)));
 | 
				
			||||||
        for (int i = 0; i < appIds.length; i++) {
 | 
					        for (int i = 0; i < appIds.length; i++) {
 | 
				
			||||||
        App? newApp = await getUpdate(appIds[i]);
 | 
					          App? newApp;
 | 
				
			||||||
 | 
					          try {
 | 
				
			||||||
 | 
					            newApp = await checkUpdate(appIds[i]);
 | 
				
			||||||
 | 
					          } catch (e) {
 | 
				
			||||||
 | 
					            if ((e is RateLimitError || e is SocketException) &&
 | 
				
			||||||
 | 
					                throwErrorsForRetry) {
 | 
				
			||||||
 | 
					              rethrow;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            errors.add(appIds[i], e.toString());
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
          if (newApp != null) {
 | 
					          if (newApp != null) {
 | 
				
			||||||
            updates.add(newApp);
 | 
					            updates.add(newApp);
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					      } finally {
 | 
				
			||||||
        gettingUpdates = false;
 | 
					        gettingUpdates = false;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (errors.content.isNotEmpty) {
 | 
				
			||||||
 | 
					      throw errors;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    return updates;
 | 
					    return updates;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  List<String> getExistingUpdates() {
 | 
					  List<String> findExistingUpdates(
 | 
				
			||||||
 | 
					      {bool installedOnly = false, bool nonInstalledOnly = false}) {
 | 
				
			||||||
    List<String> updateAppIds = [];
 | 
					    List<String> updateAppIds = [];
 | 
				
			||||||
    List<String> appIds = apps.keys.toList();
 | 
					    List<String> appIds = apps.keys.toList();
 | 
				
			||||||
    for (int i = 0; i < appIds.length; i++) {
 | 
					    for (int i = 0; i < appIds.length; i++) {
 | 
				
			||||||
      App? app = apps[appIds[i]]!.app;
 | 
					      App? app = apps[appIds[i]]!.app;
 | 
				
			||||||
      if (app.installedVersion != app.latestVersion) {
 | 
					      if (app.installedVersion != app.latestVersion &&
 | 
				
			||||||
 | 
					          (!installedOnly || !nonInstalledOnly)) {
 | 
				
			||||||
 | 
					        if ((app.installedVersion == null &&
 | 
				
			||||||
 | 
					                (nonInstalledOnly || !installedOnly) ||
 | 
				
			||||||
 | 
					            (app.installedVersion != null &&
 | 
				
			||||||
 | 
					                (installedOnly || !nonInstalledOnly)))) {
 | 
				
			||||||
          updateAppIds.add(app.id);
 | 
					          updateAppIds.add(app.id);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    return updateAppIds;
 | 
					    return updateAppIds;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -288,31 +577,35 @@ class AppsProvider with ChangeNotifier {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<int> importApps(String appsJSON) async {
 | 
					  Future<int> importApps(String appsJSON) async {
 | 
				
			||||||
    // File picker does not work in android 13, so the user must paste the JSON directly into Obtainium to import Apps
 | 
					 | 
				
			||||||
    List<App> importedApps = (jsonDecode(appsJSON) as List<dynamic>)
 | 
					    List<App> importedApps = (jsonDecode(appsJSON) as List<dynamic>)
 | 
				
			||||||
        .map((e) => App.fromJson(e))
 | 
					        .map((e) => App.fromJson(e))
 | 
				
			||||||
        .toList();
 | 
					        .toList();
 | 
				
			||||||
    for (App a in importedApps) {
 | 
					    while (loadingApps) {
 | 
				
			||||||
      a.installedVersion =
 | 
					      await Future.delayed(const Duration(microseconds: 1));
 | 
				
			||||||
          apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null;
 | 
					 | 
				
			||||||
      await saveApp(a);
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    for (App a in importedApps) {
 | 
				
			||||||
 | 
					      if (apps[a.id]?.app.installedVersion != null) {
 | 
				
			||||||
 | 
					        a.installedVersion = apps[a.id]?.app.installedVersion;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    await saveApps(importedApps);
 | 
				
			||||||
    notifyListeners();
 | 
					    notifyListeners();
 | 
				
			||||||
    return importedApps.length;
 | 
					    return importedApps.length;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  void dispose() {
 | 
					  void dispose() {
 | 
				
			||||||
    foregroundSubscription.cancel();
 | 
					    foregroundSubscription?.cancel();
 | 
				
			||||||
    super.dispose();
 | 
					    super.dispose();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class APKPicker extends StatefulWidget {
 | 
					class APKPicker extends StatefulWidget {
 | 
				
			||||||
  const APKPicker({super.key, required this.app, this.initVal});
 | 
					  const APKPicker({super.key, required this.app, this.initVal, this.archs});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  final App app;
 | 
					  final App app;
 | 
				
			||||||
  final String? initVal;
 | 
					  final String? initVal;
 | 
				
			||||||
 | 
					  final List<String>? archs;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  State<APKPicker> createState() => _APKPickerState();
 | 
					  State<APKPicker> createState() => _APKPickerState();
 | 
				
			||||||
@@ -330,15 +623,29 @@ class _APKPickerState extends State<APKPicker> {
 | 
				
			|||||||
      content: Column(children: [
 | 
					      content: Column(children: [
 | 
				
			||||||
        Text('${widget.app.name} has more than one package:'),
 | 
					        Text('${widget.app.name} has more than one package:'),
 | 
				
			||||||
        const SizedBox(height: 16),
 | 
					        const SizedBox(height: 16),
 | 
				
			||||||
        ...widget.app.apkUrls.map((u) => RadioListTile<String>(
 | 
					        ...widget.app.apkUrls.map(
 | 
				
			||||||
            title: Text(Uri.parse(u).pathSegments.last),
 | 
					          (u) => RadioListTile<String>(
 | 
				
			||||||
 | 
					              title: Text(Uri.parse(u)
 | 
				
			||||||
 | 
					                  .pathSegments
 | 
				
			||||||
 | 
					                  .where((element) => element.isNotEmpty)
 | 
				
			||||||
 | 
					                  .last),
 | 
				
			||||||
              value: u,
 | 
					              value: u,
 | 
				
			||||||
              groupValue: apkUrl,
 | 
					              groupValue: apkUrl,
 | 
				
			||||||
              onChanged: (String? val) {
 | 
					              onChanged: (String? val) {
 | 
				
			||||||
                setState(() {
 | 
					                setState(() {
 | 
				
			||||||
                  apkUrl = val;
 | 
					                  apkUrl = val;
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
            }))
 | 
					              }),
 | 
				
			||||||
 | 
					        ),
 | 
				
			||||||
 | 
					        if (widget.archs != null)
 | 
				
			||||||
 | 
					          const SizedBox(
 | 
				
			||||||
 | 
					            height: 16,
 | 
				
			||||||
 | 
					          ),
 | 
				
			||||||
 | 
					        if (widget.archs != null)
 | 
				
			||||||
 | 
					          Text(
 | 
				
			||||||
 | 
					            'Note:\nYour device supports the ${widget.archs!.length == 1 ? '\'${widget.archs![0]}\' CPU architecture.' : 'following CPU architectures: ${list2FriendlyString(widget.archs!.map((e) => '\'$e\'').toList())}.'}',
 | 
				
			||||||
 | 
					            style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
 | 
				
			||||||
 | 
					          ),
 | 
				
			||||||
      ]),
 | 
					      ]),
 | 
				
			||||||
      actions: [
 | 
					      actions: [
 | 
				
			||||||
        TextButton(
 | 
					        TextButton(
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,12 +27,30 @@ class UpdateNotification extends ObtainiumNotification {
 | 
				
			|||||||
            'Updates Available',
 | 
					            'Updates Available',
 | 
				
			||||||
            'Notifies the user that updates are available for one or more Apps tracked by Obtainium',
 | 
					            'Notifies the user that updates are available for one or more Apps tracked by Obtainium',
 | 
				
			||||||
            Importance.max) {
 | 
					            Importance.max) {
 | 
				
			||||||
    message = updates.length == 1
 | 
					    message = updates.isEmpty
 | 
				
			||||||
 | 
					        ? "No new updates."
 | 
				
			||||||
 | 
					        : updates.length == 1
 | 
				
			||||||
            ? '${updates[0].name} has an update.'
 | 
					            ? '${updates[0].name} has an update.'
 | 
				
			||||||
            : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} have updates.';
 | 
					            : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} have updates.';
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class SilentUpdateNotification extends ObtainiumNotification {
 | 
				
			||||||
 | 
					  SilentUpdateNotification(List<App> updates)
 | 
				
			||||||
 | 
					      : super(
 | 
				
			||||||
 | 
					            3,
 | 
				
			||||||
 | 
					            'Apps Updated',
 | 
				
			||||||
 | 
					            '',
 | 
				
			||||||
 | 
					            'APPS_UPDATED',
 | 
				
			||||||
 | 
					            'Apps Updated',
 | 
				
			||||||
 | 
					            'Notifies the user that updates to one or more Apps were applied in the background',
 | 
				
			||||||
 | 
					            Importance.defaultImportance) {
 | 
				
			||||||
 | 
					    message = updates.length == 1
 | 
				
			||||||
 | 
					        ? '${updates[0].name} was updated to ${updates[0].latestVersion}.'
 | 
				
			||||||
 | 
					        : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} were updated.';
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
 | 
					class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
 | 
				
			||||||
  ErrorCheckingUpdatesNotification(String error)
 | 
					  ErrorCheckingUpdatesNotification(String error)
 | 
				
			||||||
      : super(
 | 
					      : super(
 | 
				
			||||||
@@ -45,6 +63,24 @@ class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
 | 
				
			|||||||
            Importance.high);
 | 
					            Importance.high);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class AppsRemovedNotification extends ObtainiumNotification {
 | 
				
			||||||
 | 
					  AppsRemovedNotification(List<List<String>> namedReasons)
 | 
				
			||||||
 | 
					      : super(
 | 
				
			||||||
 | 
					            6,
 | 
				
			||||||
 | 
					            'Apps Removed',
 | 
				
			||||||
 | 
					            '',
 | 
				
			||||||
 | 
					            'APPS_REMOVED',
 | 
				
			||||||
 | 
					            'Apps Removed',
 | 
				
			||||||
 | 
					            'Notifies the user that one or more Apps were removed due to errors while loading them',
 | 
				
			||||||
 | 
					            Importance.max) {
 | 
				
			||||||
 | 
					    message = '';
 | 
				
			||||||
 | 
					    for (var r in namedReasons) {
 | 
				
			||||||
 | 
					      message += '${r[0]} was removed due to this error: ${r[1]}. \n';
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    message = message.trim();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
final completeInstallationNotification = ObtainiumNotification(
 | 
					final completeInstallationNotification = ObtainiumNotification(
 | 
				
			||||||
    1,
 | 
					    1,
 | 
				
			||||||
    'Complete App Installation',
 | 
					    'Complete App Installation',
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,6 +13,16 @@ enum SortColumnSettings { added, nameAuthor, authorName }
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
enum SortOrderSettings { ascending, descending }
 | 
					enum SortOrderSettings { ascending, descending }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const maxAPIRateLimitMinutes = 30;
 | 
				
			||||||
 | 
					const minUpdateIntervalMinutes = maxAPIRateLimitMinutes + 30;
 | 
				
			||||||
 | 
					const maxUpdateIntervalMinutes = 4320;
 | 
				
			||||||
 | 
					List<int> updateIntervals = [15, 30, 60, 120, 180, 360, 720, 1440, 4320, 0]
 | 
				
			||||||
 | 
					    .where((element) =>
 | 
				
			||||||
 | 
					        (element >= minUpdateIntervalMinutes &&
 | 
				
			||||||
 | 
					            element <= maxUpdateIntervalMinutes) ||
 | 
				
			||||||
 | 
					        element == 0)
 | 
				
			||||||
 | 
					    .toList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class SettingsProvider with ChangeNotifier {
 | 
					class SettingsProvider with ChangeNotifier {
 | 
				
			||||||
  SharedPreferences? prefs;
 | 
					  SharedPreferences? prefs;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -45,7 +55,17 @@ class SettingsProvider with ChangeNotifier {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  int get updateInterval {
 | 
					  int get updateInterval {
 | 
				
			||||||
    return prefs?.getInt('updateInterval') ?? 1440;
 | 
					    var min = prefs?.getInt('updateInterval') ?? 360;
 | 
				
			||||||
 | 
					    if (!updateIntervals.contains(min)) {
 | 
				
			||||||
 | 
					      var temp = updateIntervals[0];
 | 
				
			||||||
 | 
					      for (var i in updateIntervals) {
 | 
				
			||||||
 | 
					        if (min > i && i != 0) {
 | 
				
			||||||
 | 
					          temp = i;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      min = temp;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return min;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set updateInterval(int min) {
 | 
					  set updateInterval(int min) {
 | 
				
			||||||
@@ -54,8 +74,8 @@ class SettingsProvider with ChangeNotifier {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  SortColumnSettings get sortColumn {
 | 
					  SortColumnSettings get sortColumn {
 | 
				
			||||||
    return SortColumnSettings
 | 
					    return SortColumnSettings.values[
 | 
				
			||||||
        .values[prefs?.getInt('sortColumn') ?? SortColumnSettings.added.index];
 | 
					        prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index];
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set sortColumn(SortColumnSettings s) {
 | 
					  set sortColumn(SortColumnSettings s) {
 | 
				
			||||||
@@ -65,7 +85,7 @@ class SettingsProvider with ChangeNotifier {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  SortOrderSettings get sortOrder {
 | 
					  SortOrderSettings get sortOrder {
 | 
				
			||||||
    return SortOrderSettings.values[
 | 
					    return SortOrderSettings.values[
 | 
				
			||||||
        prefs?.getInt('sortOrder') ?? SortOrderSettings.descending.index];
 | 
					        prefs?.getInt('sortOrder') ?? SortOrderSettings.ascending.index];
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set sortOrder(SortOrderSettings s) {
 | 
					  set sortOrder(SortOrderSettings s) {
 | 
				
			||||||
@@ -95,11 +115,29 @@ class SettingsProvider with ChangeNotifier {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool get showAppWebpage {
 | 
					  bool get showAppWebpage {
 | 
				
			||||||
    return prefs?.getBool('showAppWebpage') ?? true;
 | 
					    return prefs?.getBool('showAppWebpage') ?? false;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set showAppWebpage(bool show) {
 | 
					  set showAppWebpage(bool show) {
 | 
				
			||||||
    prefs?.setBool('showAppWebpage', show);
 | 
					    prefs?.setBool('showAppWebpage', show);
 | 
				
			||||||
    notifyListeners();
 | 
					    notifyListeners();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  bool get pinUpdates {
 | 
				
			||||||
 | 
					    return prefs?.getBool('pinUpdates') ?? true;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  set pinUpdates(bool show) {
 | 
				
			||||||
 | 
					    prefs?.setBool('pinUpdates', show);
 | 
				
			||||||
 | 
					    notifyListeners();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  String? getSettingString(String settingId) {
 | 
				
			||||||
 | 
					    return prefs?.getString(settingId);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  void setSettingString(String settingId, String value) {
 | 
				
			||||||
 | 
					    prefs?.setString(settingId, value);
 | 
				
			||||||
 | 
					    notifyListeners();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,9 @@ import 'package:obtainium/app_sources/gitlab.dart';
 | 
				
			|||||||
import 'package:obtainium/app_sources/izzyondroid.dart';
 | 
					import 'package:obtainium/app_sources/izzyondroid.dart';
 | 
				
			||||||
import 'package:obtainium/app_sources/mullvad.dart';
 | 
					import 'package:obtainium/app_sources/mullvad.dart';
 | 
				
			||||||
import 'package:obtainium/app_sources/signal.dart';
 | 
					import 'package:obtainium/app_sources/signal.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/app_sources/sourceforge.dart';
 | 
				
			||||||
import 'package:obtainium/components/generated_form.dart';
 | 
					import 'package:obtainium/components/generated_form.dart';
 | 
				
			||||||
 | 
					import 'package:obtainium/custom_errors.dart';
 | 
				
			||||||
import 'package:obtainium/mass_app_sources/githubstars.dart';
 | 
					import 'package:obtainium/mass_app_sources/githubstars.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class AppNames {
 | 
					class AppNames {
 | 
				
			||||||
@@ -37,6 +39,7 @@ class App {
 | 
				
			|||||||
  List<String> apkUrls = [];
 | 
					  List<String> apkUrls = [];
 | 
				
			||||||
  late int preferredApkIndex;
 | 
					  late int preferredApkIndex;
 | 
				
			||||||
  late List<String> additionalData;
 | 
					  late List<String> additionalData;
 | 
				
			||||||
 | 
					  late DateTime? lastUpdateCheck;
 | 
				
			||||||
  App(
 | 
					  App(
 | 
				
			||||||
      this.id,
 | 
					      this.id,
 | 
				
			||||||
      this.url,
 | 
					      this.url,
 | 
				
			||||||
@@ -46,11 +49,12 @@ class App {
 | 
				
			|||||||
      this.latestVersion,
 | 
					      this.latestVersion,
 | 
				
			||||||
      this.apkUrls,
 | 
					      this.apkUrls,
 | 
				
			||||||
      this.preferredApkIndex,
 | 
					      this.preferredApkIndex,
 | 
				
			||||||
      this.additionalData);
 | 
					      this.additionalData,
 | 
				
			||||||
 | 
					      this.lastUpdateCheck);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @override
 | 
					  @override
 | 
				
			||||||
  String toString() {
 | 
					  String toString() {
 | 
				
			||||||
    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls';
 | 
					    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALDATA: ${additionalData.toString()} LASTCHECK: ${lastUpdateCheck.toString()}';
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  factory App.fromJson(Map<String, dynamic> json) => App(
 | 
					  factory App.fromJson(Map<String, dynamic> json) => App(
 | 
				
			||||||
@@ -68,7 +72,10 @@ class App {
 | 
				
			|||||||
      json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int,
 | 
					      json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int,
 | 
				
			||||||
      json['additionalData'] == null
 | 
					      json['additionalData'] == null
 | 
				
			||||||
          ? SourceProvider().getSource(json['url']).additionalDataDefaults
 | 
					          ? SourceProvider().getSource(json['url']).additionalDataDefaults
 | 
				
			||||||
          : List<String>.from(jsonDecode(json['additionalData'])));
 | 
					          : List<String>.from(jsonDecode(json['additionalData'])),
 | 
				
			||||||
 | 
					      json['lastUpdateCheck'] == null
 | 
				
			||||||
 | 
					          ? null
 | 
				
			||||||
 | 
					          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Map<String, dynamic> toJson() => {
 | 
					  Map<String, dynamic> toJson() => {
 | 
				
			||||||
        'id': id,
 | 
					        'id': id,
 | 
				
			||||||
@@ -79,17 +86,13 @@ class App {
 | 
				
			|||||||
        'latestVersion': latestVersion,
 | 
					        'latestVersion': latestVersion,
 | 
				
			||||||
        'apkUrls': jsonEncode(apkUrls),
 | 
					        'apkUrls': jsonEncode(apkUrls),
 | 
				
			||||||
        'preferredApkIndex': preferredApkIndex,
 | 
					        'preferredApkIndex': preferredApkIndex,
 | 
				
			||||||
        'additionalData': jsonEncode(additionalData)
 | 
					        'additionalData': jsonEncode(additionalData),
 | 
				
			||||||
 | 
					        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
escapeRegEx(String s) {
 | 
					// Ensure the input is starts with HTTPS and has no WWW
 | 
				
			||||||
  return s.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
 | 
					preStandardizeUrl(String url) {
 | 
				
			||||||
    return "\\${x[0]}";
 | 
					 | 
				
			||||||
  });
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
makeUrlHttps(String url) {
 | 
					 | 
				
			||||||
  if (url.toLowerCase().indexOf('http://') != 0 &&
 | 
					  if (url.toLowerCase().indexOf('http://') != 0 &&
 | 
				
			||||||
      url.toLowerCase().indexOf('https://') != 0) {
 | 
					      url.toLowerCase().indexOf('https://') != 0) {
 | 
				
			||||||
    url = 'https://$url';
 | 
					    url = 'https://$url';
 | 
				
			||||||
@@ -97,6 +100,11 @@ makeUrlHttps(String url) {
 | 
				
			|||||||
  if (url.toLowerCase().indexOf('https://www.') == 0) {
 | 
					  if (url.toLowerCase().indexOf('https://www.') == 0) {
 | 
				
			||||||
    url = 'https://${url.substring(12)}';
 | 
					    url = 'https://${url.substring(12)}';
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					  url = url
 | 
				
			||||||
 | 
					      .split('/')
 | 
				
			||||||
 | 
					      .where((e) => e.isNotEmpty)
 | 
				
			||||||
 | 
					      .join('/')
 | 
				
			||||||
 | 
					      .replaceFirst(':/', '://');
 | 
				
			||||||
  return url;
 | 
					  return url;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -128,9 +136,12 @@ abstract class AppSource {
 | 
				
			|||||||
  AppNames getAppNames(String standardUrl);
 | 
					  AppNames getAppNames(String standardUrl);
 | 
				
			||||||
  late List<List<GeneratedFormItem>> additionalDataFormItems;
 | 
					  late List<List<GeneratedFormItem>> additionalDataFormItems;
 | 
				
			||||||
  late List<String> additionalDataDefaults;
 | 
					  late List<String> additionalDataDefaults;
 | 
				
			||||||
 | 
					  late List<GeneratedFormItem> moreSourceSettingsFormItems;
 | 
				
			||||||
 | 
					  String? changeLogPageFromStandardUrl(String standardUrl);
 | 
				
			||||||
 | 
					  Future<String> apkUrlPrefetchModifier(String apkUrl);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
abstract class MassAppSource {
 | 
					abstract class MassAppUrlSource {
 | 
				
			||||||
  late String name;
 | 
					  late String name;
 | 
				
			||||||
  late List<String> requiredArgs;
 | 
					  late List<String> requiredArgs;
 | 
				
			||||||
  Future<List<String>> getUrls(List<String> args);
 | 
					  Future<List<String>> getUrls(List<String> args);
 | 
				
			||||||
@@ -144,14 +155,15 @@ class SourceProvider {
 | 
				
			|||||||
    FDroid(),
 | 
					    FDroid(),
 | 
				
			||||||
    IzzyOnDroid(),
 | 
					    IzzyOnDroid(),
 | 
				
			||||||
    Mullvad(),
 | 
					    Mullvad(),
 | 
				
			||||||
    Signal()
 | 
					    Signal(),
 | 
				
			||||||
 | 
					    SourceForge()
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Add more mass source classes here so they are available via the service
 | 
					  // Add more mass url source classes here so they are available via the service
 | 
				
			||||||
  List<MassAppSource> massSources = [GitHubStars()];
 | 
					  List<MassAppUrlSource> massUrlSources = [GitHubStars()];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AppSource getSource(String url) {
 | 
					  AppSource getSource(String url) {
 | 
				
			||||||
    url = makeUrlHttps(url);
 | 
					    url = preStandardizeUrl(url);
 | 
				
			||||||
    AppSource? source;
 | 
					    AppSource? source;
 | 
				
			||||||
    for (var s in sources) {
 | 
					    for (var s in sources) {
 | 
				
			||||||
      if (url.toLowerCase().contains('://${s.host}')) {
 | 
					      if (url.toLowerCase().contains('://${s.host}')) {
 | 
				
			||||||
@@ -160,12 +172,12 @@ class SourceProvider {
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (source == null) {
 | 
					    if (source == null) {
 | 
				
			||||||
      throw 'URL does not match a known source';
 | 
					      throw UnsupportedURLError();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return source;
 | 
					    return source;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool doesSourceHaveRequiredAdditionalData(AppSource source) {
 | 
					  bool ifSourceAppsRequireAdditionalData(AppSource source) {
 | 
				
			||||||
    for (var row in source.additionalDataFormItems) {
 | 
					    for (var row in source.additionalDataFormItems) {
 | 
				
			||||||
      for (var element in row) {
 | 
					      for (var element in row) {
 | 
				
			||||||
        if (element.required) {
 | 
					        if (element.required) {
 | 
				
			||||||
@@ -176,30 +188,49 @@ class SourceProvider {
 | 
				
			|||||||
    return false;
 | 
					    return false;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Future<App> getApp(
 | 
					  String generateTempID(AppNames names, AppSource source) =>
 | 
				
			||||||
      AppSource source, String url, List<String> additionalData) async {
 | 
					      '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}';
 | 
				
			||||||
    String standardUrl = source.standardizeURL(makeUrlHttps(url));
 | 
					
 | 
				
			||||||
 | 
					  bool isTempId(String id) {
 | 
				
			||||||
 | 
					    List<String> parts = id.split('_');
 | 
				
			||||||
 | 
					    if (parts.length < 3) {
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    for (int i = 0; i < parts.length - 1; i++) {
 | 
				
			||||||
 | 
					      if (RegExp('.*[A-Z].*').hasMatch(parts[i])) {
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return getSourceHosts().contains(parts.last);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  Future<App> getApp(AppSource source, String url, List<String> additionalData,
 | 
				
			||||||
 | 
					      {String name = '', String? id}) async {
 | 
				
			||||||
 | 
					    String standardUrl = source.standardizeURL(preStandardizeUrl(url));
 | 
				
			||||||
    AppNames names = source.getAppNames(standardUrl);
 | 
					    AppNames names = source.getAppNames(standardUrl);
 | 
				
			||||||
    APKDetails apk =
 | 
					    APKDetails apk =
 | 
				
			||||||
        await source.getLatestAPKDetails(standardUrl, additionalData);
 | 
					        await source.getLatestAPKDetails(standardUrl, additionalData);
 | 
				
			||||||
    return App(
 | 
					    return App(
 | 
				
			||||||
        '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}',
 | 
					        id ?? generateTempID(names, source),
 | 
				
			||||||
        standardUrl,
 | 
					        standardUrl,
 | 
				
			||||||
        names.author[0].toUpperCase() + names.author.substring(1),
 | 
					        names.author[0].toUpperCase() + names.author.substring(1),
 | 
				
			||||||
        names.name[0].toUpperCase() + names.name.substring(1),
 | 
					        name.trim().isNotEmpty
 | 
				
			||||||
 | 
					            ? name
 | 
				
			||||||
 | 
					            : names.name[0].toUpperCase() + names.name.substring(1),
 | 
				
			||||||
        null,
 | 
					        null,
 | 
				
			||||||
        apk.version,
 | 
					        apk.version.replaceAll('/', '-'),
 | 
				
			||||||
        apk.apkUrls,
 | 
					        apk.apkUrls,
 | 
				
			||||||
        apk.apkUrls.length - 1,
 | 
					        apk.apkUrls.length - 1,
 | 
				
			||||||
        additionalData);
 | 
					        additionalData,
 | 
				
			||||||
 | 
					        DateTime.now());
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /// Returns a length 2 list, where the first element is a list of Apps and
 | 
					  // Returns errors in [results, errors] instead of throwing them
 | 
				
			||||||
  /// the second is a Map<String, dynamic> of URLs and errors
 | 
					  Future<List<dynamic>> getApps(List<String> urls,
 | 
				
			||||||
  Future<List<dynamic>> getApps(List<String> urls) async {
 | 
					      {List<String> ignoreUrls = const []}) async {
 | 
				
			||||||
    List<App> apps = [];
 | 
					    List<App> apps = [];
 | 
				
			||||||
    Map<String, dynamic> errors = {};
 | 
					    Map<String, dynamic> errors = {};
 | 
				
			||||||
    for (var url in urls) {
 | 
					    for (var url in urls.where((element) => !ignoreUrls.contains(element))) {
 | 
				
			||||||
      try {
 | 
					      try {
 | 
				
			||||||
        var source = getSource(url);
 | 
					        var source = getSource(url);
 | 
				
			||||||
        apps.add(await getApp(source, url, source.additionalDataDefaults));
 | 
					        apps.add(await getApp(source, url, source.additionalDataDefaults));
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										170
									
								
								pubspec.lock
									
									
									
									
									
								
							
							
						
						@@ -1,20 +1,27 @@
 | 
				
			|||||||
# Generated by pub
 | 
					# Generated by pub
 | 
				
			||||||
# See https://dart.dev/tools/pub/glossary#lockfile
 | 
					# See https://dart.dev/tools/pub/glossary#lockfile
 | 
				
			||||||
packages:
 | 
					packages:
 | 
				
			||||||
 | 
					  android_alarm_manager_plus:
 | 
				
			||||||
 | 
					    dependency: "direct main"
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: android_alarm_manager_plus
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "2.1.0"
 | 
				
			||||||
  animations:
 | 
					  animations:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: animations
 | 
					      name: animations
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.0.4"
 | 
					    version: "2.0.7"
 | 
				
			||||||
  archive:
 | 
					  archive:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: archive
 | 
					      name: archive
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.3.1"
 | 
					    version: "3.3.2"
 | 
				
			||||||
  args:
 | 
					  args:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -71,6 +78,13 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.16.0"
 | 
					    version: "1.16.0"
 | 
				
			||||||
 | 
					  cross_file:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: cross_file
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "0.3.3+2"
 | 
				
			||||||
  crypto:
 | 
					  crypto:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -105,42 +119,14 @@ packages:
 | 
				
			|||||||
      name: device_info_plus
 | 
					      name: device_info_plus
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "4.1.2"
 | 
					    version: "8.0.0"
 | 
				
			||||||
  device_info_plus_linux:
 | 
					 | 
				
			||||||
    dependency: transitive
 | 
					 | 
				
			||||||
    description:
 | 
					 | 
				
			||||||
      name: device_info_plus_linux
 | 
					 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					 | 
				
			||||||
    source: hosted
 | 
					 | 
				
			||||||
    version: "3.0.0"
 | 
					 | 
				
			||||||
  device_info_plus_macos:
 | 
					 | 
				
			||||||
    dependency: transitive
 | 
					 | 
				
			||||||
    description:
 | 
					 | 
				
			||||||
      name: device_info_plus_macos
 | 
					 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					 | 
				
			||||||
    source: hosted
 | 
					 | 
				
			||||||
    version: "3.0.0"
 | 
					 | 
				
			||||||
  device_info_plus_platform_interface:
 | 
					  device_info_plus_platform_interface:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: device_info_plus_platform_interface
 | 
					      name: device_info_plus_platform_interface
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.0.0"
 | 
					    version: "7.0.0"
 | 
				
			||||||
  device_info_plus_web:
 | 
					 | 
				
			||||||
    dependency: transitive
 | 
					 | 
				
			||||||
    description:
 | 
					 | 
				
			||||||
      name: device_info_plus_web
 | 
					 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					 | 
				
			||||||
    source: hosted
 | 
					 | 
				
			||||||
    version: "3.0.0"
 | 
					 | 
				
			||||||
  device_info_plus_windows:
 | 
					 | 
				
			||||||
    dependency: transitive
 | 
					 | 
				
			||||||
    description:
 | 
					 | 
				
			||||||
      name: device_info_plus_windows
 | 
					 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					 | 
				
			||||||
    source: hosted
 | 
					 | 
				
			||||||
    version: "4.1.0"
 | 
					 | 
				
			||||||
  dynamic_color:
 | 
					  dynamic_color:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -175,7 +161,7 @@ packages:
 | 
				
			|||||||
      name: file_picker
 | 
					      name: file_picker
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "5.1.0"
 | 
					    version: "5.2.2"
 | 
				
			||||||
  flutter:
 | 
					  flutter:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description: flutter
 | 
					    description: flutter
 | 
				
			||||||
@@ -208,14 +194,14 @@ packages:
 | 
				
			|||||||
      name: flutter_local_notifications
 | 
					      name: flutter_local_notifications
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "10.0.0"
 | 
					    version: "12.0.3"
 | 
				
			||||||
  flutter_local_notifications_linux:
 | 
					  flutter_local_notifications_linux:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: flutter_local_notifications_linux
 | 
					      name: flutter_local_notifications_linux
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.0.0"
 | 
					    version: "2.0.0"
 | 
				
			||||||
  flutter_local_notifications_platform_interface:
 | 
					  flutter_local_notifications_platform_interface:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -246,14 +232,14 @@ packages:
 | 
				
			|||||||
      name: fluttertoast
 | 
					      name: fluttertoast
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "8.0.9"
 | 
					    version: "8.1.1"
 | 
				
			||||||
  html:
 | 
					  html:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: html
 | 
					      name: html
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.15.0"
 | 
					    version: "0.15.1"
 | 
				
			||||||
  http:
 | 
					  http:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -267,14 +253,14 @@ packages:
 | 
				
			|||||||
      name: http_parser
 | 
					      name: http_parser
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "4.0.1"
 | 
					    version: "4.0.2"
 | 
				
			||||||
  image:
 | 
					  image:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: image
 | 
					      name: image
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.2.0"
 | 
					    version: "3.2.2"
 | 
				
			||||||
  install_plugin_v2:
 | 
					  install_plugin_v2:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -282,6 +268,13 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.0.0"
 | 
					    version: "1.0.0"
 | 
				
			||||||
 | 
					  installed_apps:
 | 
				
			||||||
 | 
					    dependency: "direct main"
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: installed_apps
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "1.3.1"
 | 
				
			||||||
  js:
 | 
					  js:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -295,14 +288,14 @@ packages:
 | 
				
			|||||||
      name: json_annotation
 | 
					      name: json_annotation
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "4.6.0"
 | 
					    version: "4.7.0"
 | 
				
			||||||
  lints:
 | 
					  lints:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: lints
 | 
					      name: lints
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.0.0"
 | 
					    version: "2.0.1"
 | 
				
			||||||
  matcher:
 | 
					  matcher:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -316,7 +309,7 @@ packages:
 | 
				
			|||||||
      name: material_color_utilities
 | 
					      name: material_color_utilities
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.2.0"
 | 
					    version: "0.1.5"
 | 
				
			||||||
  meta:
 | 
					  meta:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -324,6 +317,13 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.8.0"
 | 
					    version: "1.8.0"
 | 
				
			||||||
 | 
					  mime:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: mime
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "1.0.2"
 | 
				
			||||||
  nested:
 | 
					  nested:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -331,6 +331,20 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.0.0"
 | 
					    version: "1.0.0"
 | 
				
			||||||
 | 
					  package_archive_info:
 | 
				
			||||||
 | 
					    dependency: "direct main"
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: package_archive_info
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "0.1.0"
 | 
				
			||||||
 | 
					  package_info:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: package_info
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "2.0.2"
 | 
				
			||||||
  path:
 | 
					  path:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -351,7 +365,7 @@ packages:
 | 
				
			|||||||
      name: path_provider_android
 | 
					      name: path_provider_android
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.0.20"
 | 
					    version: "2.0.21"
 | 
				
			||||||
  path_provider_ios:
 | 
					  path_provider_ios:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -379,7 +393,7 @@ packages:
 | 
				
			|||||||
      name: path_provider_platform_interface
 | 
					      name: path_provider_platform_interface
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.0.4"
 | 
					    version: "2.0.5"
 | 
				
			||||||
  path_provider_windows:
 | 
					  path_provider_windows:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -393,42 +407,42 @@ packages:
 | 
				
			|||||||
      name: permission_handler
 | 
					      name: permission_handler
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "10.0.0"
 | 
					    version: "10.2.0"
 | 
				
			||||||
  permission_handler_android:
 | 
					  permission_handler_android:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: permission_handler_android
 | 
					      name: permission_handler_android
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "10.0.0"
 | 
					    version: "10.2.0"
 | 
				
			||||||
  permission_handler_apple:
 | 
					  permission_handler_apple:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: permission_handler_apple
 | 
					      name: permission_handler_apple
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "9.0.4"
 | 
					    version: "9.0.7"
 | 
				
			||||||
  permission_handler_platform_interface:
 | 
					  permission_handler_platform_interface:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: permission_handler_platform_interface
 | 
					      name: permission_handler_platform_interface
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.7.0"
 | 
					    version: "3.9.0"
 | 
				
			||||||
  permission_handler_windows:
 | 
					  permission_handler_windows:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: permission_handler_windows
 | 
					      name: permission_handler_windows
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.1.0"
 | 
					    version: "0.1.2"
 | 
				
			||||||
  petitparser:
 | 
					  petitparser:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: petitparser
 | 
					      name: petitparser
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "5.0.0"
 | 
					    version: "5.1.0"
 | 
				
			||||||
  platform:
 | 
					  platform:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -456,7 +470,21 @@ packages:
 | 
				
			|||||||
      name: provider
 | 
					      name: provider
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "6.0.3"
 | 
					    version: "6.0.4"
 | 
				
			||||||
 | 
					  share_plus:
 | 
				
			||||||
 | 
					    dependency: "direct main"
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: share_plus
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "6.2.0"
 | 
				
			||||||
 | 
					  share_plus_platform_interface:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: share_plus_platform_interface
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "3.2.0"
 | 
				
			||||||
  shared_preferences:
 | 
					  shared_preferences:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -470,7 +498,7 @@ packages:
 | 
				
			|||||||
      name: shared_preferences_android
 | 
					      name: shared_preferences_android
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.0.13"
 | 
					    version: "2.0.14"
 | 
				
			||||||
  shared_preferences_ios:
 | 
					  shared_preferences_ios:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -524,7 +552,7 @@ packages:
 | 
				
			|||||||
      name: source_span
 | 
					      name: source_span
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.9.1"
 | 
					    version: "1.9.0"
 | 
				
			||||||
  stack_trace:
 | 
					  stack_trace:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -559,14 +587,14 @@ packages:
 | 
				
			|||||||
      name: test_api
 | 
					      name: test_api
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.4.14"
 | 
					    version: "0.4.12"
 | 
				
			||||||
  timezone:
 | 
					  timezone:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: timezone
 | 
					      name: timezone
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.8.0"
 | 
					    version: "0.9.0"
 | 
				
			||||||
  typed_data:
 | 
					  typed_data:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -580,14 +608,14 @@ packages:
 | 
				
			|||||||
      name: url_launcher
 | 
					      name: url_launcher
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "6.1.5"
 | 
					    version: "6.1.6"
 | 
				
			||||||
  url_launcher_android:
 | 
					  url_launcher_android:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: url_launcher_android
 | 
					      name: url_launcher_android
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "6.0.19"
 | 
					    version: "6.0.21"
 | 
				
			||||||
  url_launcher_ios:
 | 
					  url_launcher_ios:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -615,7 +643,7 @@ packages:
 | 
				
			|||||||
      name: url_launcher_platform_interface
 | 
					      name: url_launcher_platform_interface
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.1.0"
 | 
					    version: "2.1.1"
 | 
				
			||||||
  url_launcher_web:
 | 
					  url_launcher_web:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -630,13 +658,20 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.0.1"
 | 
					    version: "3.0.1"
 | 
				
			||||||
 | 
					  uuid:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: uuid
 | 
				
			||||||
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "3.0.6"
 | 
				
			||||||
  vector_math:
 | 
					  vector_math:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: vector_math
 | 
					      name: vector_math
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.1.3"
 | 
					    version: "2.1.2"
 | 
				
			||||||
  webview_flutter:
 | 
					  webview_flutter:
 | 
				
			||||||
    dependency: "direct main"
 | 
					    dependency: "direct main"
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -650,35 +685,28 @@ packages:
 | 
				
			|||||||
      name: webview_flutter_android
 | 
					      name: webview_flutter_android
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.10.1"
 | 
					    version: "2.10.4"
 | 
				
			||||||
  webview_flutter_platform_interface:
 | 
					  webview_flutter_platform_interface:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: webview_flutter_platform_interface
 | 
					      name: webview_flutter_platform_interface
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.9.3"
 | 
					    version: "1.9.5"
 | 
				
			||||||
  webview_flutter_wkwebview:
 | 
					  webview_flutter_wkwebview:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: webview_flutter_wkwebview
 | 
					      name: webview_flutter_wkwebview
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "2.9.4"
 | 
					    version: "2.9.5"
 | 
				
			||||||
  win32:
 | 
					  win32:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: win32
 | 
					      name: win32
 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					      url: "https://pub.dartlang.org"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.0.0"
 | 
					    version: "3.0.1"
 | 
				
			||||||
  workmanager:
 | 
					 | 
				
			||||||
    dependency: "direct main"
 | 
					 | 
				
			||||||
    description:
 | 
					 | 
				
			||||||
      name: workmanager
 | 
					 | 
				
			||||||
      url: "https://pub.dartlang.org"
 | 
					 | 
				
			||||||
    source: hosted
 | 
					 | 
				
			||||||
    version: "0.5.0"
 | 
					 | 
				
			||||||
  xdg_directories:
 | 
					  xdg_directories:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -701,5 +729,5 @@ packages:
 | 
				
			|||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "3.1.1"
 | 
					    version: "3.1.1"
 | 
				
			||||||
sdks:
 | 
					sdks:
 | 
				
			||||||
  dart: ">=2.19.0-79.0.dev <3.0.0"
 | 
					  dart: ">=2.18.2 <3.0.0"
 | 
				
			||||||
  flutter: ">=3.3.0"
 | 
					  flutter: ">=3.3.0"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										15
									
								
								pubspec.yaml
									
									
									
									
									
								
							
							
						
						@@ -17,10 +17,10 @@ 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
 | 
					# 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
 | 
					# 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.
 | 
					# of the product and file versions while build-number is used as the build suffix.
 | 
				
			||||||
version: 0.3.1+17 # When changing this, update the tag in main() accordingly
 | 
					version: 0.6.11+55 # When changing this, update the tag in main() accordingly
 | 
				
			||||||
 | 
					
 | 
				
			||||||
environment:
 | 
					environment:
 | 
				
			||||||
  sdk: '>=2.19.0-79.0.dev <3.0.0'
 | 
					  sdk: '>=2.18.2 <3.0.0'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Dependencies specify other packages that your package needs in order to work.
 | 
					# Dependencies specify other packages that your package needs in order to work.
 | 
				
			||||||
# To automatically upgrade your package dependencies to the latest versions
 | 
					# To automatically upgrade your package dependencies to the latest versions
 | 
				
			||||||
@@ -38,21 +38,24 @@ dependencies:
 | 
				
			|||||||
  cupertino_icons: ^1.0.5
 | 
					  cupertino_icons: ^1.0.5
 | 
				
			||||||
  path_provider: ^2.0.11
 | 
					  path_provider: ^2.0.11
 | 
				
			||||||
  flutter_fgbg: ^0.2.0 # Try removing reliance on this
 | 
					  flutter_fgbg: ^0.2.0 # Try removing reliance on this
 | 
				
			||||||
  flutter_local_notifications: ^10.0.0
 | 
					  flutter_local_notifications: ^12.0.0
 | 
				
			||||||
  provider: ^6.0.3
 | 
					  provider: ^6.0.3
 | 
				
			||||||
  http: ^0.13.5
 | 
					  http: ^0.13.5
 | 
				
			||||||
  webview_flutter: ^3.0.4
 | 
					  webview_flutter: ^3.0.4
 | 
				
			||||||
  workmanager: ^0.5.0
 | 
					 | 
				
			||||||
  dynamic_color: ^1.5.4
 | 
					  dynamic_color: ^1.5.4
 | 
				
			||||||
  install_plugin_v2: ^1.0.0 # Try replacing this
 | 
					 | 
				
			||||||
  html: ^0.15.0
 | 
					  html: ^0.15.0
 | 
				
			||||||
  shared_preferences: ^2.0.15
 | 
					  shared_preferences: ^2.0.15
 | 
				
			||||||
  url_launcher: ^6.1.5
 | 
					  url_launcher: ^6.1.5
 | 
				
			||||||
  permission_handler: ^10.0.0
 | 
					  permission_handler: ^10.0.0
 | 
				
			||||||
  fluttertoast: ^8.0.9
 | 
					  fluttertoast: ^8.0.9
 | 
				
			||||||
  device_info_plus: ^4.1.2
 | 
					  device_info_plus: ^8.0.0
 | 
				
			||||||
  file_picker: ^5.1.0
 | 
					  file_picker: ^5.1.0
 | 
				
			||||||
  animations: ^2.0.4
 | 
					  animations: ^2.0.4
 | 
				
			||||||
 | 
					  install_plugin_v2: ^1.0.0
 | 
				
			||||||
 | 
					  share_plus: ^6.0.1
 | 
				
			||||||
 | 
					  installed_apps: ^1.3.1
 | 
				
			||||||
 | 
					  package_archive_info: ^0.1.0
 | 
				
			||||||
 | 
					  android_alarm_manager_plus: ^2.1.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dev_dependencies:
 | 
					dev_dependencies:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,7 @@ import 'package:obtainium/main.dart';
 | 
				
			|||||||
void main() {
 | 
					void main() {
 | 
				
			||||||
  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
 | 
					  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
 | 
				
			||||||
    // Build our app and trigger a frame.
 | 
					    // Build our app and trigger a frame.
 | 
				
			||||||
    await tester.pumpWidget(const MyApp());
 | 
					    await tester.pumpWidget(const Obtainium());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Verify that our counter starts at 0.
 | 
					    // Verify that our counter starts at 0.
 | 
				
			||||||
    expect(find.text('0'), findsOneWidget);
 | 
					    expect(find.text('0'), findsOneWidget);
 | 
				
			||||||
 
 | 
				
			|||||||