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 | ||||
|             android:name="flutterEmbedding" | ||||
|             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> | ||||
|     <uses-permission android:name="android.permission.INTERNET" /> | ||||
|     <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> | ||||
							
								
								
									
										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:http/http.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/custom_errors.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class FDroid implements AppSource { | ||||
| @@ -9,38 +10,66 @@ class FDroid implements AppSource { | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/packages/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     RegExp standardUrlRegExB = | ||||
|         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) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|       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)); | ||||
|     if (res.statusCode == 200) { | ||||
|       var latestReleaseDiv = | ||||
|           parse(res.body).querySelector('#latest.package-version'); | ||||
|       var apkUrl = latestReleaseDiv | ||||
|           ?.querySelector('.package-version-download a') | ||||
|           ?.attributes['href']; | ||||
|       if (apkUrl == null) { | ||||
|         throw noAPKFound; | ||||
|       var releases = parse(res.body).querySelectorAll('.package-version'); | ||||
|       if (releases.isEmpty) { | ||||
|         throw NoReleasesError(); | ||||
|       } | ||||
|       var version = latestReleaseDiv | ||||
|           ?.querySelector('.package-version-header b') | ||||
|       String? latestVersion = releases[0] | ||||
|           .querySelector('.package-version-header b') | ||||
|           ?.innerHtml | ||||
|           .split(' ') | ||||
|           .last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|           .sublist(1) | ||||
|           .join(' '); | ||||
|       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 { | ||||
|       throw couldNotFindReleases; | ||||
|       throw NoReleasesError(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
| @@ -54,4 +83,7 @@ class FDroid implements AppSource { | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
|   | ||||
| @@ -1,7 +1,11 @@ | ||||
| import 'dart:convert'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:http/http.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:url_launcher/url_launcher_string.dart'; | ||||
|  | ||||
| class GitHub implements AppSource { | ||||
|   @override | ||||
| @@ -12,23 +16,38 @@ class GitHub implements AppSource { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|       throw InvalidURLError(runtimeType.toString()); | ||||
|     } | ||||
|     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 | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
|     var includePrereleases = | ||||
|         additionalData.isNotEmpty && additionalData[0] == "true"; | ||||
|         additionalData.isNotEmpty && additionalData[0] == 'true'; | ||||
|     var fallbackToOlderReleases = | ||||
|         additionalData.length >= 2 && additionalData[1] == "true"; | ||||
|         additionalData.length >= 2 && additionalData[1] == 'true'; | ||||
|     var regexFilter = additionalData.length >= 3 && additionalData[2].isNotEmpty | ||||
|         ? additionalData[2] | ||||
|         : null; | ||||
|     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) { | ||||
|       var releases = jsonDecode(res.body) as List<dynamic>; | ||||
|  | ||||
| @@ -50,6 +69,7 @@ class GitHub implements AppSource { | ||||
|         if (!includePrereleases && releases[i]['prerelease'] == true) { | ||||
|           continue; | ||||
|         } | ||||
|  | ||||
|         if (regexFilter != null && | ||||
|             !RegExp(regexFilter) | ||||
|                 .hasMatch((releases[i]['name'] as String).trim())) { | ||||
| @@ -64,22 +84,25 @@ class GitHub implements AppSource { | ||||
|         break; | ||||
|       } | ||||
|       if (targetRelease == null) { | ||||
|         throw couldNotFindReleases; | ||||
|         throw NoReleasesError(); | ||||
|       } | ||||
|       if ((targetRelease['apkUrls'] as List<String>).isEmpty) { | ||||
|         throw noAPKFound; | ||||
|         throw NoAPKError(); | ||||
|       } | ||||
|       String? version = targetRelease['tag_name']; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|         throw NoVersionError(); | ||||
|       } | ||||
|       return APKDetails(version, targetRelease['apkUrls']); | ||||
|     } else { | ||||
|       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 | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = [ | ||||
|     [GeneratedFormItem(label: "Include prereleases", type: FormItemType.bool)], | ||||
|     [GeneratedFormItem(label: 'Include prereleases', type: FormItemType.bool)], | ||||
|     [ | ||||
|       GeneratedFormItem( | ||||
|           label: "Fallback to older releases", type: FormItemType.bool) | ||||
|           label: 'Fallback to older releases', type: FormItemType.bool) | ||||
|     ], | ||||
|     [ | ||||
|       GeneratedFormItem( | ||||
|           label: "Filter Release Titles by Regular Expression", | ||||
|           label: 'Filter Release Titles by Regular Expression', | ||||
|           type: FormItemType.string, | ||||
|           required: false, | ||||
|           additionalValidators: [ | ||||
| @@ -110,7 +133,7 @@ class GitHub implements AppSource { | ||||
|               try { | ||||
|                 RegExp(value); | ||||
|               } catch (e) { | ||||
|                 return "Invalid regular expression"; | ||||
|                 return 'Invalid regular expression'; | ||||
|               } | ||||
|               return null; | ||||
|             } | ||||
| @@ -119,5 +142,44 @@ class GitHub implements AppSource { | ||||
|   ]; | ||||
|  | ||||
|   @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:obtainium/app_sources/github.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/custom_errors.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class GitLab implements AppSource { | ||||
| @@ -13,11 +14,18 @@ class GitLab implements AppSource { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|       throw InvalidURLError(runtimeType.toString()); | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   String? changeLogPageFromStandardUrl(String standardUrl) => | ||||
|       '$standardUrl/-/releases'; | ||||
|  | ||||
|   @override | ||||
|   Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl; | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
| @@ -32,7 +40,9 @@ class GitLab implements AppSource { | ||||
|         ...getLinksFromParsedHTML( | ||||
|             entryContent, | ||||
|             RegExp( | ||||
|                 '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$', | ||||
|                 '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) { | ||||
|                   return '\\${x[0]}'; | ||||
|                 })}/uploads/[^/]+/[^/]+\\.apk\$', | ||||
|                 caseSensitive: false), | ||||
|             standardUri.origin), | ||||
|         // GitLab releases may contain links to externally hosted APKs | ||||
| @@ -42,18 +52,18 @@ class GitLab implements AppSource { | ||||
|             .toList() | ||||
|       ]; | ||||
|       if (apkUrlList.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|         throw NoAPKError(); | ||||
|       } | ||||
|  | ||||
|       var entryId = entry?.querySelector('id')?.innerHtml; | ||||
|       var version = | ||||
|           entryId == null ? null : Uri.parse(entryId).pathSegments.last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|         throw NoVersionError(); | ||||
|       } | ||||
|       return APKDetails(version, apkUrlList); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|       throw NoReleasesError(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
| @@ -68,4 +78,7 @@ class GitLab implements AppSource { | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| 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 IzzyOnDroid implements AppSource { | ||||
| @@ -12,11 +13,17 @@ class IzzyOnDroid implements AppSource { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|       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 { | ||||
| @@ -31,7 +38,7 @@ class IzzyOnDroid implements AppSource { | ||||
|           .map((e) => 'https://$host${e.attributes['href'] ?? ''}') | ||||
|           .toList(); | ||||
|       if (multipleVersionApkUrls.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|         throw NoAPKError(); | ||||
|       } | ||||
|       var version = parsedHtml | ||||
|           .querySelector('#keydata') | ||||
| @@ -44,11 +51,11 @@ class IzzyOnDroid implements AppSource { | ||||
|           ?.children[1] | ||||
|           .innerHtml; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|         throw NoVersionError(); | ||||
|       } | ||||
|       return APKDetails(version, [multipleVersionApkUrls[0]]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|       throw NoReleasesError(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
| @@ -62,4 +69,7 @@ class IzzyOnDroid implements AppSource { | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| 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 Mullvad implements AppSource { | ||||
| @@ -12,11 +13,18 @@ class Mullvad implements AppSource { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|       throw InvalidURLError(runtimeType.toString()); | ||||
|     } | ||||
|     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 | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
| @@ -29,12 +37,12 @@ class Mullvad implements AppSource { | ||||
|           ?.split('/') | ||||
|           .last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|         throw NoVersionError(); | ||||
|       } | ||||
|       return APKDetails( | ||||
|           version, ['https://mullvad.net/download/app/apk/latest']); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|       throw NoReleasesError(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
| @@ -48,4 +56,7 @@ class Mullvad implements AppSource { | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import 'dart:convert'; | ||||
| 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 Signal implements AppSource { | ||||
| @@ -12,6 +13,12 @@ class Signal implements AppSource { | ||||
|     return 'https://$host'; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   String? changeLogPageFromStandardUrl(String standardUrl) => null; | ||||
|  | ||||
|   @override | ||||
|   Future<String> apkUrlPrefetchModifier(String apkUrl) async => apkUrl; | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
| @@ -21,15 +28,15 @@ class Signal implements AppSource { | ||||
|       var json = jsonDecode(res.body); | ||||
|       String? apkUrl = json['url']; | ||||
|       if (apkUrl == null) { | ||||
|         throw noAPKFound; | ||||
|         throw NoAPKError(); | ||||
|       } | ||||
|       String? version = json['versionName']; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|         throw NoVersionError(); | ||||
|       } | ||||
|       return APKDetails(version, [apkUrl]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|       throw NoReleasesError(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
| @@ -41,4 +48,7 @@ class Signal implements AppSource { | ||||
|  | ||||
|   @override | ||||
|   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 int max; | ||||
|   late List<String? Function(String? value)> additionalValidators; | ||||
|   late String id; | ||||
|   late List<Widget> belowWidgets; | ||||
|   late String? hint; | ||||
|  | ||||
|   GeneratedFormItem( | ||||
|       {this.label = "Input", | ||||
|       {this.label = 'Input', | ||||
|       this.type = FormItemType.string, | ||||
|       this.required = true, | ||||
|       this.max = 1, | ||||
|       this.additionalValidators = const []}); | ||||
|       this.additionalValidators = const [], | ||||
|       this.id = 'input', | ||||
|       this.belowWidgets = const [], | ||||
|       this.hint}); | ||||
| } | ||||
|  | ||||
| class GeneratedForm extends StatefulWidget { | ||||
| @@ -69,7 +75,7 @@ class _GeneratedFormState extends State<GeneratedForm> { | ||||
|         .map((row) => row.map((e) { | ||||
|               return j < widget.defaultValues.length | ||||
|                   ? widget.defaultValues[j++] | ||||
|                   : ""; | ||||
|                   : ''; | ||||
|             }).toList()) | ||||
|         .toList(); | ||||
|  | ||||
| @@ -89,7 +95,8 @@ class _GeneratedFormState extends State<GeneratedForm> { | ||||
|               }); | ||||
|             }, | ||||
|             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, | ||||
|             maxLines: e.value.max <= 1 ? 1 : e.value.max, | ||||
|             validator: (value) { | ||||
| @@ -122,10 +129,10 @@ class _GeneratedFormState extends State<GeneratedForm> { | ||||
|             children: [ | ||||
|               Text(widget.items[r][e].label), | ||||
|               Switch( | ||||
|                   value: values[r][e] == "true", | ||||
|                   value: values[r][e] == 'true', | ||||
|                   onChanged: (value) { | ||||
|                     setState(() { | ||||
|                       values[r][e] = value ? "true" : ""; | ||||
|                       values[r][e] = value ? 'true' : ''; | ||||
|                       someValueChanged(); | ||||
|                     }); | ||||
|                   }) | ||||
| @@ -155,7 +162,13 @@ class _GeneratedFormState extends State<GeneratedForm> { | ||||
|             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); | ||||
|     }); | ||||
|   | ||||
| @@ -7,11 +7,15 @@ class GeneratedFormModal extends StatefulWidget { | ||||
|       {super.key, | ||||
|       required this.title, | ||||
|       required this.items, | ||||
|       required this.defaultValues}); | ||||
|       required this.defaultValues, | ||||
|       this.initValid = false, | ||||
|       this.message = ''}); | ||||
|  | ||||
|   final String title; | ||||
|   final String message; | ||||
|   final List<List<GeneratedFormItem>> items; | ||||
|   final List<String> defaultValues; | ||||
|   final bool initValid; | ||||
|  | ||||
|   @override | ||||
|   State<GeneratedFormModal> createState() => _GeneratedFormModalState(); | ||||
| @@ -21,20 +25,35 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> { | ||||
|   List<String> values = []; | ||||
|   bool valid = false; | ||||
|  | ||||
|   @override | ||||
|   void initState() { | ||||
|     super.initState(); | ||||
|     values = widget.defaultValues; | ||||
|     valid = widget.initValid; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     return AlertDialog( | ||||
|       scrollable: true, | ||||
|       title: Text(widget.title), | ||||
|       content: GeneratedForm( | ||||
|           items: widget.items, | ||||
|           onValueChanges: (values, valid) { | ||||
|             setState(() { | ||||
|               this.values = values; | ||||
|               this.valid = valid; | ||||
|             }); | ||||
|           }, | ||||
|           defaultValues: widget.defaultValues), | ||||
|       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, | ||||
|             onValueChanges: (values, valid) { | ||||
|               setState(() { | ||||
|                 this.values = values; | ||||
|                 this.valid = valid; | ||||
|               }); | ||||
|             }, | ||||
|             defaultValues: widget.defaultValues) | ||||
|       ]), | ||||
|       actions: [ | ||||
|         TextButton( | ||||
|             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(''); | ||||
| } | ||||
							
								
								
									
										168
									
								
								lib/main.dart
									
									
									
									
									
								
							
							
						
						| @@ -1,6 +1,9 @@ | ||||
| import 'dart:io'; | ||||
| import 'dart:math'; | ||||
|  | ||||
| import 'package:flutter/material.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/providers/apps_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:permission_handler/permission_handler.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:workmanager/workmanager.dart'; | ||||
| import 'package:dynamic_color/dynamic_color.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 = | ||||
|     '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') | ||||
| void bgTaskCallback() { | ||||
|   // Background update checking process | ||||
|   Workmanager().executeTask((task, taskName) async { | ||||
|     var notificationsProvider = NotificationsProvider(); | ||||
|     await notificationsProvider.notify(checkingUpdatesNotification); | ||||
| Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async { | ||||
|   int? ignoreAfterMicroseconds = params?['ignoreAfterMicroseconds']; | ||||
|   WidgetsFlutterBinding.ensureInitialized(); | ||||
|   await AndroidAlarmManager.initialize(); | ||||
|   DateTime? ignoreAfter = ignoreAfterMicroseconds != null | ||||
|       ? DateTime.fromMicrosecondsSinceEpoch(ignoreAfterMicroseconds) | ||||
|       : null; | ||||
|   var notificationsProvider = NotificationsProvider(); | ||||
|   await notificationsProvider.notify(checkingUpdatesNotification); | ||||
|   try { | ||||
|     var appsProvider = AppsProvider(forBGTask: true); | ||||
|     await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id); | ||||
|     await appsProvider.loadApps(); | ||||
|     List<String> existingUpdateIds = | ||||
|         appsProvider.findExistingUpdates(installedOnly: true); | ||||
|     DateTime nextIgnoreAfter = DateTime.now(); | ||||
|     String? err; | ||||
|     try { | ||||
|       var appsProvider = AppsProvider(); | ||||
|       await notificationsProvider | ||||
|           .cancel(ErrorCheckingUpdatesNotification('').id); | ||||
|       await appsProvider.loadApps(); | ||||
|       List<App> updates = await appsProvider.checkUpdates(); | ||||
|       if (updates.isNotEmpty) { | ||||
|         notificationsProvider.notify(UpdateNotification(updates), | ||||
|             cancelExisting: true); | ||||
|       } | ||||
|       return Future.value(true); | ||||
|       await appsProvider.checkUpdates( | ||||
|           ignoreAppsCheckedAfter: ignoreAfter, throwErrorsForRetry: true); | ||||
|     } catch (e) { | ||||
|       notificationsProvider.notify( | ||||
|           ErrorCheckingUpdatesNotification(e.toString()), | ||||
|           cancelExisting: true); | ||||
|       return Future.value(false); | ||||
|     } finally { | ||||
|       await notificationsProvider.cancel(checkingUpdatesNotification.id); | ||||
|       if (e is RateLimitError || e is SocketException) { | ||||
|         AndroidAlarmManager.oneShot( | ||||
|             Duration(minutes: e is RateLimitError ? e.remainingMinutes : 15), | ||||
|             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 { | ||||
|     await notificationsProvider.cancel(checkingUpdatesNotification.id); | ||||
|   } | ||||
| } | ||||
|  | ||||
| void main() async { | ||||
|   WidgetsFlutterBinding.ensureInitialized(); | ||||
|   if ((await DeviceInfoPlugin().androidInfo).version.sdkInt! >= 29) { | ||||
|   if ((await DeviceInfoPlugin().androidInfo).version.sdkInt >= 29) { | ||||
|     SystemChrome.setSystemUIOverlayStyle( | ||||
|       const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent), | ||||
|     ); | ||||
|     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); | ||||
|   } | ||||
|   Workmanager().initialize( | ||||
|     bgTaskCallback, | ||||
|   ); | ||||
|   await AndroidAlarmManager.initialize(); | ||||
|   runApp(MultiProvider( | ||||
|     providers: [ | ||||
|       ChangeNotifierProvider( | ||||
|           create: (context) => AppsProvider( | ||||
|               shouldLoadApps: true, | ||||
|               shouldCheckUpdatesAfterLoad: false, | ||||
|               shouldDeleteAPKs: true)), | ||||
|       ChangeNotifierProvider(create: (context) => AppsProvider()), | ||||
|       ChangeNotifierProvider(create: (context) => SettingsProvider()), | ||||
|       Provider(create: (context) => NotificationsProvider()) | ||||
|     ], | ||||
|     child: const MyApp(), | ||||
|     child: const Obtainium(), | ||||
|   )); | ||||
| } | ||||
|  | ||||
| var defaultThemeColour = Colors.deepPurple; | ||||
|  | ||||
| class MyApp extends StatelessWidget { | ||||
|   const MyApp({super.key}); | ||||
| class Obtainium extends StatefulWidget { | ||||
|   const Obtainium({super.key}); | ||||
|  | ||||
|   @override | ||||
|   State<Obtainium> createState() => _ObtainiumState(); | ||||
| } | ||||
|  | ||||
| class _ObtainiumState extends State<Obtainium> { | ||||
|   var existingUpdateInterval = -1; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
| @@ -81,30 +128,37 @@ class MyApp extends StatelessWidget { | ||||
|     if (settingsProvider.prefs == null) { | ||||
|       settingsProvider.initializeSettings(); | ||||
|     } 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(); | ||||
|       if (isFirstRun) { | ||||
|         // If this is the first run, ask for notification permissions and add Obtainium to the Apps list | ||||
|         Permission.notification.request(); | ||||
|         appsProvider.saveApp(App( | ||||
|             'imranr98_obtainium_${GitHub().host}', | ||||
|             'https://github.com/ImranR98/Obtainium', | ||||
|             'ImranR98', | ||||
|             'Obtainium', | ||||
|             currentReleaseTag, | ||||
|             currentReleaseTag, | ||||
|             [], | ||||
|             0, | ||||
|             ["true"])); | ||||
|         appsProvider.saveApps([ | ||||
|           App( | ||||
|               'dev.imranr.obtainium', | ||||
|               'https://github.com/ImranR98/Obtainium', | ||||
|               'ImranR98', | ||||
|               'Obtainium', | ||||
|               currentReleaseTag, | ||||
|               currentReleaseTag, | ||||
|               [], | ||||
|               0, | ||||
|               ['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 'package:http/http.dart'; | ||||
| import 'package:obtainium/app_sources/github.dart'; | ||||
| import 'package:obtainium/custom_errors.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class GitHubStars implements MassAppSource { | ||||
| class GitHubStars implements MassAppUrlSource { | ||||
|   @override | ||||
|   late String name = 'GitHub Starred Repos'; | ||||
|  | ||||
|   @override | ||||
|   late List<String> requiredArgs = ['Username']; | ||||
|  | ||||
|   @override | ||||
|   Future<List<String>> getUrls(List<String> args) async { | ||||
|     if (args.length != requiredArgs.length) { | ||||
|       throw 'Wrong number of arguments provided'; | ||||
|     } | ||||
|     Response res = | ||||
|         await get(Uri.parse('https://api.github.com/users/${args[0]}/starred')); | ||||
|   Future<List<String>> getOnePageOfUserStarredUrls( | ||||
|       String username, int page) async { | ||||
|     Response res = await get(Uri.parse( | ||||
|         'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page')); | ||||
|     if (res.statusCode == 200) { | ||||
|       return (jsonDecode(res.body) as List<dynamic>) | ||||
|           .map((e) => e['html_url'] as String) | ||||
|           .toList(); | ||||
|     } else { | ||||
|       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:obtainium/components/custom_app_bar.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/custom_errors.dart'; | ||||
| import 'package:obtainium/pages/app.dart'; | ||||
| import 'package:obtainium/providers/apps_provider.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| @@ -19,7 +20,7 @@ class AddAppPage extends StatefulWidget { | ||||
| class _AddAppPageState extends State<AddAppPage> { | ||||
|   bool gettingAppInfo = false; | ||||
|  | ||||
|   String userInput = ""; | ||||
|   String userInput = ''; | ||||
|   AppSource? pickedSource; | ||||
|   List<String> additionalData = []; | ||||
|   bool validAdditionalData = true; | ||||
| @@ -44,19 +45,21 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                                   items: [ | ||||
|                                     [ | ||||
|                                       GeneratedFormItem( | ||||
|                                           label: "App Source Url", | ||||
|                                           label: 'App Source Url', | ||||
|                                           additionalValidators: [ | ||||
|                                             (value) { | ||||
|                                               try { | ||||
|                                                 sourceProvider | ||||
|                                                     .getSource(value ?? "") | ||||
|                                                     .getSource(value ?? '') | ||||
|                                                     .standardizeURL( | ||||
|                                                         makeUrlHttps( | ||||
|                                                             value ?? "")); | ||||
|                                                         preStandardizeUrl( | ||||
|                                                             value ?? '')); | ||||
|                                               } catch (e) { | ||||
|                                                 return e is String | ||||
|                                                     ? e | ||||
|                                                     : "Error"; | ||||
|                                                     : e is ObtainiumError | ||||
|                                                         ? e.toString() | ||||
|                                                         : 'Error'; | ||||
|                                               } | ||||
|                                               return null; | ||||
|                                             } | ||||
| @@ -76,7 +79,7 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                                             : []; | ||||
|                                         validAdditionalData = source != null | ||||
|                                             ? sourceProvider | ||||
|                                                 .doesSourceHaveRequiredAdditionalData( | ||||
|                                                 .ifSourceAppsRequireAdditionalData( | ||||
|                                                     source) | ||||
|                                             : true; | ||||
|                                       } | ||||
| @@ -86,58 +89,73 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                           const SizedBox( | ||||
|                             width: 16, | ||||
|                           ), | ||||
|                           ElevatedButton( | ||||
|                               onPressed: gettingAppInfo || | ||||
|                                       pickedSource == null || | ||||
|                                       (pickedSource!.additionalDataFormItems | ||||
|                                               .isNotEmpty && | ||||
|                                           !validAdditionalData) | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       HapticFeedback.selectionClick(); | ||||
|                                       setState(() { | ||||
|                                         gettingAppInfo = true; | ||||
|                                       }); | ||||
|                                       sourceProvider | ||||
|                                           .getApp(pickedSource!, userInput, | ||||
|                                               additionalData) | ||||
|                                           .then((app) { | ||||
|                                         var appsProvider = | ||||
|                                             context.read<AppsProvider>(); | ||||
|                                         var settingsProvider = | ||||
|                                             context.read<SettingsProvider>(); | ||||
|                                         if (appsProvider.apps | ||||
|                                             .containsKey(app.id)) { | ||||
|                                           throw 'App already added'; | ||||
|                                         } | ||||
|                                         settingsProvider | ||||
|                                             .getInstallPermission() | ||||
|                                             .then((_) { | ||||
|                                           appsProvider.saveApp(app).then((_) { | ||||
|                           gettingAppInfo | ||||
|                               ? const CircularProgressIndicator() | ||||
|                               : ElevatedButton( | ||||
|                                   onPressed: gettingAppInfo || | ||||
|                                           pickedSource == null || | ||||
|                                           (pickedSource!.additionalDataFormItems | ||||
|                                                   .isNotEmpty && | ||||
|                                               !validAdditionalData) | ||||
|                                       ? null | ||||
|                                       : () async { | ||||
|                                           setState(() { | ||||
|                                             gettingAppInfo = true; | ||||
|                                           }); | ||||
|                                           var appsProvider = | ||||
|                                               context.read<AppsProvider>(); | ||||
|                                           var 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 | ||||
|                                                 .containsKey(app.id)) { | ||||
|                                               throw ObtainiumError( | ||||
|                                                   'App already added'); | ||||
|                                             } | ||||
|                                             await appsProvider.saveApps([app]); | ||||
|  | ||||
|                                             return app; | ||||
|                                           }() | ||||
|                                               .then((app) { | ||||
|                                             Navigator.push( | ||||
|                                                 context, | ||||
|                                                 MaterialPageRoute( | ||||
|                                                     builder: (context) => | ||||
|                                                         AppPage( | ||||
|                                                             appId: app.id))); | ||||
|                                           }).catchError((e) { | ||||
|                                             showError(e, context); | ||||
|                                           }).whenComplete(() { | ||||
|                                             setState(() { | ||||
|                                               gettingAppInfo = false; | ||||
|                                             }); | ||||
|                                           }); | ||||
|                                         }); | ||||
|                                       }).catchError((e) { | ||||
|                                         ScaffoldMessenger.of(context) | ||||
|                                             .showSnackBar( | ||||
|                                           SnackBar(content: Text(e.toString())), | ||||
|                                         ); | ||||
|                                       }).whenComplete(() { | ||||
|                                         setState(() { | ||||
|                                           gettingAppInfo = false; | ||||
|                                         }); | ||||
|                                       }); | ||||
|                                     }, | ||||
|                               child: const Text('Add')) | ||||
|                                         }, | ||||
|                                   child: const Text('Add')) | ||||
|                         ], | ||||
|                       ), | ||||
|                       if (pickedSource != null && | ||||
|                           (pickedSource!.additionalDataFormItems.isNotEmpty)) | ||||
|                           pickedSource!.additionalDataDefaults.isNotEmpty) | ||||
|                         Column( | ||||
|                           crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                           children: [ | ||||
| @@ -152,16 +170,23 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                             const SizedBox( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             GeneratedForm( | ||||
|                                 items: pickedSource!.additionalDataFormItems, | ||||
|                                 onValueChanges: (values, valid) { | ||||
|                                   setState(() { | ||||
|                                     additionalData = values; | ||||
|                                     validAdditionalData = valid; | ||||
|                                   }); | ||||
|                                 }, | ||||
|                                 defaultValues: | ||||
|                                     pickedSource!.additionalDataDefaults) | ||||
|                             if (pickedSource! | ||||
|                                 .additionalDataFormItems.isNotEmpty) | ||||
|                               GeneratedForm( | ||||
|                                   items: pickedSource!.additionalDataFormItems, | ||||
|                                   onValueChanges: (values, valid) { | ||||
|                                     setState(() { | ||||
|                                       additionalData = values; | ||||
|                                       validAdditionalData = valid; | ||||
|                                     }); | ||||
|                                   }, | ||||
|                                   defaultValues: | ||||
|                                       pickedSource!.additionalDataDefaults), | ||||
|                             if (pickedSource! | ||||
|                                 .additionalDataFormItems.isNotEmpty) | ||||
|                               const SizedBox( | ||||
|                                 height: 8, | ||||
|                               ), | ||||
|                           ], | ||||
|                         ) | ||||
|                       else | ||||
| @@ -170,9 +195,6 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                                 crossAxisAlignment: CrossAxisAlignment.center, | ||||
|                                 mainAxisAlignment: MainAxisAlignment.center, | ||||
|                                 children: [ | ||||
|                               // const SizedBox( | ||||
|                               //   height: 48, | ||||
|                               // ), | ||||
|                               const Text( | ||||
|                                 'Supported Sources:', | ||||
|                               ), | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter/services.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/settings_provider.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
| @@ -18,71 +19,115 @@ class AppPage extends StatefulWidget { | ||||
| } | ||||
|  | ||||
| class _AppPageState extends State<AppPage> { | ||||
|   AppInMemory? prevApp; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     var appsProvider = context.watch<AppsProvider>(); | ||||
|     var settingsProvider = context.watch<SettingsProvider>(); | ||||
|     getUpdate(String id) { | ||||
|       appsProvider.checkUpdate(id).catchError((e) { | ||||
|         showError(e, context); | ||||
|       }); | ||||
|     } | ||||
|  | ||||
|     var sourceProvider = SourceProvider(); | ||||
|     AppInMemory? app = appsProvider.apps[widget.appId]; | ||||
|     var source = app != null ? sourceProvider.getSource(app.app.url) : null; | ||||
|     if (app?.app.installedVersion != null) { | ||||
|       appsProvider.getUpdate(app!.app.id); | ||||
|     if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) { | ||||
|       prevApp = app; | ||||
|       getUpdate(app.app.id); | ||||
|     } | ||||
|     return Scaffold( | ||||
|       appBar: settingsProvider.showAppWebpage ? AppBar() : null, | ||||
|       backgroundColor: Theme.of(context).colorScheme.surface, | ||||
|       body: settingsProvider.showAppWebpage | ||||
|           ? WebView( | ||||
|               initialUrl: app?.app.url, | ||||
|               javascriptMode: JavascriptMode.unrestricted, | ||||
|             ) | ||||
|           : Column( | ||||
|               mainAxisAlignment: MainAxisAlignment.center, | ||||
|               crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|               children: [ | ||||
|                 Text( | ||||
|                   app?.app.name ?? 'App', | ||||
|                   textAlign: TextAlign.center, | ||||
|                   style: Theme.of(context).textTheme.displayLarge, | ||||
|                 ), | ||||
|                 Text( | ||||
|                   'By ${app?.app.author ?? 'Unknown'}', | ||||
|                   textAlign: TextAlign.center, | ||||
|                   style: Theme.of(context).textTheme.headlineMedium, | ||||
|                 ), | ||||
|                 const SizedBox( | ||||
|                   height: 32, | ||||
|                 ), | ||||
|                 GestureDetector( | ||||
|                     onTap: () { | ||||
|                       if (app?.app.url != null) { | ||||
|                         launchUrlString(app?.app.url ?? '', | ||||
|                             mode: LaunchMode.externalApplication); | ||||
|                       } | ||||
|                     }, | ||||
|                     child: Text( | ||||
|                       app?.app.url ?? '', | ||||
|                       textAlign: TextAlign.center, | ||||
|                       style: const TextStyle( | ||||
|                           decoration: TextDecoration.underline, | ||||
|                           fontStyle: FontStyle.italic, | ||||
|                           fontSize: 12), | ||||
|       body: RefreshIndicator( | ||||
|           child: settingsProvider.showAppWebpage | ||||
|               ? WebView( | ||||
|                   backgroundColor: Theme.of(context).colorScheme.background, | ||||
|                   initialUrl: app?.app.url, | ||||
|                   javascriptMode: JavascriptMode.unrestricted, | ||||
|                 ) | ||||
|               : CustomScrollView( | ||||
|                   slivers: [ | ||||
|                     SliverFillRemaining( | ||||
|                         child: Column( | ||||
|                       mainAxisAlignment: MainAxisAlignment.center, | ||||
|                       crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                       children: [ | ||||
|                         app?.installedInfo != null | ||||
|                             ? Row( | ||||
|                                 mainAxisAlignment: MainAxisAlignment.center, | ||||
|                                 children: [ | ||||
|                                     Image.memory( | ||||
|                                       app!.installedInfo!.icon!, | ||||
|                                       height: 150, | ||||
|                                       gaplessPlayback: true, | ||||
|                                     ) | ||||
|                                   ]) | ||||
|                             : Container(), | ||||
|                         const SizedBox( | ||||
|                           height: 25, | ||||
|                         ), | ||||
|                         Text( | ||||
|                           app?.installedInfo?.name ?? app?.app.name ?? 'App', | ||||
|                           textAlign: TextAlign.center, | ||||
|                           style: Theme.of(context).textTheme.displayLarge, | ||||
|                         ), | ||||
|                         Text( | ||||
|                           'By ${app?.app.author ?? 'Unknown'}', | ||||
|                           textAlign: TextAlign.center, | ||||
|                           style: Theme.of(context).textTheme.headlineMedium, | ||||
|                         ), | ||||
|                         const SizedBox( | ||||
|                           height: 32, | ||||
|                         ), | ||||
|                         GestureDetector( | ||||
|                             onTap: () { | ||||
|                               if (app?.app.url != null) { | ||||
|                                 launchUrlString(app?.app.url ?? '', | ||||
|                                     mode: LaunchMode.externalApplication); | ||||
|                               } | ||||
|                             }, | ||||
|                             child: Text( | ||||
|                               app?.app.url ?? '', | ||||
|                               textAlign: TextAlign.center, | ||||
|                               style: const TextStyle( | ||||
|                                   decoration: TextDecoration.underline, | ||||
|                                   fontStyle: FontStyle.italic, | ||||
|                                   fontSize: 12), | ||||
|                             )), | ||||
|                         const SizedBox( | ||||
|                           height: 32, | ||||
|                         ), | ||||
|                         Text( | ||||
|                           'Latest Version: ${app?.app.latestVersion ?? 'Unknown'}', | ||||
|                           textAlign: TextAlign.center, | ||||
|                           style: Theme.of(context).textTheme.bodyLarge, | ||||
|                         ), | ||||
|                         Text( | ||||
|                           'Installed Version: ${app?.app.installedVersion ?? 'None'}', | ||||
|                           textAlign: TextAlign.center, | ||||
|                           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), | ||||
|                         ) | ||||
|                       ], | ||||
|                     )), | ||||
|                 const SizedBox( | ||||
|                   height: 32, | ||||
|                   ], | ||||
|                 ), | ||||
|                 Text( | ||||
|                   'Latest Version: ${app?.app.latestVersion ?? 'Unknown'}', | ||||
|                   textAlign: TextAlign.center, | ||||
|                   style: Theme.of(context).textTheme.bodyLarge, | ||||
|                 ), | ||||
|                 Text( | ||||
|                   'Installed Version: ${app?.app.installedVersion ?? 'None'}', | ||||
|                   textAlign: TextAlign.center, | ||||
|                   style: Theme.of(context).textTheme.bodyLarge, | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           onRefresh: () async { | ||||
|             if (app != null) { | ||||
|               getUpdate(app.app.id); | ||||
|             } | ||||
|           }), | ||||
|       bottomSheet: Padding( | ||||
|           padding: EdgeInsets.fromLTRB( | ||||
|               0, 0, 0, MediaQuery.of(context).padding.bottom), | ||||
| @@ -94,123 +139,97 @@ class _AppPageState extends State<AppPage> { | ||||
|                   child: Row( | ||||
|                       mainAxisAlignment: MainAxisAlignment.spaceEvenly, | ||||
|                       children: [ | ||||
|                         if (app?.app.installedVersion != app?.app.latestVersion) | ||||
|                         if (app?.app.installedVersion != null && | ||||
|                             app?.app.installedVersion != app?.app.latestVersion) | ||||
|                           IconButton( | ||||
|                               onPressed: () { | ||||
|                                 showDialog( | ||||
|                                     context: context, | ||||
|                                     builder: (BuildContext ctx) { | ||||
|                                       return AlertDialog( | ||||
|                                         title: Text( | ||||
|                                             'App Already ${app?.app.installedVersion == null ? 'Installed' : 'Updated'}?'), | ||||
|                                         actions: [ | ||||
|                                           TextButton( | ||||
|                                               onPressed: () { | ||||
|                                                 Navigator.of(context).pop(); | ||||
|                                               }, | ||||
|                                               child: const Text('No')), | ||||
|                                           TextButton( | ||||
|                                               onPressed: () { | ||||
|                                                 HapticFeedback.selectionClick(); | ||||
|                                                 var updatedApp = app?.app; | ||||
|                                                 if (updatedApp != null) { | ||||
|                                                   updatedApp.installedVersion = | ||||
|                                                       updatedApp.latestVersion; | ||||
|                                                   appsProvider | ||||
|                                                       .saveApp(updatedApp); | ||||
|                                                 } | ||||
|                                                 Navigator.of(context).pop(); | ||||
|                                               }, | ||||
|                                               child: const Text( | ||||
|                                                   'Yes, Mark as Installed')) | ||||
|                                         ], | ||||
|                                       ); | ||||
|                                     }); | ||||
|                               }, | ||||
|                               tooltip: 'Mark as Installed', | ||||
|                               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)), | ||||
|                               onPressed: app?.downloadProgress != null | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       showDialog( | ||||
|                                           context: context, | ||||
|                                           builder: (BuildContext ctx) { | ||||
|                                             return AlertDialog( | ||||
|                                               title: const Text( | ||||
|                                                   'App Already up to Date?'), | ||||
|                                               actions: [ | ||||
|                                                 TextButton( | ||||
|                                                     onPressed: () { | ||||
|                                                       Navigator.of(context) | ||||
|                                                           .pop(); | ||||
|                                                     }, | ||||
|                                                     child: const Text('No')), | ||||
|                                                 TextButton( | ||||
|                                                     onPressed: () { | ||||
|                                                       HapticFeedback | ||||
|                                                           .selectionClick(); | ||||
|                                                       var updatedApp = app?.app; | ||||
|                                                       if (updatedApp != null) { | ||||
|                                                         updatedApp | ||||
|                                                                 .installedVersion = | ||||
|                                                             updatedApp | ||||
|                                                                 .latestVersion; | ||||
|                                                         appsProvider.saveApps( | ||||
|                                                             [updatedApp]); | ||||
|                                                       } | ||||
|                                                       Navigator.of(context) | ||||
|                                                           .pop(); | ||||
|                                                     }, | ||||
|                                                     child: const Text( | ||||
|                                                         'Yes, Mark as Updated')) | ||||
|                                               ], | ||||
|                                             ); | ||||
|                                           }); | ||||
|                                     }, | ||||
|                               tooltip: 'Mark as Updated', | ||||
|                               icon: const Icon(Icons.done)), | ||||
|                         if (source != null && | ||||
|                             source.additionalDataFormItems.isNotEmpty) | ||||
|                           IconButton( | ||||
|                               onPressed: () { | ||||
|                                 showDialog( | ||||
|                                     context: context, | ||||
|                                     builder: (BuildContext ctx) { | ||||
|                                       return GeneratedFormModal( | ||||
|                                           title: 'Additional Options', | ||||
|                                           items: source.additionalDataFormItems, | ||||
|                                           defaultValues: | ||||
|                                               source.additionalDataDefaults); | ||||
|                                     }).then((values) { | ||||
|                                   if (app != null && values != null) { | ||||
|                                     var changedApp = app.app; | ||||
|                                     changedApp.additionalData = values; | ||||
|                                     sourceProvider | ||||
|                                         .getApp(source, changedApp.url, | ||||
|                                             changedApp.additionalData) | ||||
|                                         .then((finalChangedApp) { | ||||
|                                       appsProvider.saveApp(finalChangedApp); | ||||
|                                     }).catchError((e) { | ||||
|                                       ScaffoldMessenger.of(context) | ||||
|                                           .showSnackBar( | ||||
|                                         SnackBar(content: Text(e.toString())), | ||||
|                                       ); | ||||
|                                     }); | ||||
|                                   } | ||||
|                                 }); | ||||
|                               }, | ||||
|                               onPressed: app?.downloadProgress != null | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       showDialog<List<String>>( | ||||
|                                           context: context, | ||||
|                                           builder: (BuildContext ctx) { | ||||
|                                             return GeneratedFormModal( | ||||
|                                                 title: 'Additional Options', | ||||
|                                                 items: source | ||||
|                                                     .additionalDataFormItems, | ||||
|                                                 defaultValues: app != null | ||||
|                                                     ? app.app.additionalData | ||||
|                                                     : source | ||||
|                                                         .additionalDataDefaults); | ||||
|                                           }).then((values) { | ||||
|                                         if (app != null && values != null) { | ||||
|                                           var changedApp = app.app; | ||||
|                                           changedApp.additionalData = values; | ||||
|                                           appsProvider.saveApps( | ||||
|                                               [changedApp]).then((value) { | ||||
|                                             getUpdate(changedApp.id); | ||||
|                                           }); | ||||
|                                         } | ||||
|                                       }); | ||||
|                                     }, | ||||
|                               tooltip: 'Additional Options', | ||||
|                               icon: const Icon(Icons.settings)), | ||||
|                         const SizedBox(width: 16.0), | ||||
|                         Expanded( | ||||
|                             child: ElevatedButton( | ||||
|                                 onPressed: (app?.app.installedVersion == null || | ||||
|                                             appsProvider | ||||
|                                                 .checkAppObjectForUpdate( | ||||
|                                                     app!.app)) && | ||||
|                                             app?.app.installedVersion != | ||||
|                                                 app?.app.latestVersion) && | ||||
|                                         !appsProvider.areDownloadsRunning() | ||||
|                                     ? () { | ||||
|                                         HapticFeedback.heavyImpact(); | ||||
|                                         appsProvider | ||||
|                                             .downloadAndInstallLatestApp( | ||||
|                                             .downloadAndInstallLatestApps( | ||||
|                                                 [app!.app.id], | ||||
|                                                 context).then((res) { | ||||
|                                           if (res && mounted) { | ||||
|                                           if (res.isNotEmpty && mounted) { | ||||
|                                             Navigator.of(context).pop(); | ||||
|                                           } | ||||
|                                         }).catchError((e) { | ||||
|                                           showError(e, context); | ||||
|                                         }); | ||||
|                                       } | ||||
|                                     : null, | ||||
| @@ -228,15 +247,14 @@ class _AppPageState extends State<AppPage> { | ||||
|                                         return AlertDialog( | ||||
|                                           title: const Text('Remove App?'), | ||||
|                                           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: [ | ||||
|                                             TextButton( | ||||
|                                                 onPressed: () { | ||||
|                                                   HapticFeedback | ||||
|                                                       .selectionClick(); | ||||
|                                                   appsProvider | ||||
|                                                       .removeApp(app!.app.id) | ||||
|                                                       .then((_) { | ||||
|                                                   appsProvider.removeApps( | ||||
|                                                       [app!.app.id]).then((_) { | ||||
|                                                     int count = 0; | ||||
|                                                     Navigator.of(context) | ||||
|                                                         .popUntil((_) => | ||||
|   | ||||
| @@ -3,32 +3,79 @@ import 'package:flutter/services.dart'; | ||||
| import 'package:obtainium/components/custom_app_bar.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/components/generated_form_modal.dart'; | ||||
| import 'package:obtainium/custom_errors.dart'; | ||||
| import 'package:obtainium/pages/app.dart'; | ||||
| import 'package:obtainium/providers/apps_provider.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| import 'package:obtainium/providers/source_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 { | ||||
|   const AppsPage({super.key}); | ||||
|  | ||||
|   @override | ||||
|   State<AppsPage> createState() => _AppsPageState(); | ||||
|   State<AppsPage> createState() => AppsPageState(); | ||||
| } | ||||
|  | ||||
| class _AppsPageState extends State<AppsPage> { | ||||
| class AppsPageState extends State<AppsPage> { | ||||
|   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 | ||||
|   Widget build(BuildContext context) { | ||||
|     var appsProvider = context.watch<AppsProvider>(); | ||||
|     var settingsProvider = context.watch<SettingsProvider>(); | ||||
|     var existingUpdateAppIds = appsProvider.getExistingUpdates(); | ||||
|     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) { | ||||
|       sortedApps = sortedApps.where((app) { | ||||
|         if (app.app.installedVersion == app.app.latestVersion && | ||||
|             filter!.onlyNonLatest) { | ||||
|             !(filter!.includeUptodate)) { | ||||
|           return false; | ||||
|         } | ||||
|         if (app.app.installedVersion == null && | ||||
|             !(filter!.includeNonInstalled)) { | ||||
|           return false; | ||||
|         } | ||||
|         if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) { | ||||
| @@ -44,7 +91,8 @@ class _AppsPageState extends State<AppsPage> { | ||||
|             .toList(); | ||||
|  | ||||
|         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; | ||||
|           } | ||||
|         } | ||||
| @@ -58,152 +106,495 @@ class _AppsPageState extends State<AppsPage> { | ||||
|     } | ||||
|  | ||||
|     sortedApps.sort((a, b) { | ||||
|       var nameA = a.installedInfo?.name ?? a.app.name; | ||||
|       var nameB = b.installedInfo?.name ?? b.app.name; | ||||
|       int result = 0; | ||||
|       if (settingsProvider.sortColumn == SortColumnSettings.authorName) { | ||||
|         result = | ||||
|             (a.app.author + a.app.name).compareTo(b.app.author + b.app.name); | ||||
|         result = (a.app.author + nameA).compareTo(b.app.author + nameB); | ||||
|       } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) { | ||||
|         result = | ||||
|             (a.app.name + a.app.author).compareTo(b.app.name + b.app.author); | ||||
|         result = (nameA + a.app.author).compareTo(nameB + b.app.author); | ||||
|       } | ||||
|       return result; | ||||
|     }); | ||||
|  | ||||
|     if (settingsProvider.sortOrder == SortOrderSettings.ascending) { | ||||
|     if (settingsProvider.sortOrder == SortOrderSettings.descending) { | ||||
|       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( | ||||
|         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( | ||||
|             onRefresh: () { | ||||
|               HapticFeedback.lightImpact(); | ||||
|               return appsProvider.checkUpdates().catchError((e) { | ||||
|                 ScaffoldMessenger.of(context).showSnackBar( | ||||
|                   SnackBar(content: Text(e.toString())), | ||||
|                 ); | ||||
|       backgroundColor: Theme.of(context).colorScheme.surface, | ||||
|       body: RefreshIndicator( | ||||
|           onRefresh: () { | ||||
|             HapticFeedback.lightImpact(); | ||||
|             setState(() { | ||||
|               refreshingSince = DateTime.now(); | ||||
|             }); | ||||
|             return appsProvider.checkUpdates().catchError((e) { | ||||
|               showError(e, context); | ||||
|             }).whenComplete(() { | ||||
|               setState(() { | ||||
|                 refreshingSince = null; | ||||
|               }); | ||||
|             }, | ||||
|             child: CustomScrollView(slivers: <Widget>[ | ||||
|               const CustomAppBar(title: 'Apps'), | ||||
|               if (appsProvider.loadingApps || sortedApps.isEmpty) | ||||
|                 SliverFillRemaining( | ||||
|                     child: Center( | ||||
|                         child: appsProvider.loadingApps | ||||
|                             ? const CircularProgressIndicator() | ||||
|                             : Text( | ||||
|                                 appsProvider.apps.isEmpty | ||||
|                                     ? 'No Apps' | ||||
|                                     : 'No Search Results', | ||||
|                                 style: | ||||
|                                     Theme.of(context).textTheme.headlineMedium, | ||||
|                               ))), | ||||
|               SliverList( | ||||
|                   delegate: SliverChildBuilderDelegate( | ||||
|                       (BuildContext context, int index) { | ||||
|                 return ListTile( | ||||
|                   title: Text(sortedApps[index].app.name), | ||||
|                   subtitle: Text('By ${sortedApps[index].app.author}'), | ||||
|                   trailing: sortedApps[index].downloadProgress != null | ||||
|                       ? Text( | ||||
|                           'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%') | ||||
|                       : (sortedApps[index].app.installedVersion != null && | ||||
|                               sortedApps[index].app.installedVersion != | ||||
|                                   sortedApps[index].app.latestVersion | ||||
|                           ? const Text('Update Available') | ||||
|                           : Text(sortedApps[index].app.installedVersion ?? | ||||
|                               'Not Installed')), | ||||
|                   onTap: () { | ||||
|             }); | ||||
|           }, | ||||
|           child: CustomScrollView(slivers: <Widget>[ | ||||
|             const CustomAppBar(title: 'Apps'), | ||||
|             if (appsProvider.loadingApps || sortedApps.isEmpty) | ||||
|               SliverFillRemaining( | ||||
|                   child: Center( | ||||
|                       child: appsProvider.loadingApps | ||||
|                           ? const CircularProgressIndicator() | ||||
|                           : Text( | ||||
|                               appsProvider.apps.isEmpty | ||||
|                                   ? 'No Apps' | ||||
|                                   : 'No Apps for Filter', | ||||
|                               style: 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( | ||||
|                 delegate: SliverChildBuilderDelegate( | ||||
|                     (BuildContext context, int index) { | ||||
|               return ListTile( | ||||
|                 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}'), | ||||
|                 trailing: sortedApps[index].downloadProgress != null | ||||
|                     ? Text( | ||||
|                         'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%') | ||||
|                     : (sortedApps[index].app.installedVersion != null && | ||||
|                             sortedApps[index].app.installedVersion != | ||||
|                                 sortedApps[index].app.latestVersion | ||||
|                         ? Column( | ||||
|                             mainAxisAlignment: MainAxisAlignment.center, | ||||
|                             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: () { | ||||
|                                         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( | ||||
|                       context, | ||||
|                       MaterialPageRoute( | ||||
|                           builder: (context) => | ||||
|                               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 { | ||||
|   late String nameFilter; | ||||
|   late String authorFilter; | ||||
|   late bool onlyNonLatest; | ||||
|   late bool includeUptodate; | ||||
|   late bool includeNonInstalled; | ||||
|  | ||||
|   AppsFilter( | ||||
|       {this.nameFilter = "", | ||||
|       this.authorFilter = "", | ||||
|       this.onlyNonLatest = false}); | ||||
|       {this.nameFilter = '', | ||||
|       this.authorFilter = '', | ||||
|       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<NavigationPageItem> pages = [ | ||||
|     NavigationPageItem('Apps', Icons.apps, const AppsPage()), | ||||
|     NavigationPageItem( | ||||
|         'Apps', Icons.apps, AppsPage(key: GlobalKey<AppsPageState>())), | ||||
|     NavigationPageItem('Add App', Icons.add, const AddAppPage()), | ||||
|     NavigationPageItem( | ||||
|         'Import/Export', Icons.import_export, const ImportExportPage()), | ||||
| @@ -88,7 +89,9 @@ class _HomePageState extends State<HomePage> { | ||||
|             }); | ||||
|             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/generated_form.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/settings_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 { | ||||
|       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]; | ||||
|       Map<String, dynamic> errorsMap = results[1]; | ||||
|       for (var app in apps) { | ||||
|         if (appsProvider.apps.containsKey(app.id)) { | ||||
|           errorsMap.addAll({app.id: 'App already added'}); | ||||
|         } else { | ||||
|           await appsProvider.saveApp(app); | ||||
|           await appsProvider.saveApps([app]); | ||||
|         } | ||||
|       } | ||||
|       List<List<String>> errors = | ||||
| @@ -60,7 +62,6 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|         body: CustomScrollView(slivers: <Widget>[ | ||||
|           const CustomAppBar(title: 'Import/Export'), | ||||
|           SliverFillRemaining( | ||||
|               hasScrollBody: false, | ||||
|               child: Padding( | ||||
|                   padding: | ||||
|                       const EdgeInsets.symmetric(vertical: 8, horizontal: 16), | ||||
| @@ -80,12 +81,8 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                           appsProvider | ||||
|                                               .exportApps() | ||||
|                                               .then((String path) { | ||||
|                                             ScaffoldMessenger.of(context) | ||||
|                                                 .showSnackBar( | ||||
|                                               SnackBar( | ||||
|                                                   content: Text( | ||||
|                                                       'Exported to $path')), | ||||
|                                             ); | ||||
|                                             showError( | ||||
|                                                 'Exported to $path', context); | ||||
|                                           }); | ||||
|                                         }, | ||||
|                                   child: const Text('Obtainium Export'))), | ||||
| @@ -112,27 +109,21 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                               try { | ||||
|                                                 jsonDecode(data); | ||||
|                                               } catch (e) { | ||||
|                                                 throw 'Invalid input'; | ||||
|                                                 throw ObtainiumError( | ||||
|                                                     'Invalid input'); | ||||
|                                               } | ||||
|                                               appsProvider | ||||
|                                                   .importApps(data) | ||||
|                                                   .then((value) { | ||||
|                                                 ScaffoldMessenger.of(context) | ||||
|                                                     .showSnackBar( | ||||
|                                                   SnackBar( | ||||
|                                                       content: Text( | ||||
|                                                           '$value App${value == 1 ? '' : 's'} Imported')), | ||||
|                                                 ); | ||||
|                                                 showError( | ||||
|                                                     '$value App${value == 1 ? '' : 's'} Imported', | ||||
|                                                     context); | ||||
|                                               }); | ||||
|                                             } else { | ||||
|                                               // User canceled the picker | ||||
|                                             } | ||||
|                                           }).catchError((e) { | ||||
|                                             ScaffoldMessenger.of(context) | ||||
|                                                 .showSnackBar( | ||||
|                                               SnackBar( | ||||
|                                                   content: Text(e.toString())), | ||||
|                                             ); | ||||
|                                             showError(e, context); | ||||
|                                           }).whenComplete(() { | ||||
|                                             setState(() { | ||||
|                                               importInProgress = false; | ||||
| @@ -207,12 +198,9 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                       }); | ||||
|                                       addApps(urls).then((errors) { | ||||
|                                         if (errors.isEmpty) { | ||||
|                                           ScaffoldMessenger.of(context) | ||||
|                                               .showSnackBar( | ||||
|                                             SnackBar( | ||||
|                                                 content: Text( | ||||
|                                                     'Imported ${urls.length} Apps')), | ||||
|                                           ); | ||||
|                                           showError( | ||||
|                                               'Imported ${urls.length} Apps', | ||||
|                                               context); | ||||
|                                         } else { | ||||
|                                           showDialog( | ||||
|                                               context: context, | ||||
| @@ -223,10 +211,7 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                               }); | ||||
|                                         } | ||||
|                                       }).catchError((e) { | ||||
|                                         ScaffoldMessenger.of(context) | ||||
|                                             .showSnackBar( | ||||
|                                           SnackBar(content: Text(e.toString())), | ||||
|                                         ); | ||||
|                                         showError(e, context); | ||||
|                                       }).whenComplete(() { | ||||
|                                         setState(() { | ||||
|                                           importInProgress = false; | ||||
| @@ -238,7 +223,7 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                           child: const Text( | ||||
|                             'Import from URL List', | ||||
|                           )), | ||||
|                       ...sourceProvider.massSources | ||||
|                       ...sourceProvider.massUrlSources | ||||
|                           .map((source) => Column( | ||||
|                                   crossAxisAlignment: | ||||
|                                       CrossAxisAlignment.stretch, | ||||
| @@ -266,56 +251,83 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                                       ); | ||||
|                                                     }).then((values) { | ||||
|                                                   if (values != null) { | ||||
|                                                     setState(() { | ||||
|                                                       importInProgress = true; | ||||
|                                                     }); | ||||
|                                                     source | ||||
|                                                         .getUrls(values) | ||||
|                                                         .then((urls) { | ||||
|                                                       setState(() { | ||||
|                                                         importInProgress = true; | ||||
|                                                       }); | ||||
|                                                       addApps(urls) | ||||
|                                                           .then((errors) { | ||||
|                                                         if (errors.isEmpty) { | ||||
|                                                           ScaffoldMessenger.of( | ||||
|                                                                   context) | ||||
|                                                               .showSnackBar( | ||||
|                                                             SnackBar( | ||||
|                                                                 content: Text( | ||||
|                                                                     'Imported ${urls.length} Apps')), | ||||
|                                                           ); | ||||
|                                                         } else { | ||||
|                                                           showDialog( | ||||
|                                                       showDialog<List<String>?>( | ||||
|                                                               context: context, | ||||
|                                                               builder: | ||||
|                                                                   (BuildContext | ||||
|                                                                       ctx) { | ||||
|                                                                 return ImportErrorDialog( | ||||
|                                                                     urlsLength: urls | ||||
|                                                                         .length, | ||||
|                                                                     errors: | ||||
|                                                                         errors); | ||||
|                                                               }); | ||||
|                                                                 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: | ||||
|                                                                       (BuildContext | ||||
|                                                                           ctx) { | ||||
|                                                                     return ImportErrorDialog( | ||||
|                                                                         urlsLength: | ||||
|                                                                             selectedUrls | ||||
|                                                                                 .length, | ||||
|                                                                         errors: | ||||
|                                                                             errors); | ||||
|                                                                   }); | ||||
|                                                             } | ||||
|                                                           }).whenComplete(() { | ||||
|                                                             setState(() { | ||||
|                                                               importInProgress = | ||||
|                                                                   false; | ||||
|                                                             }); | ||||
|                                                           }); | ||||
|                                                         } else { | ||||
|                                                           setState(() { | ||||
|                                                             importInProgress = | ||||
|                                                                 false; | ||||
|                                                           }); | ||||
|                                                         } | ||||
|                                                       }).whenComplete(() { | ||||
|                                                         setState(() { | ||||
|                                                           importInProgress = | ||||
|                                                               false; | ||||
|                                                         }); | ||||
|                                                       }); | ||||
|                                                     }).catchError((e) { | ||||
|                                                       ScaffoldMessenger.of( | ||||
|                                                               context) | ||||
|                                                           .showSnackBar( | ||||
|                                                         SnackBar( | ||||
|                                                             content: Text( | ||||
|                                                                 e.toString())), | ||||
|                                                       ); | ||||
|                                                       setState(() { | ||||
|                                                         importInProgress = | ||||
|                                                             false; | ||||
|                                                       }); | ||||
|                                                       showError(e, context); | ||||
|                                                     }); | ||||
|                                                   } | ||||
|                                                 }); | ||||
|                                               }, | ||||
|                                         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:obtainium/components/custom_app_bar.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:url_launcher/url_launcher_string.dart'; | ||||
|  | ||||
| @@ -15,15 +17,152 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     SettingsProvider settingsProvider = context.watch<SettingsProvider>(); | ||||
|     SourceProvider sourceProvider = SourceProvider(); | ||||
|     if (settingsProvider.prefs == null) { | ||||
|       settingsProvider.initializeSettings(); | ||||
|     } | ||||
|  | ||||
|     var themeDropdown = DropdownButtonFormField( | ||||
|         decoration: const InputDecoration(labelText: 'Theme'), | ||||
|         value: settingsProvider.theme, | ||||
|         items: const [ | ||||
|           DropdownMenuItem( | ||||
|             value: ThemeSettings.dark, | ||||
|             child: Text('Dark'), | ||||
|           ), | ||||
|           DropdownMenuItem( | ||||
|             value: ThemeSettings.light, | ||||
|             child: Text('Light'), | ||||
|           ), | ||||
|           DropdownMenuItem( | ||||
|             value: ThemeSettings.system, | ||||
|             child: Text('Follow System'), | ||||
|           ) | ||||
|         ], | ||||
|         onChanged: (value) { | ||||
|           if (value != null) { | ||||
|             settingsProvider.theme = value; | ||||
|           } | ||||
|         }); | ||||
|  | ||||
|     var colourDropdown = DropdownButtonFormField( | ||||
|         decoration: const InputDecoration(labelText: 'Colour'), | ||||
|         value: settingsProvider.colour, | ||||
|         items: const [ | ||||
|           DropdownMenuItem( | ||||
|             value: ColourSettings.basic, | ||||
|             child: Text('Obtainium'), | ||||
|           ), | ||||
|           DropdownMenuItem( | ||||
|             value: ColourSettings.materialYou, | ||||
|             child: Text('Material You'), | ||||
|           ) | ||||
|         ], | ||||
|         onChanged: (value) { | ||||
|           if (value != null) { | ||||
|             settingsProvider.colour = value; | ||||
|           } | ||||
|         }); | ||||
|  | ||||
|     var sortDropdown = DropdownButtonFormField( | ||||
|         decoration: const InputDecoration(labelText: 'App Sort By'), | ||||
|         value: settingsProvider.sortColumn, | ||||
|         items: const [ | ||||
|           DropdownMenuItem( | ||||
|             value: SortColumnSettings.authorName, | ||||
|             child: Text('Author/Name'), | ||||
|           ), | ||||
|           DropdownMenuItem( | ||||
|             value: SortColumnSettings.nameAuthor, | ||||
|             child: Text('Name/Author'), | ||||
|           ), | ||||
|           DropdownMenuItem( | ||||
|             value: SortColumnSettings.added, | ||||
|             child: Text('As Added'), | ||||
|           ) | ||||
|         ], | ||||
|         onChanged: (value) { | ||||
|           if (value != null) { | ||||
|             settingsProvider.sortColumn = value; | ||||
|           } | ||||
|         }); | ||||
|  | ||||
|     var orderDropdown = DropdownButtonFormField( | ||||
|         decoration: const InputDecoration(labelText: 'App Sort Order'), | ||||
|         value: settingsProvider.sortOrder, | ||||
|         items: const [ | ||||
|           DropdownMenuItem( | ||||
|             value: SortOrderSettings.ascending, | ||||
|             child: Text('Ascending'), | ||||
|           ), | ||||
|           DropdownMenuItem( | ||||
|             value: SortOrderSettings.descending, | ||||
|             child: Text('Descending'), | ||||
|           ), | ||||
|         ], | ||||
|         onChanged: (value) { | ||||
|           if (value != null) { | ||||
|             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'), | ||||
|           SliverFillRemaining( | ||||
|               hasScrollBody: true, | ||||
|           SliverToBoxAdapter( | ||||
|               child: Padding( | ||||
|                   padding: const EdgeInsets.all(16), | ||||
|                   child: settingsProvider.prefs == null | ||||
| @@ -36,112 +175,22 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|                               style: TextStyle( | ||||
|                                   color: Theme.of(context).colorScheme.primary), | ||||
|                             ), | ||||
|                             DropdownButtonFormField( | ||||
|                                 decoration: | ||||
|                                     const InputDecoration(labelText: 'Theme'), | ||||
|                                 value: settingsProvider.theme, | ||||
|                                 items: const [ | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: ThemeSettings.dark, | ||||
|                                     child: Text('Dark'), | ||||
|                                   ), | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: ThemeSettings.light, | ||||
|                                     child: Text('Light'), | ||||
|                                   ), | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: ThemeSettings.system, | ||||
|                                     child: Text('Follow System'), | ||||
|                                   ) | ||||
|                                 ], | ||||
|                                 onChanged: (value) { | ||||
|                                   if (value != null) { | ||||
|                                     settingsProvider.theme = value; | ||||
|                                   } | ||||
|                                 }), | ||||
|                             const SizedBox( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             DropdownButtonFormField( | ||||
|                                 decoration: | ||||
|                                     const InputDecoration(labelText: 'Colour'), | ||||
|                                 value: settingsProvider.colour, | ||||
|                                 items: const [ | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: ColourSettings.basic, | ||||
|                                     child: Text('Obtainium'), | ||||
|                                   ), | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: ColourSettings.materialYou, | ||||
|                                     child: Text('Material You'), | ||||
|                                   ) | ||||
|                                 ], | ||||
|                                 onChanged: (value) { | ||||
|                                   if (value != null) { | ||||
|                                     settingsProvider.colour = value; | ||||
|                                   } | ||||
|                                 }), | ||||
|                             const SizedBox( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             themeDropdown, | ||||
|                             height16, | ||||
|                             colourDropdown, | ||||
|                             height16, | ||||
|                             Row( | ||||
|                               mainAxisAlignment: MainAxisAlignment.start, | ||||
|                               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                               children: [ | ||||
|                                 Expanded( | ||||
|                                     child: DropdownButtonFormField( | ||||
|                                         decoration: const InputDecoration( | ||||
|                                             labelText: 'App Sort By'), | ||||
|                                         value: settingsProvider.sortColumn, | ||||
|                                         items: const [ | ||||
|                                           DropdownMenuItem( | ||||
|                                             value: | ||||
|                                                 SortColumnSettings.authorName, | ||||
|                                             child: Text('Author/Name'), | ||||
|                                           ), | ||||
|                                           DropdownMenuItem( | ||||
|                                             value: | ||||
|                                                 SortColumnSettings.nameAuthor, | ||||
|                                             child: Text('Name/Author'), | ||||
|                                           ), | ||||
|                                           DropdownMenuItem( | ||||
|                                             value: SortColumnSettings.added, | ||||
|                                             child: Text('As Added'), | ||||
|                                           ) | ||||
|                                         ], | ||||
|                                         onChanged: (value) { | ||||
|                                           if (value != null) { | ||||
|                                             settingsProvider.sortColumn = value; | ||||
|                                           } | ||||
|                                         })), | ||||
|                                 Expanded(child: sortDropdown), | ||||
|                                 const SizedBox( | ||||
|                                   width: 16, | ||||
|                                 ), | ||||
|                                 Expanded( | ||||
|                                     child: DropdownButtonFormField( | ||||
|                                         decoration: const InputDecoration( | ||||
|                                             labelText: 'App Sort Order'), | ||||
|                                         value: settingsProvider.sortOrder, | ||||
|                                         items: const [ | ||||
|                                           DropdownMenuItem( | ||||
|                                             value: SortOrderSettings.ascending, | ||||
|                                             child: Text('Ascending'), | ||||
|                                           ), | ||||
|                                           DropdownMenuItem( | ||||
|                                             value: SortOrderSettings.descending, | ||||
|                                             child: Text('Descending'), | ||||
|                                           ), | ||||
|                                         ], | ||||
|                                         onChanged: (value) { | ||||
|                                           if (value != null) { | ||||
|                                             settingsProvider.sortOrder = value; | ||||
|                                           } | ||||
|                                         })), | ||||
|                                 Expanded(child: orderDropdown), | ||||
|                               ], | ||||
|                             ), | ||||
|                             const SizedBox( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             height16, | ||||
|                             Row( | ||||
|                               mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||
|                               children: [ | ||||
| @@ -153,84 +202,64 @@ 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( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             const SizedBox( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             height16, | ||||
|                             Text( | ||||
|                               'More', | ||||
|                               'Updates', | ||||
|                               style: TextStyle( | ||||
|                                   color: Theme.of(context).colorScheme.primary), | ||||
|                             ), | ||||
|                             DropdownButtonFormField( | ||||
|                                 decoration: const InputDecoration( | ||||
|                                     labelText: | ||||
|                                         'Background Update Checking Interval'), | ||||
|                                 value: settingsProvider.updateInterval, | ||||
|                                 items: const [ | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: 15, | ||||
|                                     child: Text('15 Minutes'), | ||||
|                                   ), | ||||
|                                   DropdownMenuItem( | ||||
|                                     value: 30, | ||||
|                                     child: Text('30 Minutes'), | ||||
|                                   ), | ||||
|                                   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'), | ||||
|                                   ), | ||||
|                                 ], | ||||
|                                 onChanged: (value) { | ||||
|                                   if (value != null) { | ||||
|                                     settingsProvider.updateInterval = value; | ||||
|                                   } | ||||
|                                 }), | ||||
|                             const Spacer(), | ||||
|                             Row( | ||||
|                               mainAxisAlignment: MainAxisAlignment.center, | ||||
|                               children: [ | ||||
|                                 TextButton.icon( | ||||
|                                   style: ButtonStyle( | ||||
|                                     foregroundColor: | ||||
|                                         MaterialStateProperty.resolveWith< | ||||
|                                             Color>((Set<MaterialState> states) { | ||||
|                                       return Colors.grey; | ||||
|                                     }), | ||||
|                                   ), | ||||
|                                   onPressed: () { | ||||
|                                     launchUrlString(settingsProvider.sourceUrl, | ||||
|                                         mode: LaunchMode.externalApplication); | ||||
|                                   }, | ||||
|                                   icon: const Icon(Icons.code), | ||||
|                                   label: Text( | ||||
|                                     'Source', | ||||
|                                     style: | ||||
|                                         Theme.of(context).textTheme.bodySmall, | ||||
|                                   ), | ||||
|                                 ) | ||||
|                               ], | ||||
|                             intervalDropdown, | ||||
|                             const Divider( | ||||
|                               height: 48, | ||||
|                             ), | ||||
|                             Text( | ||||
|                               'Source-Specific', | ||||
|                               style: TextStyle( | ||||
|                                   color: Theme.of(context).colorScheme.primary), | ||||
|                             ), | ||||
|                             ...sourceSpecificFields, | ||||
|                           ], | ||||
|                         ))) | ||||
|                         ))), | ||||
|           SliverToBoxAdapter( | ||||
|             child: Column( | ||||
|               children: [ | ||||
|                 height16, | ||||
|                 TextButton.icon( | ||||
|                   style: ButtonStyle( | ||||
|                     foregroundColor: MaterialStateProperty.resolveWith<Color>( | ||||
|                         (Set<MaterialState> states) { | ||||
|                       return Colors.grey; | ||||
|                     }), | ||||
|                   ), | ||||
|                   onPressed: () { | ||||
|                     launchUrlString(settingsProvider.sourceUrl, | ||||
|                         mode: LaunchMode.externalApplication); | ||||
|                   }, | ||||
|                   icon: const Icon(Icons.code), | ||||
|                   label: Text( | ||||
|                     'Source', | ||||
|                     style: 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:io'; | ||||
|  | ||||
| import 'package:device_info_plus/device_info_plus.dart'; | ||||
| import 'package:flutter/material.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:package_archive_info/package_archive_info.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:path_provider/path_provider.dart'; | ||||
| import 'package:flutter_fgbg/flutter_fgbg.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:install_plugin_v2/install_plugin_v2.dart'; | ||||
|  | ||||
| class AppInMemory { | ||||
|   late App app; | ||||
|   double? downloadProgress; | ||||
|   AppInfo? installedInfo; | ||||
|  | ||||
|   AppInMemory(this.app, this.downloadProgress); | ||||
|   AppInMemory(this.app, this.downloadProgress, this.installedInfo); | ||||
| } | ||||
|  | ||||
| class ApkFile { | ||||
| class DownloadedApk { | ||||
|   String appId; | ||||
|   File file; | ||||
|   ApkFile(this.appId, this.file); | ||||
|   DownloadedApk(this.appId, this.file); | ||||
| } | ||||
|  | ||||
| class AppsProvider with ChangeNotifier { | ||||
| @@ -33,136 +41,308 @@ class AppsProvider with ChangeNotifier { | ||||
|   Map<String, AppInMemory> apps = {}; | ||||
|   bool loadingApps = false; | ||||
|   bool gettingUpdates = false; | ||||
|   bool forBGTask = false; | ||||
|  | ||||
|   // Variables to keep track of the app foreground status (installs can't run in the background) | ||||
|   bool isForeground = true; | ||||
|   late Stream<FGBGType> foregroundStream; | ||||
|   late StreamSubscription<FGBGType> foregroundSubscription; | ||||
|   late Stream<FGBGType>? foregroundStream; | ||||
|   late StreamSubscription<FGBGType>? foregroundSubscription; | ||||
|  | ||||
|   AppsProvider( | ||||
|       {bool shouldLoadApps = false, | ||||
|       bool shouldCheckUpdatesAfterLoad = false, | ||||
|       bool shouldDeleteAPKs = false}) { | ||||
|     // Subscribe to changes in the app foreground status | ||||
|     foregroundStream = FGBGEvents.stream.asBroadcastStream(); | ||||
|     foregroundSubscription = foregroundStream.listen((event) async { | ||||
|       isForeground = event == FGBGType.foreground; | ||||
|       if (isForeground) await loadApps(); | ||||
|     }); | ||||
|     if (shouldDeleteAPKs) { | ||||
|       deleteSavedAPKs(); | ||||
|     } | ||||
|     if (shouldLoadApps) { | ||||
|       loadApps().then((_) { | ||||
|         if (shouldCheckUpdatesAfterLoad) { | ||||
|           checkUpdates(); | ||||
|         } | ||||
|   AppsProvider({this.forBGTask = false}) { | ||||
|     // Many setup tasks should only be done in the foreground isolate | ||||
|     if (!forBGTask) { | ||||
|       // Subscribe to changes in the app foreground status | ||||
|       foregroundStream = FGBGEvents.stream.asBroadcastStream(); | ||||
|       foregroundSubscription = foregroundStream?.listen((event) async { | ||||
|         isForeground = event == FGBGType.foreground; | ||||
|         if (isForeground) await loadApps(); | ||||
|       }); | ||||
|       () async { | ||||
|         // Load Apps into memory (in background, this is done later instead of in the constructor) | ||||
|         await loadApps(); | ||||
|         // Delete existing APKs | ||||
|         (await getExternalStorageDirectory()) | ||||
|             ?.listSync() | ||||
|             .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 = | ||||
|         await Client().send(Request('GET', Uri.parse(apkUrl))); | ||||
|     File downloadFile = | ||||
|         File('${(await getExternalStorageDirectory())!.path}/$appId.apk'); | ||||
|     if (downloadFile.existsSync()) { | ||||
|       downloadFile.deleteSync(); | ||||
|         await Client().send(Request('GET', Uri.parse(url))); | ||||
|     File downloadedFile = File('$destDir/$fileName'); | ||||
|  | ||||
|     if (downloadedFile.existsSync()) { | ||||
|       downloadedFile.deleteSync(); | ||||
|     } | ||||
|     var length = response.contentLength; | ||||
|     var received = 0; | ||||
|     var sink = downloadFile.openWrite(); | ||||
|     double? progress; | ||||
|     var sink = downloadedFile.openWrite(); | ||||
|  | ||||
|     await response.stream.map((s) { | ||||
|       received += s.length; | ||||
|       apps[appId]!.downloadProgress = | ||||
|           (length != null ? received / length * 100 : 30); | ||||
|       notifyListeners(); | ||||
|       progress = (length != null ? received / length * 100 : 30); | ||||
|       if (onProgress != null) { | ||||
|         onProgress(progress); | ||||
|       } | ||||
|       return s; | ||||
|     }).pipe(sink); | ||||
|  | ||||
|     await sink.close(); | ||||
|     apps[appId]!.downloadProgress = null; | ||||
|     notifyListeners(); | ||||
|     progress = null; | ||||
|     if (onProgress != null) { | ||||
|       onProgress(progress); | ||||
|     } | ||||
|  | ||||
|     if (response.statusCode != 200) { | ||||
|       downloadFile.deleteSync(); | ||||
|       downloadedFile.deleteSync(); | ||||
|       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 | ||||
|       .where((element) => element.downloadProgress != null) | ||||
|       .isNotEmpty; | ||||
|  | ||||
|   // Given an AppId, uses stored info about the app to download an APK (with user input if needed) and install it | ||||
|   // Installs can only be done in the foreground, so a notification is sent to get the user's attention if needed | ||||
|   // Returns upon successful download, regardless of installation result | ||||
|   Future<bool> downloadAndInstallLatestApp( | ||||
|       List<String> appIds, BuildContext context) async { | ||||
|   Future<bool> canInstallSilently(App app) async { | ||||
|     return false; | ||||
|     // TODO: Uncomment the below once silentupdates are ever figured out | ||||
|     // // TODO: This is unreliable - try to get from OS in the future | ||||
|     // 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 = | ||||
|         context.read<NotificationsProvider>(); | ||||
|     Map<String, String> appsToInstall = {}; | ||||
|     if (!isForeground) { | ||||
|       await notificationsProvider.notify(completeInstallationNotification, | ||||
|           cancelExisting: true); | ||||
|       while (await FGBGEvents.stream.first != FGBGType.foreground) {} | ||||
|       await notificationsProvider.cancel(completeInstallationNotification.id); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   // 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( | ||||
|           context: context, | ||||
|           builder: (BuildContext ctx) { | ||||
|             return APKPicker( | ||||
|               app: app, | ||||
|               initVal: apkUrl, | ||||
|               archs: archs, | ||||
|             ); | ||||
|           }); | ||||
|     } | ||||
|     // If the picked APK comes from an origin different from the source, get user confirmation (if context provided) | ||||
|     if (apkUrl != null && | ||||
|         Uri.parse(apkUrl).origin != Uri.parse(app.url).origin && | ||||
|         context != null) { | ||||
|       if (await showDialog( | ||||
|               context: context, | ||||
|               builder: (BuildContext ctx) { | ||||
|                 return APKOriginWarningDialog( | ||||
|                     sourceUrl: app.url, apkUrl: apkUrl!); | ||||
|               }) != | ||||
|           true) { | ||||
|         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 'App not found'; | ||||
|       } | ||||
|       // 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) { | ||||
|         apkUrl = await showDialog( | ||||
|             context: context, | ||||
|             builder: (BuildContext ctx) { | ||||
|               return APKPicker(app: apps[id]!.app, initVal: apkUrl); | ||||
|             }); | ||||
|       } | ||||
|       // If the picked APK comes from an origin different from the source, get user confirmation | ||||
|       if (apkUrl != null && | ||||
|           Uri.parse(apkUrl).origin != Uri.parse(apps[id]!.app.url).origin) { | ||||
|         if (await showDialog( | ||||
|                 context: context, | ||||
|                 builder: (BuildContext ctx) { | ||||
|                   return APKOriginWarningDialog( | ||||
|                       sourceUrl: apps[id]!.app.url, apkUrl: apkUrl!); | ||||
|                 }) != | ||||
|             true) { | ||||
|           apkUrl = null; | ||||
|         } | ||||
|         throw ObtainiumError('App not found'); | ||||
|       } | ||||
|       String? apkUrl = await confirmApkUrl(apps[id]!.app, context); | ||||
|       if (apkUrl != null) { | ||||
|         int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl); | ||||
|         if (urlInd != apps[id]!.app.preferredApkIndex) { | ||||
|           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); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     // Download APKs for all Apps to be installed | ||||
|     MultiAppMultiError errors = MultiAppMultiError(); | ||||
|     List<DownloadedApk?> downloadedFiles = | ||||
|         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) { | ||||
|       bool willBeSilent = await canInstallSilently(apps[f!.appId]!.app); | ||||
|       if (willBeSilent) { | ||||
|         silentUpdates.add(f); | ||||
|       } else { | ||||
|         regularInstalls.add(f); | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries | ||||
|         .map((entry) => downloadApp(entry.value, entry.key))); | ||||
|     // Move everything to the regular install list (since silent updates don't currently work) - TODO | ||||
|     regularInstalls.addAll(silentUpdates); | ||||
|  | ||||
|     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 | ||||
|     // 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; | ||||
|     } | ||||
|  | ||||
|     // 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 | ||||
|     // This also does not use the 'session-based' installer API, so background/silent updates are impossible | ||||
|     for (var f in downloadedFiles) { | ||||
|       await InstallPlugin.installApk(f.file.path, 'dev.imranr.obtainium'); | ||||
|       apps[f.appId]!.app.installedVersion = apps[f.appId]!.app.latestVersion; | ||||
|       await saveApp(apps[f.appId]!.app); | ||||
|     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()); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     return downloadedFiles.isNotEmpty; | ||||
|     if (errors.content.isNotEmpty) { | ||||
|       throw errors; | ||||
|     } | ||||
|  | ||||
|     NotificationsProvider().cancel(UpdateNotification([]).id); | ||||
|  | ||||
|     return downloadedFiles.map((e) => e!.appId).toList(); | ||||
|   } | ||||
|  | ||||
|   Future<Directory> getAppsDir() async { | ||||
| @@ -174,16 +354,62 @@ class AppsProvider with ChangeNotifier { | ||||
|     return appsDir; | ||||
|   } | ||||
|  | ||||
|   Future<void> deleteSavedAPKs() async { | ||||
|     (await getExternalStorageDirectory()) | ||||
|         ?.listSync() | ||||
|         .where((element) => element.path.endsWith('.apk')) | ||||
|         .forEach((element) { | ||||
|       element.deleteSync(); | ||||
|     }); | ||||
|   Future<AppInfo?> getInstalledInfo(String? packageName) async { | ||||
|     if (packageName != null) { | ||||
|       try { | ||||
|         return await InstalledApps.getAppInfo(packageName); | ||||
|       } catch (e) { | ||||
|         // 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 { | ||||
|     while (loadingApps) { | ||||
|       await Future.delayed(const Duration(microseconds: 1)); | ||||
|     } | ||||
|     loadingApps = true; | ||||
|     notifyListeners(); | ||||
|     List<FileSystemEntity> appFiles = (await getAppsDir()) | ||||
| @@ -191,83 +417,146 @@ class AppsProvider with ChangeNotifier { | ||||
|         .where((item) => item.path.toLowerCase().endsWith('.json')) | ||||
|         .toList(); | ||||
|     apps.clear(); | ||||
|     var sp = SourceProvider(); | ||||
|     List<List<String>> errors = []; | ||||
|     for (int i = 0; i < appFiles.length; i++) { | ||||
|       App app = | ||||
|           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; | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   Future<void> saveApp(App app) async { | ||||
|     File('${(await getAppsDir()).path}/${app.id}.json') | ||||
|         .writeAsStringSync(jsonEncode(app.toJson())); | ||||
|     apps.update(app.id, (value) => AppInMemory(app, value.downloadProgress), | ||||
|         ifAbsent: () => AppInMemory(app, null)); | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   Future<void> removeApp(String appId) async { | ||||
|     File file = File('${(await getAppsDir()).path}/$appId.json'); | ||||
|     if (file.existsSync()) { | ||||
|       file.deleteSync(); | ||||
|     List<App> modifiedApps = []; | ||||
|     for (var app in apps.values) { | ||||
|       var moddedApp = | ||||
|           getCorrectedInstallStatusAppIfPossible(app.app, app.installedInfo); | ||||
|       if (moddedApp != null) { | ||||
|         modifiedApps.add(moddedApp); | ||||
|       } | ||||
|     } | ||||
|     if (apps.containsKey(appId)) { | ||||
|       apps.remove(appId); | ||||
|     if (modifiedApps.isNotEmpty) { | ||||
|       await saveApps(modifiedApps); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   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') | ||||
|           .writeAsStringSync(jsonEncode(app.toJson())); | ||||
|       this.apps.update( | ||||
|           app.id, (value) => AppInMemory(app, value.downloadProgress, info), | ||||
|           ifAbsent: () => AppInMemory(app, null, info)); | ||||
|     } | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   bool checkAppObjectForUpdate(App app) { | ||||
|     if (!apps.containsKey(app.id)) { | ||||
|       throw 'App not found'; | ||||
|   Future<void> removeApps(List<String> appIds) async { | ||||
|     for (var appId in appIds) { | ||||
|       File file = File('${(await getAppsDir()).path}/$appId.json'); | ||||
|       if (file.existsSync()) { | ||||
|         file.deleteSync(); | ||||
|       } | ||||
|       if (apps.containsKey(appId)) { | ||||
|         apps.remove(appId); | ||||
|       } | ||||
|     } | ||||
|     if (appIds.isNotEmpty) { | ||||
|       notifyListeners(); | ||||
|     } | ||||
|     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; | ||||
|     SourceProvider sourceProvider = SourceProvider(); | ||||
|     App newApp = await sourceProvider.getApp( | ||||
|         sourceProvider.getSource(currentApp.url), | ||||
|         currentApp.url, | ||||
|         currentApp.additionalData); | ||||
|     if (newApp.latestVersion != currentApp.latestVersion) { | ||||
|       newApp.installedVersion = currentApp.installedVersion; | ||||
|       if (currentApp.preferredApkIndex < newApp.apkUrls.length) { | ||||
|         newApp.preferredApkIndex = currentApp.preferredApkIndex; | ||||
|       } | ||||
|       await saveApp(newApp); | ||||
|       return newApp; | ||||
|         currentApp.additionalData, | ||||
|         name: currentApp.name, | ||||
|         id: currentApp.id); | ||||
|     newApp.installedVersion = currentApp.installedVersion; | ||||
|     if (currentApp.preferredApkIndex < newApp.apkUrls.length) { | ||||
|       newApp.preferredApkIndex = currentApp.preferredApkIndex; | ||||
|     } | ||||
|     return null; | ||||
|     await saveApps([newApp]); | ||||
|     return newApp.latestVersion != currentApp.latestVersion ? newApp : null; | ||||
|   } | ||||
|  | ||||
|   Future<List<App>> checkUpdates() async { | ||||
|   Future<List<App>> checkUpdates( | ||||
|       {DateTime? ignoreAppsCheckedAfter, | ||||
|       bool throwErrorsForRetry = false}) async { | ||||
|     List<App> updates = []; | ||||
|     MultiAppMultiError errors = MultiAppMultiError(); | ||||
|     if (!gettingUpdates) { | ||||
|       gettingUpdates = true; | ||||
|  | ||||
|       List<String> appIds = apps.keys.toList(); | ||||
|       for (int i = 0; i < appIds.length; i++) { | ||||
|         App? newApp = await getUpdate(appIds[i]); | ||||
|         if (newApp != null) { | ||||
|           updates.add(newApp); | ||||
|       try { | ||||
|         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++) { | ||||
|           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) { | ||||
|             updates.add(newApp); | ||||
|           } | ||||
|         } | ||||
|       } finally { | ||||
|         gettingUpdates = false; | ||||
|       } | ||||
|       gettingUpdates = false; | ||||
|     } | ||||
|     if (errors.content.isNotEmpty) { | ||||
|       throw errors; | ||||
|     } | ||||
|     return updates; | ||||
|   } | ||||
|  | ||||
|   List<String> getExistingUpdates() { | ||||
|   List<String> findExistingUpdates( | ||||
|       {bool installedOnly = false, bool nonInstalledOnly = false}) { | ||||
|     List<String> updateAppIds = []; | ||||
|     List<String> appIds = apps.keys.toList(); | ||||
|     for (int i = 0; i < appIds.length; i++) { | ||||
|       App? app = apps[appIds[i]]!.app; | ||||
|       if (app.installedVersion != app.latestVersion) { | ||||
|         updateAppIds.add(app.id); | ||||
|       if (app.installedVersion != app.latestVersion && | ||||
|           (!installedOnly || !nonInstalledOnly)) { | ||||
|         if ((app.installedVersion == null && | ||||
|                 (nonInstalledOnly || !installedOnly) || | ||||
|             (app.installedVersion != null && | ||||
|                 (installedOnly || !nonInstalledOnly)))) { | ||||
|           updateAppIds.add(app.id); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     return updateAppIds; | ||||
| @@ -288,31 +577,35 @@ class AppsProvider with ChangeNotifier { | ||||
|   } | ||||
|  | ||||
|   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>) | ||||
|         .map((e) => App.fromJson(e)) | ||||
|         .toList(); | ||||
|     for (App a in importedApps) { | ||||
|       a.installedVersion = | ||||
|           apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null; | ||||
|       await saveApp(a); | ||||
|     while (loadingApps) { | ||||
|       await Future.delayed(const Duration(microseconds: 1)); | ||||
|     } | ||||
|     for (App a in importedApps) { | ||||
|       if (apps[a.id]?.app.installedVersion != null) { | ||||
|         a.installedVersion = apps[a.id]?.app.installedVersion; | ||||
|       } | ||||
|     } | ||||
|     await saveApps(importedApps); | ||||
|     notifyListeners(); | ||||
|     return importedApps.length; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   void dispose() { | ||||
|     foregroundSubscription.cancel(); | ||||
|     foregroundSubscription?.cancel(); | ||||
|     super.dispose(); | ||||
|   } | ||||
| } | ||||
|  | ||||
| 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 String? initVal; | ||||
|   final List<String>? archs; | ||||
|  | ||||
|   @override | ||||
|   State<APKPicker> createState() => _APKPickerState(); | ||||
| @@ -330,15 +623,29 @@ class _APKPickerState extends State<APKPicker> { | ||||
|       content: Column(children: [ | ||||
|         Text('${widget.app.name} has more than one package:'), | ||||
|         const SizedBox(height: 16), | ||||
|         ...widget.app.apkUrls.map((u) => RadioListTile<String>( | ||||
|             title: Text(Uri.parse(u).pathSegments.last), | ||||
|             value: u, | ||||
|             groupValue: apkUrl, | ||||
|             onChanged: (String? val) { | ||||
|               setState(() { | ||||
|                 apkUrl = val; | ||||
|               }); | ||||
|             })) | ||||
|         ...widget.app.apkUrls.map( | ||||
|           (u) => RadioListTile<String>( | ||||
|               title: Text(Uri.parse(u) | ||||
|                   .pathSegments | ||||
|                   .where((element) => element.isNotEmpty) | ||||
|                   .last), | ||||
|               value: u, | ||||
|               groupValue: apkUrl, | ||||
|               onChanged: (String? val) { | ||||
|                 setState(() { | ||||
|                   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: [ | ||||
|         TextButton( | ||||
|   | ||||
| @@ -27,9 +27,27 @@ class UpdateNotification extends ObtainiumNotification { | ||||
|             'Updates Available', | ||||
|             'Notifies the user that updates are available for one or more Apps tracked by Obtainium', | ||||
|             Importance.max) { | ||||
|     message = updates.isEmpty | ||||
|         ? "No new updates." | ||||
|         : updates.length == 1 | ||||
|             ? '${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.'; | ||||
|   } | ||||
| } | ||||
|  | ||||
| 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} 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[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.'; | ||||
|   } | ||||
| } | ||||
|  | ||||
| @@ -45,6 +63,24 @@ class ErrorCheckingUpdatesNotification extends ObtainiumNotification { | ||||
|             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( | ||||
|     1, | ||||
|     'Complete App Installation', | ||||
|   | ||||
| @@ -13,6 +13,16 @@ enum SortColumnSettings { added, nameAuthor, authorName } | ||||
|  | ||||
| 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 { | ||||
|   SharedPreferences? prefs; | ||||
|  | ||||
| @@ -45,7 +55,17 @@ class SettingsProvider with ChangeNotifier { | ||||
|   } | ||||
|  | ||||
|   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) { | ||||
| @@ -54,8 +74,8 @@ class SettingsProvider with ChangeNotifier { | ||||
|   } | ||||
|  | ||||
|   SortColumnSettings get sortColumn { | ||||
|     return SortColumnSettings | ||||
|         .values[prefs?.getInt('sortColumn') ?? SortColumnSettings.added.index]; | ||||
|     return SortColumnSettings.values[ | ||||
|         prefs?.getInt('sortColumn') ?? SortColumnSettings.nameAuthor.index]; | ||||
|   } | ||||
|  | ||||
|   set sortColumn(SortColumnSettings s) { | ||||
| @@ -65,7 +85,7 @@ class SettingsProvider with ChangeNotifier { | ||||
|  | ||||
|   SortOrderSettings get sortOrder { | ||||
|     return SortOrderSettings.values[ | ||||
|         prefs?.getInt('sortOrder') ?? SortOrderSettings.descending.index]; | ||||
|         prefs?.getInt('sortOrder') ?? SortOrderSettings.ascending.index]; | ||||
|   } | ||||
|  | ||||
|   set sortOrder(SortOrderSettings s) { | ||||
| @@ -95,11 +115,29 @@ class SettingsProvider with ChangeNotifier { | ||||
|   } | ||||
|  | ||||
|   bool get showAppWebpage { | ||||
|     return prefs?.getBool('showAppWebpage') ?? true; | ||||
|     return prefs?.getBool('showAppWebpage') ?? false; | ||||
|   } | ||||
|  | ||||
|   set showAppWebpage(bool show) { | ||||
|     prefs?.setBool('showAppWebpage', show); | ||||
|     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/mullvad.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/custom_errors.dart'; | ||||
| import 'package:obtainium/mass_app_sources/githubstars.dart'; | ||||
|  | ||||
| class AppNames { | ||||
| @@ -37,6 +39,7 @@ class App { | ||||
|   List<String> apkUrls = []; | ||||
|   late int preferredApkIndex; | ||||
|   late List<String> additionalData; | ||||
|   late DateTime? lastUpdateCheck; | ||||
|   App( | ||||
|       this.id, | ||||
|       this.url, | ||||
| @@ -46,11 +49,12 @@ class App { | ||||
|       this.latestVersion, | ||||
|       this.apkUrls, | ||||
|       this.preferredApkIndex, | ||||
|       this.additionalData); | ||||
|       this.additionalData, | ||||
|       this.lastUpdateCheck); | ||||
|  | ||||
|   @override | ||||
|   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( | ||||
| @@ -68,7 +72,10 @@ class App { | ||||
|       json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int, | ||||
|       json['additionalData'] == null | ||||
|           ? 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() => { | ||||
|         'id': id, | ||||
| @@ -79,17 +86,13 @@ class App { | ||||
|         'latestVersion': latestVersion, | ||||
|         'apkUrls': jsonEncode(apkUrls), | ||||
|         'preferredApkIndex': preferredApkIndex, | ||||
|         'additionalData': jsonEncode(additionalData) | ||||
|         'additionalData': jsonEncode(additionalData), | ||||
|         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch | ||||
|       }; | ||||
| } | ||||
|  | ||||
| escapeRegEx(String s) { | ||||
|   return s.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) { | ||||
|     return "\\${x[0]}"; | ||||
|   }); | ||||
| } | ||||
|  | ||||
| makeUrlHttps(String url) { | ||||
| // Ensure the input is starts with HTTPS and has no WWW | ||||
| preStandardizeUrl(String url) { | ||||
|   if (url.toLowerCase().indexOf('http://') != 0 && | ||||
|       url.toLowerCase().indexOf('https://') != 0) { | ||||
|     url = 'https://$url'; | ||||
| @@ -97,6 +100,11 @@ makeUrlHttps(String url) { | ||||
|   if (url.toLowerCase().indexOf('https://www.') == 0) { | ||||
|     url = 'https://${url.substring(12)}'; | ||||
|   } | ||||
|   url = url | ||||
|       .split('/') | ||||
|       .where((e) => e.isNotEmpty) | ||||
|       .join('/') | ||||
|       .replaceFirst(':/', '://'); | ||||
|   return url; | ||||
| } | ||||
|  | ||||
| @@ -128,9 +136,12 @@ abstract class AppSource { | ||||
|   AppNames getAppNames(String standardUrl); | ||||
|   late List<List<GeneratedFormItem>> additionalDataFormItems; | ||||
|   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 List<String> requiredArgs; | ||||
|   Future<List<String>> getUrls(List<String> args); | ||||
| @@ -144,14 +155,15 @@ class SourceProvider { | ||||
|     FDroid(), | ||||
|     IzzyOnDroid(), | ||||
|     Mullvad(), | ||||
|     Signal() | ||||
|     Signal(), | ||||
|     SourceForge() | ||||
|   ]; | ||||
|  | ||||
|   // Add more mass source classes here so they are available via the service | ||||
|   List<MassAppSource> massSources = [GitHubStars()]; | ||||
|   // Add more mass url source classes here so they are available via the service | ||||
|   List<MassAppUrlSource> massUrlSources = [GitHubStars()]; | ||||
|  | ||||
|   AppSource getSource(String url) { | ||||
|     url = makeUrlHttps(url); | ||||
|     url = preStandardizeUrl(url); | ||||
|     AppSource? source; | ||||
|     for (var s in sources) { | ||||
|       if (url.toLowerCase().contains('://${s.host}')) { | ||||
| @@ -160,12 +172,12 @@ class SourceProvider { | ||||
|       } | ||||
|     } | ||||
|     if (source == null) { | ||||
|       throw 'URL does not match a known source'; | ||||
|       throw UnsupportedURLError(); | ||||
|     } | ||||
|     return source; | ||||
|   } | ||||
|  | ||||
|   bool doesSourceHaveRequiredAdditionalData(AppSource source) { | ||||
|   bool ifSourceAppsRequireAdditionalData(AppSource source) { | ||||
|     for (var row in source.additionalDataFormItems) { | ||||
|       for (var element in row) { | ||||
|         if (element.required) { | ||||
| @@ -176,30 +188,49 @@ class SourceProvider { | ||||
|     return false; | ||||
|   } | ||||
|  | ||||
|   Future<App> getApp( | ||||
|       AppSource source, String url, List<String> additionalData) async { | ||||
|     String standardUrl = source.standardizeURL(makeUrlHttps(url)); | ||||
|   String generateTempID(AppNames names, AppSource source) => | ||||
|       '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}'; | ||||
|  | ||||
|   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); | ||||
|     APKDetails apk = | ||||
|         await source.getLatestAPKDetails(standardUrl, additionalData); | ||||
|     return App( | ||||
|         '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}', | ||||
|         id ?? generateTempID(names, source), | ||||
|         standardUrl, | ||||
|         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, | ||||
|         apk.version, | ||||
|         apk.version.replaceAll('/', '-'), | ||||
|         apk.apkUrls, | ||||
|         apk.apkUrls.length - 1, | ||||
|         additionalData); | ||||
|         additionalData, | ||||
|         DateTime.now()); | ||||
|   } | ||||
|  | ||||
|   /// Returns a length 2 list, where the first element is a list of Apps and | ||||
|   /// the second is a Map<String, dynamic> of URLs and errors | ||||
|   Future<List<dynamic>> getApps(List<String> urls) async { | ||||
|   // Returns errors in [results, errors] instead of throwing them | ||||
|   Future<List<dynamic>> getApps(List<String> urls, | ||||
|       {List<String> ignoreUrls = const []}) async { | ||||
|     List<App> apps = []; | ||||
|     Map<String, dynamic> errors = {}; | ||||
|     for (var url in urls) { | ||||
|     for (var url in urls.where((element) => !ignoreUrls.contains(element))) { | ||||
|       try { | ||||
|         var source = getSource(url); | ||||
|         apps.add(await getApp(source, url, source.additionalDataDefaults)); | ||||
|   | ||||
							
								
								
									
										170
									
								
								pubspec.lock
									
									
									
									
									
								
							
							
						
						| @@ -1,20 +1,27 @@ | ||||
| # Generated by pub | ||||
| # See https://dart.dev/tools/pub/glossary#lockfile | ||||
| 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: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: animations | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.0.4" | ||||
|     version: "2.0.7" | ||||
|   archive: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: archive | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.3.1" | ||||
|     version: "3.3.2" | ||||
|   args: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -71,6 +78,13 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     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: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -105,42 +119,14 @@ packages: | ||||
|       name: device_info_plus | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "4.1.2" | ||||
|   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" | ||||
|     version: "8.0.0" | ||||
|   device_info_plus_platform_interface: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: device_info_plus_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.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" | ||||
|     version: "7.0.0" | ||||
|   dynamic_color: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -175,7 +161,7 @@ packages: | ||||
|       name: file_picker | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "5.1.0" | ||||
|     version: "5.2.2" | ||||
|   flutter: | ||||
|     dependency: "direct main" | ||||
|     description: flutter | ||||
| @@ -208,14 +194,14 @@ packages: | ||||
|       name: flutter_local_notifications | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "10.0.0" | ||||
|     version: "12.0.3" | ||||
|   flutter_local_notifications_linux: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: flutter_local_notifications_linux | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.0.0" | ||||
|     version: "2.0.0" | ||||
|   flutter_local_notifications_platform_interface: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -246,14 +232,14 @@ packages: | ||||
|       name: fluttertoast | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "8.0.9" | ||||
|     version: "8.1.1" | ||||
|   html: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: html | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.15.0" | ||||
|     version: "0.15.1" | ||||
|   http: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -267,14 +253,14 @@ packages: | ||||
|       name: http_parser | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "4.0.1" | ||||
|     version: "4.0.2" | ||||
|   image: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: image | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.2.0" | ||||
|     version: "3.2.2" | ||||
|   install_plugin_v2: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -282,6 +268,13 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     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: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -295,14 +288,14 @@ packages: | ||||
|       name: json_annotation | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "4.6.0" | ||||
|     version: "4.7.0" | ||||
|   lints: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: lints | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.0.0" | ||||
|     version: "2.0.1" | ||||
|   matcher: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -316,7 +309,7 @@ packages: | ||||
|       name: material_color_utilities | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.2.0" | ||||
|     version: "0.1.5" | ||||
|   meta: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -324,6 +317,13 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.8.0" | ||||
|   mime: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: mime | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.0.2" | ||||
|   nested: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -331,6 +331,20 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     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: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -351,7 +365,7 @@ packages: | ||||
|       name: path_provider_android | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.0.20" | ||||
|     version: "2.0.21" | ||||
|   path_provider_ios: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -379,7 +393,7 @@ packages: | ||||
|       name: path_provider_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.0.4" | ||||
|     version: "2.0.5" | ||||
|   path_provider_windows: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -393,42 +407,42 @@ packages: | ||||
|       name: permission_handler | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "10.0.0" | ||||
|     version: "10.2.0" | ||||
|   permission_handler_android: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: permission_handler_android | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "10.0.0" | ||||
|     version: "10.2.0" | ||||
|   permission_handler_apple: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: permission_handler_apple | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "9.0.4" | ||||
|     version: "9.0.7" | ||||
|   permission_handler_platform_interface: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: permission_handler_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.7.0" | ||||
|     version: "3.9.0" | ||||
|   permission_handler_windows: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: permission_handler_windows | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.1.0" | ||||
|     version: "0.1.2" | ||||
|   petitparser: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: petitparser | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "5.0.0" | ||||
|     version: "5.1.0" | ||||
|   platform: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -456,7 +470,21 @@ packages: | ||||
|       name: provider | ||||
|       url: "https://pub.dartlang.org" | ||||
|     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: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -470,7 +498,7 @@ packages: | ||||
|       name: shared_preferences_android | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.0.13" | ||||
|     version: "2.0.14" | ||||
|   shared_preferences_ios: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -524,7 +552,7 @@ packages: | ||||
|       name: source_span | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.9.1" | ||||
|     version: "1.9.0" | ||||
|   stack_trace: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -559,14 +587,14 @@ packages: | ||||
|       name: test_api | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.4.14" | ||||
|     version: "0.4.12" | ||||
|   timezone: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: timezone | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.8.0" | ||||
|     version: "0.9.0" | ||||
|   typed_data: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -580,14 +608,14 @@ packages: | ||||
|       name: url_launcher | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "6.1.5" | ||||
|     version: "6.1.6" | ||||
|   url_launcher_android: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: url_launcher_android | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "6.0.19" | ||||
|     version: "6.0.21" | ||||
|   url_launcher_ios: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -615,7 +643,7 @@ packages: | ||||
|       name: url_launcher_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.1.0" | ||||
|     version: "2.1.1" | ||||
|   url_launcher_web: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -630,13 +658,20 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.1" | ||||
|   uuid: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: uuid | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.6" | ||||
|   vector_math: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: vector_math | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.1.3" | ||||
|     version: "2.1.2" | ||||
|   webview_flutter: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -650,35 +685,28 @@ packages: | ||||
|       name: webview_flutter_android | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.10.1" | ||||
|     version: "2.10.4" | ||||
|   webview_flutter_platform_interface: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: webview_flutter_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.9.3" | ||||
|     version: "1.9.5" | ||||
|   webview_flutter_wkwebview: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: webview_flutter_wkwebview | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.9.4" | ||||
|     version: "2.9.5" | ||||
|   win32: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: win32 | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.0" | ||||
|   workmanager: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: workmanager | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.5.0" | ||||
|     version: "3.0.1" | ||||
|   xdg_directories: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -701,5 +729,5 @@ packages: | ||||
|     source: hosted | ||||
|     version: "3.1.1" | ||||
| sdks: | ||||
|   dart: ">=2.19.0-79.0.dev <3.0.0" | ||||
|   dart: ">=2.18.2 <3.0.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 | ||||
| # In Windows, build-name is used as the major, minor, and patch parts | ||||
| # of the product and file versions while build-number is used as the build suffix. | ||||
| version: 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: | ||||
|   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. | ||||
| # To automatically upgrade your package dependencies to the latest versions | ||||
| @@ -38,21 +38,24 @@ dependencies: | ||||
|   cupertino_icons: ^1.0.5 | ||||
|   path_provider: ^2.0.11 | ||||
|   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 | ||||
|   http: ^0.13.5 | ||||
|   webview_flutter: ^3.0.4 | ||||
|   workmanager: ^0.5.0 | ||||
|   dynamic_color: ^1.5.4 | ||||
|   install_plugin_v2: ^1.0.0 # Try replacing this | ||||
|   html: ^0.15.0 | ||||
|   shared_preferences: ^2.0.15 | ||||
|   url_launcher: ^6.1.5 | ||||
|   permission_handler: ^10.0.0 | ||||
|   fluttertoast: ^8.0.9 | ||||
|   device_info_plus: ^4.1.2 | ||||
|   device_info_plus: ^8.0.0 | ||||
|   file_picker: ^5.1.0 | ||||
|   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: | ||||
|   | ||||
| @@ -13,7 +13,7 @@ import 'package:obtainium/main.dart'; | ||||
| void main() { | ||||
|   testWidgets('Counter increments smoke test', (WidgetTester tester) async { | ||||
|     // Build our app and trigger a frame. | ||||
|     await tester.pumpWidget(const MyApp()); | ||||
|     await tester.pumpWidget(const Obtainium()); | ||||
|  | ||||
|     // Verify that our counter starts at 0. | ||||
|     expect(find.text('0'), findsOneWidget); | ||||
|   | ||||