mirror of
				https://github.com/ImranR98/Obtainium.git
				synced 2025-10-31 13:33:28 +01:00 
			
		
		
		
	Compare commits
	
		
			33 Commits
		
	
	
		
			v0.2.4-bet
			...
			v0.5.0-bet
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | fbe4f0b49e | ||
|  | e2440a38c4 | ||
|  | 496a10a444 | ||
|  | b8bb8d1f4b | ||
|  | af033f42cb | ||
|  | e706661062 | ||
|  | 1a68b8abe6 | ||
|  | 15c0ed04d1 | ||
|  | dd193d62f2 | ||
|  | 77e1768f3b | ||
|  | da9e5aed5e | ||
|  | 136628c9e6 | ||
|  | a916167be3 | ||
|  | 420cf487d4 | ||
|  | 12855370b0 | ||
|  | 33fed1cb2f | ||
|  | 33238b56a9 | ||
|  | 428c208de4 | ||
|  | 9a4b0301be | ||
|  | f58d26524c | ||
|  | 45e5544c5b | ||
|  | 0a9373e65a | ||
|  | b65c6e1d41 | ||
|  | 22dd8253a9 | ||
|  | 18198bbdfe | ||
|  | cf3c86abb8 | ||
|  | 570e376742 | ||
|  | 32ae5e8175 | ||
|  | cbf5057c17 | ||
|  | 2cfe62142a | ||
|  | d03486fc5d | ||
|  | 224e435bbb | ||
|  | 90fa0e06ce | 
| @@ -30,6 +30,16 @@ | ||||
|         <meta-data | ||||
|             android:name="flutterEmbedding" | ||||
|             android:value="2" /> | ||||
|         <provider | ||||
|             android:name="androidx.core.content.FileProvider" | ||||
|             android:authorities="${applicationId}.fileProvider" | ||||
|             android:exported="false" | ||||
|             android:grantUriPermissions="true"> | ||||
|             <meta-data | ||||
|                 android:name="android.support.FILE_PROVIDER_PATHS" | ||||
|                 android:resource="@xml/file_paths" /> | ||||
|         </provider> | ||||
|  | ||||
|     </application> | ||||
|     <uses-permission android:name="android.permission.INTERNET" /> | ||||
|     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> | ||||
|   | ||||
							
								
								
									
										5
									
								
								android/app/src/main/res/xml/file_paths.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										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> | ||||
							
								
								
									
										66
									
								
								lib/app_sources/fdroid.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								lib/app_sources/fdroid.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | ||||
| import 'package:html/parser.dart'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class FDroid implements AppSource { | ||||
|   @override | ||||
|   late String host = 'f-droid.org'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     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()); | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @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 version = latestReleaseDiv | ||||
|           ?.querySelector('.package-version-header b') | ||||
|           ?.innerHtml | ||||
|           .split(' ') | ||||
|           .last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, [apkUrl]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = []; | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
							
								
								
									
										158
									
								
								lib/app_sources/github.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										158
									
								
								lib/app_sources/github.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,158 @@ | ||||
| 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/settings_provider.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class GitHub implements AppSource { | ||||
|   @override | ||||
|   late String host = 'github.com'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(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 | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
|     var includePrereleases = | ||||
|         additionalData.isNotEmpty && additionalData[0] == 'true'; | ||||
|     var fallbackToOlderReleases = | ||||
|         additionalData.length >= 2 && additionalData[1] == 'true'; | ||||
|     var regexFilter = additionalData.length >= 3 && additionalData[2].isNotEmpty | ||||
|         ? additionalData[2] | ||||
|         : null; | ||||
|     Response res = await get(Uri.parse( | ||||
|         'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var releases = jsonDecode(res.body) as List<dynamic>; | ||||
|  | ||||
|       List<String> getReleaseAPKUrls(dynamic release) => | ||||
|           (release['assets'] as List<dynamic>?) | ||||
|               ?.map((e) { | ||||
|                 return e['browser_download_url'] != null | ||||
|                     ? e['browser_download_url'] as String | ||||
|                     : ''; | ||||
|               }) | ||||
|               .where((element) => element.toLowerCase().endsWith('.apk')) | ||||
|               .toList() ?? | ||||
|           []; | ||||
|  | ||||
|       dynamic targetRelease; | ||||
|  | ||||
|       for (int i = 0; i < releases.length; i++) { | ||||
|         if (!fallbackToOlderReleases && i > 0) break; | ||||
|         if (!includePrereleases && releases[i]['prerelease'] == true) { | ||||
|           continue; | ||||
|         } | ||||
|         if (regexFilter != null && | ||||
|             !RegExp(regexFilter) | ||||
|                 .hasMatch((releases[i]['name'] as String).trim())) { | ||||
|           continue; | ||||
|         } | ||||
|         var apkUrls = getReleaseAPKUrls(releases[i]); | ||||
|         if (apkUrls.isEmpty) { | ||||
|           continue; | ||||
|         } | ||||
|         targetRelease = releases[i]; | ||||
|         targetRelease['apkUrls'] = apkUrls; | ||||
|         break; | ||||
|       } | ||||
|       if (targetRelease == null) { | ||||
|         throw couldNotFindReleases; | ||||
|       } | ||||
|       if ((targetRelease['apkUrls'] as List<String>).isEmpty) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|       String? version = targetRelease['tag_name']; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, targetRelease['apkUrls']); | ||||
|     } else { | ||||
|       if (res.headers['x-ratelimit-remaining'] == '0') { | ||||
|         throw RateLimitError( | ||||
|             (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / | ||||
|                     60000000) | ||||
|                 .round()); | ||||
|       } | ||||
|  | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     String temp = standardUrl.substring(standardUrl.indexOf('://') + 3); | ||||
|     List<String> names = temp.substring(temp.indexOf('/') + 1).split('/'); | ||||
|     return AppNames(names[0], names[1]); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = [ | ||||
|     [GeneratedFormItem(label: 'Include prereleases', type: FormItemType.bool)], | ||||
|     [ | ||||
|       GeneratedFormItem( | ||||
|           label: 'Fallback to older releases', type: FormItemType.bool) | ||||
|     ], | ||||
|     [ | ||||
|       GeneratedFormItem( | ||||
|           label: 'Filter Release Titles by Regular Expression', | ||||
|           type: FormItemType.string, | ||||
|           required: false, | ||||
|           additionalValidators: [ | ||||
|             (value) { | ||||
|               if (value == null || value.isEmpty) { | ||||
|                 return null; | ||||
|               } | ||||
|               try { | ||||
|                 RegExp(value); | ||||
|               } catch (e) { | ||||
|                 return 'Invalid regular expression'; | ||||
|               } | ||||
|               return null; | ||||
|             } | ||||
|           ]) | ||||
|     ] | ||||
|   ]; | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = ['true', 'true', '']; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = [ | ||||
|     GeneratedFormItem( | ||||
|         label: 'GitHub Credentials (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; | ||||
|           } | ||||
|         ]) | ||||
|   ]; | ||||
| } | ||||
							
								
								
									
										74
									
								
								lib/app_sources/gitlab.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										74
									
								
								lib/app_sources/gitlab.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,74 @@ | ||||
| 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/providers/source_provider.dart'; | ||||
|  | ||||
| class GitLab implements AppSource { | ||||
|   @override | ||||
|   late String host = 'gitlab.com'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
|     Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var standardUri = Uri.parse(standardUrl); | ||||
|       var parsedHtml = parse(res.body); | ||||
|       var entry = parsedHtml.querySelector('entry'); | ||||
|       var entryContent = | ||||
|           parse(parseFragment(entry?.querySelector('content')!.innerHtml).text); | ||||
|       var apkUrlList = [ | ||||
|         ...getLinksFromParsedHTML( | ||||
|             entryContent, | ||||
|             RegExp( | ||||
|                 '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$', | ||||
|                 caseSensitive: false), | ||||
|             standardUri.origin), | ||||
|         // GitLab releases may contain links to externally hosted APKs | ||||
|         ...getLinksFromParsedHTML(entryContent, | ||||
|                 RegExp('/[^/]+\\.apk\$', caseSensitive: false), '') | ||||
|             .where((element) => Uri.parse(element).host != '') | ||||
|             .toList() | ||||
|       ]; | ||||
|       if (apkUrlList.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|  | ||||
|       var entryId = entry?.querySelector('id')?.innerHtml; | ||||
|       var version = | ||||
|           entryId == null ? null : Uri.parse(entryId).pathSegments.last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, apkUrlList); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     // Same as GitHub | ||||
|     return GitHub().getAppNames(standardUrl); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = []; | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
							
								
								
									
										68
									
								
								lib/app_sources/izzyondroid.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								lib/app_sources/izzyondroid.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,68 @@ | ||||
| import 'package:html/parser.dart'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class IzzyOnDroid implements AppSource { | ||||
|   @override | ||||
|   late String host = 'android.izzysoft.de'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
|     Response res = await get(Uri.parse(standardUrl)); | ||||
|     if (res.statusCode == 200) { | ||||
|       var parsedHtml = parse(res.body); | ||||
|       var multipleVersionApkUrls = parsedHtml | ||||
|           .querySelectorAll('a') | ||||
|           .where((element) => | ||||
|               element.attributes['href']?.toLowerCase().endsWith('.apk') ?? | ||||
|               false) | ||||
|           .map((e) => 'https://$host${e.attributes['href'] ?? ''}') | ||||
|           .toList(); | ||||
|       if (multipleVersionApkUrls.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|       var version = parsedHtml | ||||
|           .querySelector('#keydata') | ||||
|           ?.querySelectorAll('b') | ||||
|           .where( | ||||
|               (element) => element.innerHtml.toLowerCase().contains('version')) | ||||
|           .toList()[0] | ||||
|           .parentNode | ||||
|           ?.parentNode | ||||
|           ?.children[1] | ||||
|           .innerHtml; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, [multipleVersionApkUrls[0]]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     return AppNames('IzzyOnDroid', Uri.parse(standardUrl).pathSegments.last); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = []; | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
							
								
								
									
										54
									
								
								lib/app_sources/mullvad.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								lib/app_sources/mullvad.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,54 @@ | ||||
| import 'package:html/parser.dart'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class Mullvad implements AppSource { | ||||
|   @override | ||||
|   late String host = 'mullvad.net'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL(runtimeType.toString()); | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
|     Response res = await get(Uri.parse('$standardUrl/en/download/android')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var version = parse(res.body) | ||||
|           .querySelector('p.subtitle.is-6') | ||||
|           ?.querySelector('a') | ||||
|           ?.attributes['href'] | ||||
|           ?.split('/') | ||||
|           .last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails( | ||||
|           version, ['https://mullvad.net/download/app/apk/latest']); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     return AppNames('Mullvad-VPN', 'Mullvad-VPN'); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = []; | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
							
								
								
									
										47
									
								
								lib/app_sources/signal.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								lib/app_sources/signal.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,47 @@ | ||||
| import 'dart:convert'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
|  | ||||
| class Signal implements AppSource { | ||||
|   @override | ||||
|   late String host = 'signal.org'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     return 'https://$host'; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData) async { | ||||
|     Response res = | ||||
|         await get(Uri.parse('https://updates.$host/android/latest.json')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var json = jsonDecode(res.body); | ||||
|       String? apkUrl = json['url']; | ||||
|       if (apkUrl == null) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|       String? version = json['versionName']; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, [apkUrl]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) => AppNames('Signal', 'Signal'); | ||||
|  | ||||
|   @override | ||||
|   List<List<GeneratedFormItem>> additionalDataFormItems = []; | ||||
|  | ||||
|   @override | ||||
|   List<String> additionalDataDefaults = []; | ||||
|  | ||||
|   @override | ||||
|   List<GeneratedFormItem> moreSourceSettingsFormItems = []; | ||||
| } | ||||
							
								
								
									
										71
									
								
								lib/app_sources/sourceforge.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								lib/app_sources/sourceforge.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,71 @@ | ||||
| import 'package:html/parser.dart'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:obtainium/components/generated_form.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 notValidURL(runtimeType.toString()); | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @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 couldNotFindLatestVersion; | ||||
|       } | ||||
|       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 noAPKFound; | ||||
|       } | ||||
|       return APKDetails(version, apkUrlList); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @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 = []; | ||||
| } | ||||
							
								
								
									
										177
									
								
								lib/components/generated_form.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										177
									
								
								lib/components/generated_form.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,177 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
|  | ||||
| enum FormItemType { string, bool } | ||||
|  | ||||
| typedef OnValueChanges = void Function(List<String> values, bool valid); | ||||
|  | ||||
| class GeneratedFormItem { | ||||
|   late String label; | ||||
|   late FormItemType type; | ||||
|   late bool required; | ||||
|   late int max; | ||||
|   late List<String? Function(String? value)> additionalValidators; | ||||
|   late String id; | ||||
|  | ||||
|   GeneratedFormItem( | ||||
|       {this.label = 'Input', | ||||
|       this.type = FormItemType.string, | ||||
|       this.required = true, | ||||
|       this.max = 1, | ||||
|       this.additionalValidators = const [], | ||||
|       this.id = 'input'}); | ||||
| } | ||||
|  | ||||
| class GeneratedForm extends StatefulWidget { | ||||
|   const GeneratedForm( | ||||
|       {super.key, | ||||
|       required this.items, | ||||
|       required this.onValueChanges, | ||||
|       required this.defaultValues}); | ||||
|  | ||||
|   final List<List<GeneratedFormItem>> items; | ||||
|   final OnValueChanges onValueChanges; | ||||
|   final List<String> defaultValues; | ||||
|  | ||||
|   @override | ||||
|   State<GeneratedForm> createState() => _GeneratedFormState(); | ||||
| } | ||||
|  | ||||
| class _GeneratedFormState extends State<GeneratedForm> { | ||||
|   final _formKey = GlobalKey<FormState>(); | ||||
|   late List<List<String>> values; | ||||
|   late List<List<Widget>> formInputs; | ||||
|   List<List<Widget>> rows = []; | ||||
|  | ||||
|   // If any value changes, call this to update the parent with value and validity | ||||
|   void someValueChanged() { | ||||
|     List<String> returnValues = []; | ||||
|     var valid = true; | ||||
|     for (int r = 0; r < values.length; r++) { | ||||
|       for (int i = 0; i < values[r].length; i++) { | ||||
|         returnValues.add(values[r][i]); | ||||
|         if (formInputs[r][i] is TextFormField) { | ||||
|           valid = valid && | ||||
|               ((formInputs[r][i].key as GlobalKey<FormFieldState>) | ||||
|                       .currentState | ||||
|                       ?.isValid ?? | ||||
|                   false); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     widget.onValueChanges(returnValues, valid); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   void initState() { | ||||
|     super.initState(); | ||||
|  | ||||
|     // Initialize form values as all empty | ||||
|     int j = 0; | ||||
|     values = widget.items | ||||
|         .map((row) => row.map((e) { | ||||
|               return j < widget.defaultValues.length | ||||
|                   ? widget.defaultValues[j++] | ||||
|                   : ''; | ||||
|             }).toList()) | ||||
|         .toList(); | ||||
|  | ||||
|     // Dynamically create form inputs | ||||
|     formInputs = widget.items.asMap().entries.map((row) { | ||||
|       return row.value.asMap().entries.map((e) { | ||||
|         if (e.value.type == FormItemType.string) { | ||||
|           final formFieldKey = GlobalKey<FormFieldState>(); | ||||
|           return TextFormField( | ||||
|             key: formFieldKey, | ||||
|             initialValue: values[row.key][e.key], | ||||
|             autovalidateMode: AutovalidateMode.onUserInteraction, | ||||
|             onChanged: (value) { | ||||
|               setState(() { | ||||
|                 values[row.key][e.key] = value; | ||||
|                 someValueChanged(); | ||||
|               }); | ||||
|             }, | ||||
|             decoration: InputDecoration( | ||||
|                 helperText: e.value.label + (e.value.required ? ' *' : '')), | ||||
|             minLines: e.value.max <= 1 ? null : e.value.max, | ||||
|             maxLines: e.value.max <= 1 ? 1 : e.value.max, | ||||
|             validator: (value) { | ||||
|               if (e.value.required && (value == null || value.trim().isEmpty)) { | ||||
|                 return '${e.value.label} (required)'; | ||||
|               } | ||||
|               for (var validator in e.value.additionalValidators) { | ||||
|                 String? result = validator(value); | ||||
|                 if (result != null) { | ||||
|                   return result; | ||||
|                 } | ||||
|               } | ||||
|               return null; | ||||
|             }, | ||||
|           ); | ||||
|         } else { | ||||
|           return Container(); // Some input types added in build | ||||
|         } | ||||
|       }).toList(); | ||||
|     }).toList(); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     for (var r = 0; r < formInputs.length; r++) { | ||||
|       for (var e = 0; e < formInputs[r].length; e++) { | ||||
|         if (widget.items[r][e].type == FormItemType.bool) { | ||||
|           formInputs[r][e] = Row( | ||||
|             mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||
|             children: [ | ||||
|               Text(widget.items[r][e].label), | ||||
|               Switch( | ||||
|                   value: values[r][e] == 'true', | ||||
|                   onChanged: (value) { | ||||
|                     setState(() { | ||||
|                       values[r][e] = value ? 'true' : ''; | ||||
|                       someValueChanged(); | ||||
|                     }); | ||||
|                   }) | ||||
|             ], | ||||
|           ); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     rows.clear(); | ||||
|     formInputs.asMap().entries.forEach((rowInputs) { | ||||
|       if (rowInputs.key > 0) { | ||||
|         rows.add([ | ||||
|           SizedBox( | ||||
|             height: widget.items[rowInputs.key][0].type == FormItemType.bool && | ||||
|                     widget.items[rowInputs.key - 1][0].type == | ||||
|                         FormItemType.string | ||||
|                 ? 25 | ||||
|                 : 8, | ||||
|           ) | ||||
|         ]); | ||||
|       } | ||||
|       List<Widget> rowItems = []; | ||||
|       rowInputs.value.asMap().entries.forEach((rowInput) { | ||||
|         if (rowInput.key > 0) { | ||||
|           rowItems.add(const SizedBox( | ||||
|             width: 20, | ||||
|           )); | ||||
|         } | ||||
|         rowItems.add(Expanded(child: rowInput.value)); | ||||
|       }); | ||||
|       rows.add(rowItems); | ||||
|     }); | ||||
|  | ||||
|     return Form( | ||||
|         key: _formKey, | ||||
|         child: Column( | ||||
|           children: [ | ||||
|             ...rows.map((row) => Row( | ||||
|                   mainAxisAlignment: MainAxisAlignment.start, | ||||
|                   crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                   children: [...row.map((e) => e)], | ||||
|                 )) | ||||
|           ], | ||||
|         )); | ||||
|   } | ||||
| } | ||||
| @@ -1,61 +1,58 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter/services.dart'; | ||||
|  | ||||
| class GeneratedFormItem { | ||||
|   late String message; | ||||
|   late bool required; | ||||
|   late int lines; | ||||
|  | ||||
|   GeneratedFormItem(this.message, this.required, this.lines); | ||||
| } | ||||
| import 'package:obtainium/components/generated_form.dart'; | ||||
|  | ||||
| class GeneratedFormModal extends StatefulWidget { | ||||
|   const GeneratedFormModal( | ||||
|       {super.key, required this.title, required this.items}); | ||||
|       {super.key, | ||||
|       required this.title, | ||||
|       required this.items, | ||||
|       required this.defaultValues, | ||||
|       this.initValid = false, | ||||
|       this.message = ''}); | ||||
|  | ||||
|   final String title; | ||||
|   final List<GeneratedFormItem> items; | ||||
|   final String message; | ||||
|   final List<List<GeneratedFormItem>> items; | ||||
|   final List<String> defaultValues; | ||||
|   final bool initValid; | ||||
|  | ||||
|   @override | ||||
|   State<GeneratedFormModal> createState() => _GeneratedFormModalState(); | ||||
| } | ||||
|  | ||||
| class _GeneratedFormModalState extends State<GeneratedFormModal> { | ||||
|   final _formKey = GlobalKey<FormState>(); | ||||
|   List<String> values = []; | ||||
|   bool valid = false; | ||||
|  | ||||
|   final urlInputController = TextEditingController(); | ||||
|   @override | ||||
|   void initState() { | ||||
|     super.initState(); | ||||
|     valid = widget.initValid; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     final formInputs = widget.items.map((e) { | ||||
|       final controller = TextEditingController(); | ||||
|       return [ | ||||
|         controller, | ||||
|         TextFormField( | ||||
|           decoration: InputDecoration(helperText: e.message), | ||||
|           controller: controller, | ||||
|           minLines: e.lines <= 1 ? null : e.lines, | ||||
|           maxLines: e.lines <= 1 ? 1 : e.lines, | ||||
|           validator: e.required | ||||
|               ? (value) { | ||||
|                   if (value == null || value.isEmpty) { | ||||
|                     return '${e.message} (required)'; | ||||
|                   } | ||||
|                   return null; | ||||
|                 } | ||||
|               : null, | ||||
|         ) | ||||
|       ]; | ||||
|     }).toList(); | ||||
|     return AlertDialog( | ||||
|       scrollable: true, | ||||
|       title: Text(widget.title), | ||||
|       content: Form( | ||||
|           key: _formKey, | ||||
|           child: Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|             children: [...formInputs.map((e) => e[1] as Widget)], | ||||
|           )), | ||||
|       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: () { | ||||
| @@ -63,12 +60,12 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> { | ||||
|             }, | ||||
|             child: const Text('Cancel')), | ||||
|         TextButton( | ||||
|             onPressed: () { | ||||
|               if (_formKey.currentState?.validate() == true) { | ||||
|             onPressed: !valid | ||||
|                 ? null | ||||
|                 : () { | ||||
|                     if (valid) { | ||||
|                       HapticFeedback.selectionClick(); | ||||
|                 Navigator.of(context).pop(formInputs | ||||
|                     .map((e) => (e[0] as TextEditingController).value.text) | ||||
|                     .toList()); | ||||
|                       Navigator.of(context).pop(values); | ||||
|                     } | ||||
|                   }, | ||||
|             child: const Text('Continue')) | ||||
| @@ -76,5 +73,3 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> { | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| // TODO: Add support for larger textarea so this can be used for text/json imports | ||||
							
								
								
									
										8
									
								
								lib/custom_errors.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								lib/custom_errors.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| class RateLimitError { | ||||
|   late int remainingMinutes; | ||||
|   RateLimitError(this.remainingMinutes); | ||||
|  | ||||
|   @override | ||||
|   String toString() => | ||||
|       'Too many requests (rate limited) - try again in $remainingMinutes minutes'; | ||||
| } | ||||
							
								
								
									
										105
									
								
								lib/main.dart
									
									
									
									
									
								
							
							
						
						
									
										105
									
								
								lib/main.dart
									
									
									
									
									
								
							| @@ -1,5 +1,7 @@ | ||||
| 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'; | ||||
| @@ -12,33 +14,76 @@ import 'package:dynamic_color/dynamic_color.dart'; | ||||
| import 'package:device_info_plus/device_info_plus.dart'; | ||||
|  | ||||
| const String currentReleaseTag = | ||||
|     'v0.2.4-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES | ||||
|     'v0.5.0-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES | ||||
|  | ||||
| @pragma('vm:entry-point') | ||||
| void bgTaskCallback() { | ||||
|   // Background update checking process | ||||
|   Workmanager().executeTask((task, taskName) async { | ||||
| const String bgUpdateCheckTaskName = 'bg-update-check'; | ||||
|  | ||||
| bgUpdateCheck(int? ignoreAfterMicroseconds) async { | ||||
|   DateTime? ignoreAfter = ignoreAfterMicroseconds != null | ||||
|       ? DateTime.fromMicrosecondsSinceEpoch(ignoreAfterMicroseconds) | ||||
|       : null; | ||||
|   var notificationsProvider = NotificationsProvider(); | ||||
|   await notificationsProvider.notify(checkingUpdatesNotification); | ||||
|   try { | ||||
|     var appsProvider = AppsProvider(); | ||||
|       await notificationsProvider | ||||
|           .cancel(ErrorCheckingUpdatesNotification('').id); | ||||
|     await notificationsProvider.cancel(ErrorCheckingUpdatesNotification('').id); | ||||
|     await appsProvider.loadApps(); | ||||
|       List<App> updates = await appsProvider.checkUpdates(); | ||||
|       if (updates.isNotEmpty) { | ||||
|         notificationsProvider.notify(UpdateNotification(updates), | ||||
|     // List<String> existingUpdateIds = // TODO: Uncomment this and below when it works | ||||
|     //     appsProvider.getExistingUpdates(installedOnly: true); | ||||
|     List<String> existingUpdateIds = | ||||
|         appsProvider.getExistingUpdates(installedOnly: true); | ||||
|     DateTime nextIgnoreAfter = DateTime.now(); | ||||
|     try { | ||||
|       await appsProvider.checkUpdates(ignoreAfter: ignoreAfter); | ||||
|     } catch (e) { | ||||
|       if (e is RateLimitError) { | ||||
|         // Ignore these (scheduling another task as below does not work) | ||||
|         String nextTaskName = | ||||
|             '$bgUpdateCheckTaskName-${nextIgnoreAfter.microsecondsSinceEpoch.toString()}'; | ||||
|         Workmanager().registerOneOffTask(nextTaskName, nextTaskName, | ||||
|             constraints: Constraints(networkType: NetworkType.connected), | ||||
|             initialDelay: Duration(minutes: e.remainingMinutes), | ||||
|             inputData: {'ignoreAfter': nextIgnoreAfter.microsecondsSinceEpoch}); | ||||
|       } else { | ||||
|         rethrow; | ||||
|       } | ||||
|     } | ||||
|     List<App> newUpdates = appsProvider | ||||
|         .getExistingUpdates(installedOnly: true) | ||||
|         .where((id) => !existingUpdateIds.contains(id)) | ||||
|         .map((e) => appsProvider.apps[e]!.app) | ||||
|         .toList(); | ||||
|     // List<String> silentlyUpdated = await appsProvider | ||||
|     //     .downloadAndInstallLatestApp( | ||||
|     //         [...newUpdates.map((e) => e.id), ...existingUpdateIds], null); | ||||
|     // if (silentlyUpdated.isNotEmpty) { | ||||
|     //   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), | ||||
|           cancelExisting: true); | ||||
|     } | ||||
|     return Future.value(true); | ||||
|   } catch (e) { | ||||
|       notificationsProvider.notify( | ||||
|           ErrorCheckingUpdatesNotification(e.toString()), | ||||
|     notificationsProvider.notify(ErrorCheckingUpdatesNotification(e.toString()), | ||||
|         cancelExisting: true); | ||||
|       return Future.value(false); | ||||
|     return Future.error(false); | ||||
|   } finally { | ||||
|     await notificationsProvider.cancel(checkingUpdatesNotification.id); | ||||
|   } | ||||
| } | ||||
|  | ||||
| @pragma('vm:entry-point') | ||||
| void bgTaskCallback() { | ||||
|   // Background process callback | ||||
|   Workmanager().executeTask((task, inputData) async { | ||||
|     return await bgUpdateCheck(inputData?['ignoreAfter']); | ||||
|   }); | ||||
| } | ||||
|  | ||||
| @@ -58,7 +103,7 @@ void main() async { | ||||
|       ChangeNotifierProvider( | ||||
|           create: (context) => AppsProvider( | ||||
|               shouldLoadApps: true, | ||||
|               shouldCheckUpdatesAfterLoad: true, | ||||
|               shouldCheckUpdatesAfterLoad: false, | ||||
|               shouldDeleteAPKs: true)), | ||||
|       ChangeNotifierProvider(create: (context) => SettingsProvider()), | ||||
|       Provider(create: (context) => NotificationsProvider()) | ||||
| @@ -80,21 +125,12 @@ 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( | ||||
|         appsProvider.saveApps([ | ||||
|           App( | ||||
|               'imranr98_obtainium_${GitHub().host}', | ||||
|               'https://github.com/ImranR98/Obtainium', | ||||
|               'ImranR98', | ||||
| @@ -102,7 +138,24 @@ class MyApp extends StatelessWidget { | ||||
|               currentReleaseTag, | ||||
|               currentReleaseTag, | ||||
|               [], | ||||
|             0)); | ||||
|               0, | ||||
|               ['true'], | ||||
|               null) | ||||
|         ]); | ||||
|       } | ||||
|       // Register the background update task according to the user's setting | ||||
|       if (settingsProvider.updateInterval == 0) { | ||||
|         Workmanager().cancelByUniqueName(bgUpdateCheckTaskName); | ||||
|       } else { | ||||
|         Workmanager().registerPeriodicTask( | ||||
|             bgUpdateCheckTaskName, bgUpdateCheckTaskName, | ||||
|             frequency: Duration(minutes: settingsProvider.updateInterval), | ||||
|             initialDelay: Duration(minutes: settingsProvider.updateInterval), | ||||
|             constraints: Constraints(networkType: NetworkType.connected), | ||||
|             existingWorkPolicy: ExistingWorkPolicy.keep, | ||||
|             backoffPolicy: BackoffPolicy.linear, | ||||
|             backoffPolicyDelay: | ||||
|                 const Duration(minutes: minUpdateIntervalMinutes)); | ||||
|       } | ||||
|     } | ||||
|  | ||||
|   | ||||
							
								
								
									
										51
									
								
								lib/mass_app_sources/githubstars.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								lib/mass_app_sources/githubstars.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +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 { | ||||
|   @override | ||||
|   late String name = 'GitHub Starred Repos'; | ||||
|  | ||||
|   @override | ||||
|   late List<String> requiredArgs = ['Username']; | ||||
|  | ||||
|   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 RateLimitError( | ||||
|             (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / | ||||
|                     60000000) | ||||
|                 .round()); | ||||
|       } | ||||
|  | ||||
|       throw 'Unable to find user\'s starred repos'; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<List<String>> getUrls(List<String> args) async { | ||||
|     if (args.length != requiredArgs.length) { | ||||
|       throw '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; | ||||
|   } | ||||
| } | ||||
| @@ -1,6 +1,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/pages/app.dart'; | ||||
| import 'package:obtainium/providers/apps_provider.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| @@ -16,10 +17,14 @@ class AddAppPage extends StatefulWidget { | ||||
| } | ||||
|  | ||||
| class _AddAppPageState extends State<AddAppPage> { | ||||
|   final _formKey = GlobalKey<FormState>(); | ||||
|   final urlInputController = TextEditingController(); | ||||
|   bool gettingAppInfo = false; | ||||
|  | ||||
|   String userInput = ''; | ||||
|   AppSource? pickedSource; | ||||
|   List<String> additionalData = []; | ||||
|   String customName = ''; | ||||
|   bool validAdditionalData = true; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     SourceProvider sourceProvider = SourceProvider(); | ||||
| @@ -28,56 +33,84 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|         body: CustomScrollView(slivers: <Widget>[ | ||||
|           const CustomAppBar(title: 'Add App'), | ||||
|           SliverFillRemaining( | ||||
|               hasScrollBody: false, | ||||
|               child: Center( | ||||
|                 child: Form( | ||||
|                     key: _formKey, | ||||
|                     child: Column( | ||||
|                       mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||
|                       crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                       children: [ | ||||
|                         Container(), | ||||
|                         Padding( | ||||
|             child: Padding( | ||||
|                 padding: const EdgeInsets.all(16), | ||||
|                 child: Column( | ||||
|                     crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                     children: [ | ||||
|                               TextFormField( | ||||
|                                 decoration: const InputDecoration( | ||||
|                                     hintText: | ||||
|                                         'https://github.com/Author/Project', | ||||
|                                     helperText: 'Enter the App source URL'), | ||||
|                                 controller: urlInputController, | ||||
|                                 validator: (value) { | ||||
|                                   if (value == null || | ||||
|                                       value.isEmpty || | ||||
|                                       Uri.tryParse(value) == null) { | ||||
|                                     return 'Please enter a supported source URL'; | ||||
|                       Row( | ||||
|                         children: [ | ||||
|                           Expanded( | ||||
|                               child: GeneratedForm( | ||||
|                                   items: [ | ||||
|                                     [ | ||||
|                                       GeneratedFormItem( | ||||
|                                           label: 'App Source Url', | ||||
|                                           additionalValidators: [ | ||||
|                                             (value) { | ||||
|                                               try { | ||||
|                                                 sourceProvider | ||||
|                                                     .getSource(value ?? '') | ||||
|                                                     .standardizeURL( | ||||
|                                                         preStandardizeUrl( | ||||
|                                                             value ?? '')); | ||||
|                                               } catch (e) { | ||||
|                                                 return e is String | ||||
|                                                     ? e | ||||
|                                                     : 'Error'; | ||||
|                                               } | ||||
|                                               return null; | ||||
|                                             } | ||||
|                                           ]) | ||||
|                                     ] | ||||
|                                   ], | ||||
|                                   onValueChanges: (values, valid) { | ||||
|                                     setState(() { | ||||
|                                       userInput = values[0]; | ||||
|                                       var source = valid | ||||
|                                           ? sourceProvider.getSource(userInput) | ||||
|                                           : null; | ||||
|                                       if (pickedSource != source) { | ||||
|                                         pickedSource = source; | ||||
|                                         additionalData = source != null | ||||
|                                             ? source.additionalDataDefaults | ||||
|                                             : []; | ||||
|                                         validAdditionalData = source != null | ||||
|                                             ? sourceProvider | ||||
|                                                 .doesSourceHaveRequiredAdditionalData( | ||||
|                                                     source) | ||||
|                                             : true; | ||||
|                                         if (source == null) { | ||||
|                                           customName = ''; | ||||
|                                         } | ||||
|                                       } | ||||
|                                     }); | ||||
|                                   }, | ||||
|                                   defaultValues: const [])), | ||||
|                           const SizedBox( | ||||
|                             width: 16, | ||||
|                           ), | ||||
|                               Padding( | ||||
|                                 padding: | ||||
|                                     const EdgeInsets.symmetric(vertical: 16.0), | ||||
|                                 child: ElevatedButton( | ||||
|                                   onPressed: gettingAppInfo | ||||
|                           ElevatedButton( | ||||
|                               onPressed: gettingAppInfo || | ||||
|                                       pickedSource == null || | ||||
|                                       (pickedSource!.additionalDataFormItems | ||||
|                                               .isNotEmpty && | ||||
|                                           !validAdditionalData) | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       HapticFeedback.selectionClick(); | ||||
|                                           if (_formKey.currentState! | ||||
|                                               .validate()) { | ||||
|                                       setState(() { | ||||
|                                         gettingAppInfo = true; | ||||
|                                       }); | ||||
|                                       sourceProvider | ||||
|                                                 .getApp(urlInputController | ||||
|                                                     .value.text) | ||||
|                                           .getApp(pickedSource!, userInput, | ||||
|                                               additionalData, | ||||
|                                               customName: customName) | ||||
|                                           .then((app) { | ||||
|                                         var appsProvider = | ||||
|                                             context.read<AppsProvider>(); | ||||
|                                               var settingsProvider = context | ||||
|                                                   .read<SettingsProvider>(); | ||||
|                                         var settingsProvider = | ||||
|                                             context.read<SettingsProvider>(); | ||||
|                                         if (appsProvider.apps | ||||
|                                             .containsKey(app.id)) { | ||||
|                                           throw 'App already added'; | ||||
| @@ -86,45 +119,89 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                                             .getInstallPermission() | ||||
|                                             .then((_) { | ||||
|                                           appsProvider | ||||
|                                                     .saveApp(app) | ||||
|                                                     .then((_) { | ||||
|                                                   urlInputController.clear(); | ||||
|                                               .saveApps([app]).then((_) { | ||||
|                                             Navigator.push( | ||||
|                                                 context, | ||||
|                                                 MaterialPageRoute( | ||||
|                                                     builder: (context) => | ||||
|                                                         AppPage( | ||||
|                                                                   appId: | ||||
|                                                                       app.id))); | ||||
|                                                             appId: app.id))); | ||||
|                                           }); | ||||
|                                         }); | ||||
|                                       }).catchError((e) { | ||||
|                                         ScaffoldMessenger.of(context) | ||||
|                                             .showSnackBar( | ||||
|                                                 SnackBar( | ||||
|                                                     content: | ||||
|                                                         Text(e.toString())), | ||||
|                                           SnackBar(content: Text(e.toString())), | ||||
|                                         ); | ||||
|                                       }).whenComplete(() { | ||||
|                                         setState(() { | ||||
|                                           gettingAppInfo = false; | ||||
|                                         }); | ||||
|                                       }); | ||||
|                                           } | ||||
|                                     }, | ||||
|                                   child: const Text('Add'), | ||||
|                                 ), | ||||
|                               ), | ||||
|                               child: const Text('Add')) | ||||
|                         ], | ||||
|                       ), | ||||
|                         ), | ||||
|                       if (pickedSource != null) | ||||
|                         Column( | ||||
|                             crossAxisAlignment: CrossAxisAlignment.center, | ||||
|                           crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                           children: [ | ||||
|                             const Divider( | ||||
|                               height: 64, | ||||
|                             ), | ||||
|                             Text( | ||||
|                                 'Additional Options for ${pickedSource?.runtimeType}', | ||||
|                                 style: TextStyle( | ||||
|                                     color: | ||||
|                                         Theme.of(context).colorScheme.primary)), | ||||
|                             const SizedBox( | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             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, | ||||
|                               ), | ||||
|                             if (pickedSource != null) | ||||
|                               GeneratedForm( | ||||
|                                   items: [ | ||||
|                                     [ | ||||
|                                       GeneratedFormItem( | ||||
|                                           label: 'Custom App Name', | ||||
|                                           required: false) | ||||
|                                     ] | ||||
|                                   ], | ||||
|                                   onValueChanges: (values, valid) { | ||||
|                                     setState(() { | ||||
|                                       customName = values[0]; | ||||
|                                     }); | ||||
|                                   }, | ||||
|                                   defaultValues: [customName]) | ||||
|                           ], | ||||
|                         ) | ||||
|                       else | ||||
|                         Expanded( | ||||
|                             child: Column( | ||||
|                                 crossAxisAlignment: CrossAxisAlignment.center, | ||||
|                                 mainAxisAlignment: MainAxisAlignment.center, | ||||
|                                 children: [ | ||||
|                               // const SizedBox( | ||||
|                               //   height: 48, | ||||
|                               // ), | ||||
|                               const Text( | ||||
|                                 'Supported Sources:', | ||||
|                                 // style: TextStyle(fontWeight: FontWeight.bold), | ||||
|                                 // style: Theme.of(context).textTheme.bodySmall, | ||||
|                               ), | ||||
|                               const SizedBox( | ||||
|                                 height: 8, | ||||
| @@ -145,14 +222,9 @@ class _AddAppPageState extends State<AddAppPage> { | ||||
|                                             fontStyle: FontStyle.italic), | ||||
|                                       ))) | ||||
|                                   .toList() | ||||
|                             ]), | ||||
|                         if (gettingAppInfo) | ||||
|                           const LinearProgressIndicator() | ||||
|                         else | ||||
|                           Container(), | ||||
|                       ], | ||||
|                     )), | ||||
|               )) | ||||
|                             ])), | ||||
|                     ])), | ||||
|           ) | ||||
|         ])); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -1,8 +1,10 @@ | ||||
| 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/components/generated_form_modal.dart'; | ||||
| import 'package:obtainium/providers/apps_provider.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| import 'package:obtainium/providers/source_provider.dart'; | ||||
| import 'package:url_launcher/url_launcher_string.dart'; | ||||
| import 'package:webview_flutter/webview_flutter.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| @@ -21,21 +23,29 @@ class _AppPageState extends State<AppPage> { | ||||
|   Widget build(BuildContext context) { | ||||
|     var appsProvider = context.watch<AppsProvider>(); | ||||
|     var settingsProvider = context.watch<SettingsProvider>(); | ||||
|     var sourceProvider = SourceProvider(); | ||||
|     AppInMemory? app = appsProvider.apps[widget.appId]; | ||||
|     if (app?.app.installedVersion != null) { | ||||
|       appsProvider.getUpdate(app!.app.id); | ||||
|     var source = app != null ? sourceProvider.getSource(app.app.url) : null; | ||||
|     if (!appsProvider.areDownloadsRunning() && app != null) { | ||||
|       appsProvider.getUpdate(app.app.id).catchError((e) { | ||||
|         ScaffoldMessenger.of(context).showSnackBar( | ||||
|           SnackBar(content: Text(e.toString())), | ||||
|         ); | ||||
|       }); | ||||
|     } | ||||
|     return Scaffold( | ||||
|       appBar: settingsProvider.showAppWebpage ? AppBar() : null, | ||||
|       backgroundColor: Theme.of(context).colorScheme.surface, | ||||
|       body: CustomScrollView(slivers: <Widget>[ | ||||
|         CustomAppBar(title: '${app?.app.name}'), | ||||
|         SliverFillRemaining( | ||||
|       body: RefreshIndicator( | ||||
|           child: settingsProvider.showAppWebpage | ||||
|               ? WebView( | ||||
|                   initialUrl: app?.app.url, | ||||
|                   javascriptMode: JavascriptMode.unrestricted, | ||||
|                 ) | ||||
|               : Column( | ||||
|               : CustomScrollView( | ||||
|                   slivers: [ | ||||
|                     SliverFillRemaining( | ||||
|                         child: Column( | ||||
|                       mainAxisAlignment: MainAxisAlignment.center, | ||||
|                       crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                       children: [ | ||||
| @@ -80,10 +90,30 @@ class _AppPageState extends State<AppPage> { | ||||
|                           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), | ||||
|                         ) | ||||
|                       ], | ||||
|                     )), | ||||
|                   ], | ||||
|                 ), | ||||
|         ), | ||||
|       ]), | ||||
|           onRefresh: () async { | ||||
|             if (app != null) { | ||||
|               try { | ||||
|                 await appsProvider.getUpdate(app.app.id); | ||||
|               } catch (e) { | ||||
|                 ScaffoldMessenger.of(context).showSnackBar( | ||||
|                   SnackBar(content: Text(e.toString())), | ||||
|                 ); | ||||
|               } | ||||
|             } | ||||
|           }), | ||||
|       bottomSheet: Padding( | ||||
|           padding: EdgeInsets.fromLTRB( | ||||
|               0, 0, 0, MediaQuery.of(context).padding.bottom), | ||||
| @@ -97,7 +127,9 @@ class _AppPageState extends State<AppPage> { | ||||
|                       children: [ | ||||
|                         if (app?.app.installedVersion != app?.app.latestVersion) | ||||
|                           IconButton( | ||||
|                               onPressed: () { | ||||
|                               onPressed: app?.downloadProgress != null | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       showDialog( | ||||
|                                           context: context, | ||||
|                                           builder: (BuildContext ctx) { | ||||
| @@ -107,20 +139,25 @@ class _AppPageState extends State<AppPage> { | ||||
|                                               actions: [ | ||||
|                                                 TextButton( | ||||
|                                                     onPressed: () { | ||||
|                                                 Navigator.of(context).pop(); | ||||
|                                                       Navigator.of(context) | ||||
|                                                           .pop(); | ||||
|                                                     }, | ||||
|                                                     child: const Text('No')), | ||||
|                                                 TextButton( | ||||
|                                                     onPressed: () { | ||||
|                                                 HapticFeedback.selectionClick(); | ||||
|                                                       HapticFeedback | ||||
|                                                           .selectionClick(); | ||||
|                                                       var updatedApp = app?.app; | ||||
|                                                       if (updatedApp != null) { | ||||
|                                                   updatedApp.installedVersion = | ||||
|                                                       updatedApp.latestVersion; | ||||
|                                                   appsProvider | ||||
|                                                       .saveApp(updatedApp); | ||||
|                                                         updatedApp | ||||
|                                                                 .installedVersion = | ||||
|                                                             updatedApp | ||||
|                                                                 .latestVersion; | ||||
|                                                         appsProvider.saveApps( | ||||
|                                                             [updatedApp]); | ||||
|                                                       } | ||||
|                                                 Navigator.of(context).pop(); | ||||
|                                                       Navigator.of(context) | ||||
|                                                           .pop(); | ||||
|                                                     }, | ||||
|                                                     child: const Text( | ||||
|                                                         'Yes, Mark as Installed')) | ||||
| @@ -132,29 +169,36 @@ class _AppPageState extends State<AppPage> { | ||||
|                               icon: const Icon(Icons.done)) | ||||
|                         else | ||||
|                           IconButton( | ||||
|                               onPressed: () { | ||||
|                               onPressed: app?.downloadProgress != null | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       showDialog( | ||||
|                                           context: context, | ||||
|                                           builder: (BuildContext ctx) { | ||||
|                                             return AlertDialog( | ||||
|                                         title: const Text('App Not Installed?'), | ||||
|                                               title: const Text( | ||||
|                                                   'App Not Installed?'), | ||||
|                                               actions: [ | ||||
|                                                 TextButton( | ||||
|                                                     onPressed: () { | ||||
|                                                 Navigator.of(context).pop(); | ||||
|                                                       Navigator.of(context) | ||||
|                                                           .pop(); | ||||
|                                                     }, | ||||
|                                                     child: const Text('No')), | ||||
|                                                 TextButton( | ||||
|                                                     onPressed: () { | ||||
|                                                 HapticFeedback.selectionClick(); | ||||
|                                                       HapticFeedback | ||||
|                                                           .selectionClick(); | ||||
|                                                       var updatedApp = app?.app; | ||||
|                                                       if (updatedApp != null) { | ||||
|                                                   updatedApp.installedVersion = | ||||
|                                                         updatedApp | ||||
|                                                                 .installedVersion = | ||||
|                                                             null; | ||||
|                                                   appsProvider | ||||
|                                                       .saveApp(updatedApp); | ||||
|                                                         appsProvider.saveApps( | ||||
|                                                             [updatedApp]); | ||||
|                                                       } | ||||
|                                                 Navigator.of(context).pop(); | ||||
|                                                       Navigator.of(context) | ||||
|                                                           .pop(); | ||||
|                                                     }, | ||||
|                                                     child: const Text( | ||||
|                                                         'Yes, Mark as Not Installed')) | ||||
| @@ -164,6 +208,48 @@ class _AppPageState extends State<AppPage> { | ||||
|                                     }, | ||||
|                               tooltip: 'Mark as Not Installed', | ||||
|                               icon: const Icon(Icons.no_cell_outlined)), | ||||
|                         if (source != null && | ||||
|                             source.additionalDataFormItems.isNotEmpty) | ||||
|                           IconButton( | ||||
|                               onPressed: app?.downloadProgress != null | ||||
|                                   ? null | ||||
|                                   : () { | ||||
|                                       showDialog<List<String>>( | ||||
|                                           context: context, | ||||
|                                           builder: (BuildContext ctx) { | ||||
|                                             return GeneratedFormModal( | ||||
|                                                 title: 'Additional Options', | ||||
|                                                 items: [ | ||||
|                                                   ...source | ||||
|                                                       .additionalDataFormItems, | ||||
|                                                   [ | ||||
|                                                     GeneratedFormItem( | ||||
|                                                         label: 'App Name', | ||||
|                                                         required: true) | ||||
|                                                   ] | ||||
|                                                 ], | ||||
|                                                 defaultValues: app != null | ||||
|                                                     ? [ | ||||
|                                                         ...app | ||||
|                                                             .app.additionalData, | ||||
|                                                         app.app.name | ||||
|                                                       ] | ||||
|                                                     : [ | ||||
|                                                         ...source | ||||
|                                                             .additionalDataDefaults | ||||
|                                                       ]); | ||||
|                                           }).then((values) { | ||||
|                                         if (app != null && values != null) { | ||||
|                                           var changedApp = app.app; | ||||
|                                           var name = values.removeLast(); | ||||
|                                           changedApp.name = name; | ||||
|                                           changedApp.additionalData = values; | ||||
|                                           appsProvider.saveApps([changedApp]); | ||||
|                                         } | ||||
|                                       }); | ||||
|                                     }, | ||||
|                               tooltip: 'Additional Options', | ||||
|                               icon: const Icon(Icons.settings)), | ||||
|                         const SizedBox(width: 16.0), | ||||
|                         Expanded( | ||||
|                             child: ElevatedButton( | ||||
| @@ -178,7 +264,7 @@ class _AppPageState extends State<AppPage> { | ||||
|                                             .downloadAndInstallLatestApp( | ||||
|                                                 [app!.app.id], | ||||
|                                                 context).then((res) { | ||||
|                                           if (res && mounted) { | ||||
|                                           if (res.isNotEmpty && mounted) { | ||||
|                                             Navigator.of(context).pop(); | ||||
|                                           } | ||||
|                                         }); | ||||
| @@ -204,9 +290,8 @@ class _AppPageState extends State<AppPage> { | ||||
|                                                 onPressed: () { | ||||
|                                                   HapticFeedback | ||||
|                                                       .selectionClick(); | ||||
|                                                   appsProvider | ||||
|                                                       .removeApp(app!.app.id) | ||||
|                                                       .then((_) { | ||||
|                                                   appsProvider.removeApps( | ||||
|                                                       [app!.app.id]).then((_) { | ||||
|                                                     int count = 0; | ||||
|                                                     Navigator.of(context) | ||||
|                                                         .popUntil((_) => | ||||
|   | ||||
| @@ -1,25 +1,105 @@ | ||||
| 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/components/generated_form_modal.dart'; | ||||
| import 'package:obtainium/pages/app.dart'; | ||||
| import 'package:obtainium/providers/apps_provider.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:share_plus/share_plus.dart'; | ||||
|  | ||||
| class AppsPage extends StatefulWidget { | ||||
|   const AppsPage({super.key}); | ||||
|  | ||||
|   @override | ||||
|   State<AppsPage> createState() => _AppsPageState(); | ||||
|   State<AppsPage> createState() => AppsPageState(); | ||||
| } | ||||
|  | ||||
| class AppsPageState extends State<AppsPage> { | ||||
|   AppsFilter? filter; | ||||
|   var updatesOnlyFilter = | ||||
|       AppsFilter(includeUptodate: false, includeNonInstalled: false); | ||||
|   Set<String> selectedIds = {}; | ||||
|  | ||||
|   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); | ||||
|         } | ||||
|       }); | ||||
|     } | ||||
|   } | ||||
|  | ||||
| class _AppsPageState extends State<AppsPage> { | ||||
|   @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!.includeUptodate)) { | ||||
|           return false; | ||||
|         } | ||||
|         if (app.app.installedVersion == null && | ||||
|             !(filter!.includeNonInstalled)) { | ||||
|           return false; | ||||
|         } | ||||
|         if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) { | ||||
|           return true; | ||||
|         } | ||||
|         List<String> nameTokens = filter!.nameFilter | ||||
|             .split(' ') | ||||
|             .where((element) => element.trim().isNotEmpty) | ||||
|             .toList(); | ||||
|         List<String> authorTokens = filter!.authorFilter | ||||
|             .split(' ') | ||||
|             .where((element) => element.trim().isNotEmpty) | ||||
|             .toList(); | ||||
|  | ||||
|         for (var t in nameTokens) { | ||||
|           if (!app.app.name.toLowerCase().contains(t.toLowerCase())) { | ||||
|             return false; | ||||
|           } | ||||
|         } | ||||
|         for (var t in authorTokens) { | ||||
|           if (!app.app.author.toLowerCase().contains(t.toLowerCase())) { | ||||
|             return false; | ||||
|           } | ||||
|         } | ||||
|         return true; | ||||
|       }).toList(); | ||||
|     } | ||||
|  | ||||
|     sortedApps.sort((a, b) { | ||||
|       int result = 0; | ||||
|       if (settingsProvider.sortColumn == SortColumnSettings.authorName) { | ||||
| @@ -31,51 +111,61 @@ class _AppsPageState extends State<AppsPage> { | ||||
|       } | ||||
|       return result; | ||||
|     }); | ||||
|  | ||||
|     if (settingsProvider.sortOrder == SortOrderSettings.ascending) { | ||||
|       sortedApps = sortedApps.reversed.toList(); | ||||
|     } | ||||
|  | ||||
|     var existingUpdateIdsAllOrSelected = appsProvider | ||||
|         .getExistingUpdates(installedOnly: true) | ||||
|         .where((element) => selectedIds.isEmpty | ||||
|             ? sortedApps.where((a) => a.app.id == element).isNotEmpty | ||||
|             : selectedIds.contains(element)) | ||||
|         .toList(); | ||||
|     var newInstallIdsAllOrSelected = appsProvider | ||||
|         .getExistingUpdates(nonInstalledOnly: true) | ||||
|         .where((element) => selectedIds.isEmpty | ||||
|             ? sortedApps.where((a) => a.app.id == element).isNotEmpty | ||||
|             : selectedIds.contains(element)) | ||||
|         .toList(); | ||||
|  | ||||
|     return Scaffold( | ||||
|       backgroundColor: Theme.of(context).colorScheme.surface, | ||||
|         floatingActionButton: existingUpdateAppIds.isEmpty | ||||
|             ? null | ||||
|             : 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')), | ||||
|       body: RefreshIndicator( | ||||
|           onRefresh: () { | ||||
|             HapticFeedback.lightImpact(); | ||||
|               return appsProvider.checkUpdates(); | ||||
|             return appsProvider.checkUpdates().catchError((e) { | ||||
|               ScaffoldMessenger.of(context).showSnackBar( | ||||
|                 SnackBar(content: Text(e.toString())), | ||||
|               ); | ||||
|             }); | ||||
|           }, | ||||
|           child: CustomScrollView(slivers: <Widget>[ | ||||
|             const CustomAppBar(title: 'Apps'), | ||||
|               if (appsProvider.loadingApps || appsProvider.apps.isEmpty) | ||||
|             if (appsProvider.loadingApps || sortedApps.isEmpty) | ||||
|               SliverFillRemaining( | ||||
|                   child: Center( | ||||
|                       child: appsProvider.loadingApps | ||||
|                           ? const CircularProgressIndicator() | ||||
|                           : Text( | ||||
|                                 'No Apps', | ||||
|                                 style: | ||||
|                                     Theme.of(context).textTheme.headlineMedium, | ||||
|                               appsProvider.apps.isEmpty | ||||
|                                   ? 'No Apps' | ||||
|                                   : 'No Apps for Filter', | ||||
|                               style: Theme.of(context).textTheme.headlineMedium, | ||||
|                               textAlign: TextAlign.center, | ||||
|                             ))), | ||||
|             SliverList( | ||||
|                 delegate: SliverChildBuilderDelegate( | ||||
|                     (BuildContext context, int index) { | ||||
|               return ListTile( | ||||
|                   title: Text( | ||||
|                       '${sortedApps[index].app.author}/${sortedApps[index].app.name}'), | ||||
|                   subtitle: Text(sortedApps[index].app.installedVersion ?? | ||||
|                       'Not Installed'), | ||||
|                 selectedTileColor: | ||||
|                     Theme.of(context).colorScheme.primary.withOpacity(0.1), | ||||
|                 selected: selectedIds.contains(sortedApps[index].app.id), | ||||
|                 onLongPress: () { | ||||
|                   toggleAppSelected(sortedApps[index].app.id); | ||||
|                 }, | ||||
|                 title: Text(sortedApps[index].app.name), | ||||
|                 subtitle: Text('By ${sortedApps[index].app.author}'), | ||||
|                 trailing: sortedApps[index].downloadProgress != null | ||||
|                     ? Text( | ||||
|                         'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%') | ||||
| @@ -83,17 +173,263 @@ class _AppsPageState extends State<AppsPage> { | ||||
|                             sortedApps[index].app.installedVersion != | ||||
|                                 sortedApps[index].app.latestVersion | ||||
|                         ? const Text('Update Available') | ||||
|                           : null), | ||||
|                         : Text(sortedApps[index].app.installedVersion ?? | ||||
|                             'Not Installed')), | ||||
|                 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)) | ||||
|             ]))); | ||||
|           ])), | ||||
|       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: const ['true', 'true'], | ||||
|                                     initValid: true, | ||||
|                                   ); | ||||
|                                 }).then((values) { | ||||
|                               if (values != null) { | ||||
|                                 bool shouldInstallUpdates = | ||||
|                                     values.length < 2 || values[0] == 'true'; | ||||
|                                 bool shouldInstallNew = | ||||
|                                     values.length < 2 || values[1] == 'true'; | ||||
|                                 settingsProvider | ||||
|                                     .getInstallPermission() | ||||
|                                     .then((_) { | ||||
|                                   List<String> toInstall = []; | ||||
|                                   if (shouldInstallUpdates) { | ||||
|                                     toInstall | ||||
|                                         .addAll(existingUpdateIdsAllOrSelected); | ||||
|                                   } | ||||
|                                   if (shouldInstallNew) { | ||||
|                                     toInstall | ||||
|                                         .addAll(newInstallIdsAllOrSelected); | ||||
|                                   } | ||||
|                                   appsProvider.downloadAndInstallLatestApp( | ||||
|                                       toInstall, context); | ||||
|                                 }); | ||||
|                               } | ||||
|                             }); | ||||
|                           }, | ||||
|                     tooltip: | ||||
|                         'Install/Update${selectedIds.isEmpty ? ' ' : ' Selected '}Apps', | ||||
|                     icon: const Icon( | ||||
|                       Icons.file_download_outlined, | ||||
|                     )), | ||||
|                 selectedIds.isEmpty | ||||
|                     ? const SizedBox() | ||||
|                     : IconButton( | ||||
|                         visualDensity: VisualDensity.compact, | ||||
|                         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: 'Selected App URLs from Obtainium'); | ||||
|                         }, | ||||
|                         tooltip: 'Share Selected App URLs', | ||||
|                         icon: const Icon(Icons.share), | ||||
|                       ), | ||||
|               ], | ||||
|             )), | ||||
|             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 includeUptodate; | ||||
|   late bool includeNonInstalled; | ||||
|  | ||||
|   AppsFilter( | ||||
|       {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,10 @@ class _HomePageState extends State<HomePage> { | ||||
|             }); | ||||
|             return false; | ||||
|           } | ||||
|           return true; | ||||
|           return !(pages[0].widget.key as GlobalKey<AppsPageState>) | ||||
|               .currentState | ||||
|               ?.clearSelected(); | ||||
|           // return !appsPageKey.currentState?.clearSelected(); | ||||
|         }); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -4,6 +4,7 @@ import 'dart:io'; | ||||
| 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/components/generated_form_modal.dart'; | ||||
| import 'package:obtainium/providers/apps_provider.dart'; | ||||
| import 'package:obtainium/providers/settings_provider.dart'; | ||||
| @@ -39,14 +40,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 = | ||||
| @@ -167,9 +169,35 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                         return GeneratedFormModal( | ||||
|                                           title: 'Import from URL List', | ||||
|                                           items: [ | ||||
|                                             [ | ||||
|                                               GeneratedFormItem( | ||||
|                                                 'App URL List', true, 7) | ||||
|                                                   label: 'App URL List', | ||||
|                                                   max: 7, | ||||
|                                                   additionalValidators: [ | ||||
|                                                     (String? value) { | ||||
|                                                       if (value != null && | ||||
|                                                           value.isNotEmpty) { | ||||
|                                                         var lines = value | ||||
|                                                             .trim() | ||||
|                                                             .split('\n'); | ||||
|                                                         for (int i = 0; | ||||
|                                                             i < lines.length; | ||||
|                                                             i++) { | ||||
|                                                           try { | ||||
|                                                             sourceProvider | ||||
|                                                                 .getSource( | ||||
|                                                                     lines[i]); | ||||
|                                                           } catch (e) { | ||||
|                                                             return 'Line ${i + 1}: $e'; | ||||
|                                                           } | ||||
|                                                         } | ||||
|                                                       } | ||||
|                                                       return null; | ||||
|                                                     } | ||||
|                                                   ]) | ||||
|                                             ] | ||||
|                                           ], | ||||
|                                           defaultValues: const [], | ||||
|                                         ); | ||||
|                                       }).then((values) { | ||||
|                                     if (values != null) { | ||||
| @@ -230,38 +258,53 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                                             'Import ${source.name}', | ||||
|                                                         items: source | ||||
|                                                             .requiredArgs | ||||
|                                                               .map((e) => | ||||
|                                                             .map((e) => [ | ||||
|                                                                   GeneratedFormItem( | ||||
|                                                                       e, | ||||
|                                                                       true, | ||||
|                                                                       1)) | ||||
|                                                               .toList()); | ||||
|                                                                       label: e) | ||||
|                                                                 ]) | ||||
|                                                             .toList(), | ||||
|                                                         defaultValues: const [], | ||||
|                                                       ); | ||||
|                                                     }).then((values) { | ||||
|                                                   if (values != null) { | ||||
|                                                     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( | ||||
|                                                     source | ||||
|                                                         .getUrls(values) | ||||
|                                                         .then((urls) { | ||||
|                                                       showDialog<List<String>?>( | ||||
|                                                               context: context, | ||||
|                                                               builder: | ||||
|                                                                   (BuildContext | ||||
|                                                                       ctx) { | ||||
|                                                                 return UrlSelectionModal( | ||||
|                                                                     urls: urls); | ||||
|                                                               }) | ||||
|                                                           .then((selectedUrls) { | ||||
|                                                         if (selectedUrls != | ||||
|                                                             null) { | ||||
|                                                           addApps(selectedUrls) | ||||
|                                                               .then((errors) { | ||||
|                                                             if (errors | ||||
|                                                                 .isEmpty) { | ||||
|                                                               ScaffoldMessenger | ||||
|                                                                       .of(context) | ||||
|                                                                   .showSnackBar( | ||||
|                                                                 SnackBar( | ||||
|                                                                     content: Text( | ||||
|                                                                         'Imported ${selectedUrls.length} Apps')), | ||||
|                                                               ); | ||||
|                                                             } else { | ||||
|                                                               showDialog( | ||||
|                                                                   context: | ||||
|                                                                       context, | ||||
|                                                                   builder: | ||||
|                                                                       (BuildContext | ||||
|                                                                           ctx) { | ||||
|                                                                     return ImportErrorDialog( | ||||
|                                                                     urlsLength: urls | ||||
|                                                                         urlsLength: | ||||
|                                                                             selectedUrls | ||||
|                                                                                 .length, | ||||
|                                                                         errors: | ||||
|                                                                             errors); | ||||
| @@ -273,7 +316,18 @@ class _ImportExportPageState extends State<ImportExportPage> { | ||||
|                                                                   false; | ||||
|                                                             }); | ||||
|                                                           }); | ||||
|                                                         } else { | ||||
|                                                           setState(() { | ||||
|                                                             importInProgress = | ||||
|                                                                 false; | ||||
|                                                           }); | ||||
|                                                         } | ||||
|                                                       }); | ||||
|                                                     }).catchError((e) { | ||||
|                                                       setState(() { | ||||
|                                                         importInProgress = | ||||
|                                                             false; | ||||
|                                                       }); | ||||
|                                                       ScaffoldMessenger.of( | ||||
|                                                               context) | ||||
|                                                           .showSnackBar( | ||||
| @@ -347,3 +401,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,6 +17,7 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     SettingsProvider settingsProvider = context.watch<SettingsProvider>(); | ||||
|     SourceProvider sourceProvider = SourceProvider(); | ||||
|     if (settingsProvider.prefs == null) { | ||||
|       settingsProvider.initializeSettings(); | ||||
|     } | ||||
| @@ -22,12 +25,11 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|         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 | ||||
|                       ? Container() | ||||
|                       ? const SizedBox() | ||||
|                       : Column( | ||||
|                           crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                           children: [ | ||||
| @@ -160,7 +162,7 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|                               height: 16, | ||||
|                             ), | ||||
|                             Text( | ||||
|                               'More', | ||||
|                               'Updates', | ||||
|                               style: TextStyle( | ||||
|                                   color: Theme.of(context).colorScheme.primary), | ||||
|                             ), | ||||
| @@ -169,50 +171,89 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|                                     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'), | ||||
|                                   ), | ||||
|                                 ], | ||||
|                                 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; | ||||
|                                   } | ||||
|                                 }), | ||||
|                             const Spacer(), | ||||
|                             Row( | ||||
|                               mainAxisAlignment: MainAxisAlignment.center, | ||||
|                             const SizedBox( | ||||
|                               height: 8, | ||||
|                             ), | ||||
|                             Text( | ||||
|                               'Longer intervals recommended for large App collections', | ||||
|                               style: Theme.of(context) | ||||
|                                   .textTheme | ||||
|                                   .labelMedium! | ||||
|                                   .merge(const TextStyle( | ||||
|                                       fontStyle: FontStyle.italic)), | ||||
|                             ), | ||||
|                             const Divider( | ||||
|                               height: 48, | ||||
|                             ), | ||||
|                             Text( | ||||
|                               'Source-Specific', | ||||
|                               style: TextStyle( | ||||
|                                   color: Theme.of(context).colorScheme.primary), | ||||
|                             ), | ||||
|                             ...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(); | ||||
|                               } | ||||
|                             }), | ||||
|                           ], | ||||
|                         ))), | ||||
|           SliverToBoxAdapter( | ||||
|             child: Column( | ||||
|               children: [ | ||||
|                 const SizedBox( | ||||
|                   height: 16, | ||||
|                 ), | ||||
|                 TextButton.icon( | ||||
|                   style: ButtonStyle( | ||||
|                                     foregroundColor: | ||||
|                                         MaterialStateProperty.resolveWith< | ||||
|                                             Color>((Set<MaterialState> states) { | ||||
|                     foregroundColor: MaterialStateProperty.resolveWith<Color>( | ||||
|                         (Set<MaterialState> states) { | ||||
|                       return Colors.grey; | ||||
|                     }), | ||||
|                   ), | ||||
| @@ -223,14 +264,15 @@ class _SettingsPageState extends State<SettingsPage> { | ||||
|                   icon: const Icon(Icons.code), | ||||
|                   label: Text( | ||||
|                     'Source', | ||||
|                                     style: | ||||
|                                         Theme.of(context).textTheme.bodySmall, | ||||
|                     style: Theme.of(context).textTheme.bodySmall, | ||||
|                   ), | ||||
|                 ), | ||||
|                 const SizedBox( | ||||
|                   height: 16, | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           ) | ||||
|                               ], | ||||
|                             ), | ||||
|                           ], | ||||
|                         ))) | ||||
|         ])); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -5,6 +5,7 @@ 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:obtainium/providers/notifications_provider.dart'; | ||||
| @@ -13,7 +14,7 @@ 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'; | ||||
| import 'package:flutter_install_app/flutter_install_app.dart'; | ||||
|  | ||||
| class AppInMemory { | ||||
|   late App app; | ||||
| @@ -96,30 +97,65 @@ class AppsProvider with ChangeNotifier { | ||||
|       .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 { | ||||
|     // TODO: This is unreliable - try to get from OS in the future | ||||
|     var osInfo = await DeviceInfoPlugin().androidInfo; | ||||
|     return app.installedVersion != null && | ||||
|         osInfo.version.sdkInt! >= 30 && | ||||
|         osInfo.version.release!.compareTo('12') >= 0; | ||||
|   } | ||||
|  | ||||
|   Future<void> askUserToReturnToForeground(BuildContext context, | ||||
|       {bool waitForFG = false}) async { | ||||
|     NotificationsProvider notificationsProvider = | ||||
|         context.read<NotificationsProvider>(); | ||||
|     if (!isForeground) { | ||||
|       await notificationsProvider.notify(completeInstallationNotification, | ||||
|           cancelExisting: true); | ||||
|       if (waitForFG) { | ||||
|         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(ApkFile file) async { | ||||
|     await AppInstaller.installApk(file.file.path, actionRequired: false); | ||||
|     apps[file.appId]!.app.installedVersion = | ||||
|         apps[file.appId]!.app.latestVersion; | ||||
|     await saveApps([apps[file.appId]!.app]); | ||||
|   } | ||||
|  | ||||
|   // 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>> downloadAndInstallLatestApp( | ||||
|       List<String> appIds, BuildContext? context) async { | ||||
|     Map<String, String> appsToInstall = {}; | ||||
|     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 | ||||
|  | ||||
|       // If the App has more than one APK, the user should pick one (if context provided) | ||||
|       String? apkUrl = apps[id]!.app.apkUrls[apps[id]!.app.preferredApkIndex]; | ||||
|       if (apps[id]!.app.apkUrls.length > 1) { | ||||
|       if (apps[id]!.app.apkUrls.length > 1 && context != null) { | ||||
|         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 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(apps[id]!.app.url).origin) { | ||||
|           Uri.parse(apkUrl).origin != Uri.parse(apps[id]!.app.url).origin && | ||||
|           context != null) { | ||||
|         if (await showDialog( | ||||
|                 context: context, | ||||
|                 builder: (BuildContext ctx) { | ||||
| @@ -134,35 +170,45 @@ class AppsProvider with ChangeNotifier { | ||||
|         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]); | ||||
|         } | ||||
|         if (context != null || | ||||
|             (await canInstallSilently(apps[id]!.app) && | ||||
|                 apps[id]!.app.apkUrls.length == 1)) { | ||||
|           appsToInstall.putIfAbsent(id, () => apkUrl!); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     List<ApkFile> downloadedFiles = await Future.wait(appsToInstall.entries | ||||
|         .map((entry) => downloadApp(entry.value, entry.key))); | ||||
|  | ||||
|     if (!isForeground) { | ||||
|       await notificationsProvider.notify(completeInstallationNotification, | ||||
|           cancelExisting: true); | ||||
|       await FGBGEvents.stream.first == FGBGType.foreground; | ||||
|       await notificationsProvider.cancel(completeInstallationNotification.id); | ||||
|       // We need to wait for the App to come to the foreground to install it | ||||
|       // Can't try to call install plugin in a background isolate (may not have worked anyways) because of: | ||||
|       // https://github.com/flutter/flutter/issues/13937 | ||||
|     } | ||||
|  | ||||
|     // 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 | ||||
|     List<ApkFile> silentUpdates = []; | ||||
|     List<ApkFile> regularInstalls = []; | ||||
|     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); | ||||
|       bool willBeSilent = await canInstallSilently(apps[f.appId]!.app); | ||||
|       if (willBeSilent) { | ||||
|         silentUpdates.add(f); | ||||
|       } else { | ||||
|         regularInstalls.add(f); | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     return downloadedFiles.isNotEmpty; | ||||
|     for (var u in silentUpdates) { | ||||
|       await installApk(u); | ||||
|     } | ||||
|  | ||||
|     if (context != null) { | ||||
|       if (regularInstalls.isNotEmpty) { | ||||
|         // ignore: use_build_context_synchronously | ||||
|         await askUserToReturnToForeground(context); | ||||
|       } | ||||
|       for (var i in regularInstalls) { | ||||
|         await installApk(i); | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     return downloadedFiles.map((e) => e.appId).toList(); | ||||
|   } | ||||
|  | ||||
|   Future<Directory> getAppsDir() async { | ||||
| @@ -200,15 +246,19 @@ class AppsProvider with ChangeNotifier { | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   Future<void> saveApp(App app) async { | ||||
|   Future<void> saveApps(List<App> apps) async { | ||||
|     for (var app in apps) { | ||||
|       File('${(await getAppsDir()).path}/${app.id}.json') | ||||
|           .writeAsStringSync(jsonEncode(app.toJson())); | ||||
|     apps.update(app.id, (value) => AppInMemory(app, value.downloadProgress), | ||||
|       this.apps.update( | ||||
|           app.id, (value) => AppInMemory(app, value.downloadProgress), | ||||
|           ifAbsent: () => AppInMemory(app, null)); | ||||
|     } | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   Future<void> removeApp(String appId) async { | ||||
|   Future<void> removeApps(List<String> appIds) async { | ||||
|     for (var appId in appIds) { | ||||
|       File file = File('${(await getAppsDir()).path}/$appId.json'); | ||||
|       if (file.existsSync()) { | ||||
|         file.deleteSync(); | ||||
| @@ -216,8 +266,11 @@ class AppsProvider with ChangeNotifier { | ||||
|       if (apps.containsKey(appId)) { | ||||
|         apps.remove(appId); | ||||
|       } | ||||
|     } | ||||
|     if (appIds.isNotEmpty) { | ||||
|       notifyListeners(); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   bool checkAppObjectForUpdate(App app) { | ||||
|     if (!apps.containsKey(app.id)) { | ||||
| @@ -228,24 +281,39 @@ class AppsProvider with ChangeNotifier { | ||||
|  | ||||
|   Future<App?> getUpdate(String appId) async { | ||||
|     App? currentApp = apps[appId]!.app; | ||||
|     App newApp = await SourceProvider().getApp(currentApp.url); | ||||
|     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); | ||||
|       await saveApps([newApp]); | ||||
|       return newApp; | ||||
|     } | ||||
|     return null; | ||||
|   } | ||||
|  | ||||
|   Future<List<App>> checkUpdates() async { | ||||
|   Future<List<App>> checkUpdates({DateTime? ignoreAfter}) async { | ||||
|     List<App> updates = []; | ||||
|     if (!gettingUpdates) { | ||||
|       gettingUpdates = true; | ||||
|  | ||||
|       List<String> appIds = apps.keys.toList(); | ||||
|       if (ignoreAfter != null) { | ||||
|         appIds = appIds | ||||
|             .where((id) => | ||||
|                 apps[id]!.app.lastUpdateCheck != null && | ||||
|                 apps[id]!.app.lastUpdateCheck!.isBefore(ignoreAfter)) | ||||
|             .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 = await getUpdate(appIds[i]); | ||||
|         if (newApp != null) { | ||||
| @@ -257,15 +325,22 @@ class AppsProvider with ChangeNotifier { | ||||
|     return updates; | ||||
|   } | ||||
|  | ||||
|   List<String> getExistingUpdates() { | ||||
|   List<String> getExistingUpdates( | ||||
|       {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) { | ||||
|       if (app.installedVersion != app.latestVersion && | ||||
|           (!installedOnly || !nonInstalledOnly)) { | ||||
|         if ((app.installedVersion == null && | ||||
|                 (nonInstalledOnly || !installedOnly) || | ||||
|             (app.installedVersion != null && | ||||
|                 (installedOnly || !nonInstalledOnly)))) { | ||||
|           updateAppIds.add(app.id); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     return updateAppIds; | ||||
|   } | ||||
|  | ||||
| @@ -291,7 +366,7 @@ class AppsProvider with ChangeNotifier { | ||||
|     for (App a in importedApps) { | ||||
|       a.installedVersion = | ||||
|           apps.containsKey(a.id) ? apps[a]?.app.installedVersion : null; | ||||
|       await saveApp(a); | ||||
|       await saveApps([a]); | ||||
|     } | ||||
|     notifyListeners(); | ||||
|     return importedApps.length; | ||||
|   | ||||
| @@ -33,6 +33,22 @@ class UpdateNotification extends ObtainiumNotification { | ||||
|   } | ||||
| } | ||||
|  | ||||
| class SilentUpdateNotification extends ObtainiumNotification { | ||||
|   SilentUpdateNotification(List<App> updates) | ||||
|       : super( | ||||
|             3, | ||||
|             'Apps Updated', | ||||
|             '', | ||||
|             'APPS_UPDATED', | ||||
|             'Apps Updated', | ||||
|             'Notifies the user that updates to one or more Apps were applied in the background', | ||||
|             Importance.defaultImportance) { | ||||
|     message = updates.length == 1 | ||||
|         ? '${updates[0].name} was updated to ${updates[0].latestVersion}.' | ||||
|         : '${(updates.length == 2 ? '${updates[0].name} and ${updates[1].name}' : '${updates[0].name} and ${updates.length - 1} more apps')} were updated.'; | ||||
|   } | ||||
| } | ||||
|  | ||||
| class ErrorCheckingUpdatesNotification extends ObtainiumNotification { | ||||
|   ErrorCheckingUpdatesNotification(String error) | ||||
|       : super( | ||||
|   | ||||
| @@ -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') ?? 180; | ||||
|     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) { | ||||
| @@ -95,11 +115,19 @@ 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(); | ||||
|   } | ||||
|  | ||||
|   String? getSettingString(String settingId) { | ||||
|     return prefs?.getString(settingId); | ||||
|   } | ||||
|  | ||||
|   void setSettingString(String settingId, String value) { | ||||
|     prefs?.setString(settingId, value); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -4,8 +4,15 @@ | ||||
| import 'dart:convert'; | ||||
|  | ||||
| import 'package:html/dom.dart'; | ||||
| import 'package:http/http.dart'; | ||||
| import 'package:html/parser.dart'; | ||||
| import 'package:obtainium/app_sources/fdroid.dart'; | ||||
| import 'package:obtainium/app_sources/github.dart'; | ||||
| 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/mass_app_sources/githubstars.dart'; | ||||
|  | ||||
| class AppNames { | ||||
|   late String author; | ||||
| @@ -30,8 +37,19 @@ class App { | ||||
|   late String latestVersion; | ||||
|   List<String> apkUrls = []; | ||||
|   late int preferredApkIndex; | ||||
|   App(this.id, this.url, this.author, this.name, this.installedVersion, | ||||
|       this.latestVersion, this.apkUrls, this.preferredApkIndex); | ||||
|   late List<String> additionalData; | ||||
|   late DateTime? lastUpdateCheck; | ||||
|   App( | ||||
|       this.id, | ||||
|       this.url, | ||||
|       this.author, | ||||
|       this.name, | ||||
|       this.installedVersion, | ||||
|       this.latestVersion, | ||||
|       this.apkUrls, | ||||
|       this.preferredApkIndex, | ||||
|       this.additionalData, | ||||
|       this.lastUpdateCheck); | ||||
|  | ||||
|   @override | ||||
|   String toString() { | ||||
| @@ -47,11 +65,16 @@ class App { | ||||
|           ? null | ||||
|           : json['installedVersion'] as String, | ||||
|       json['latestVersion'] as String, | ||||
|         List<String>.from(jsonDecode(json['apkUrls'])), | ||||
|         json['preferredApkIndex'] == null | ||||
|             ? 0 | ||||
|             : json['preferredApkIndex'] as int, | ||||
|       ); | ||||
|       json['apkUrls'] == null | ||||
|           ? [] | ||||
|           : List<String>.from(jsonDecode(json['apkUrls'])), | ||||
|       json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int, | ||||
|       json['additionalData'] == null | ||||
|           ? SourceProvider().getSource(json['url']).additionalDataDefaults | ||||
|           : List<String>.from(jsonDecode(json['additionalData'])), | ||||
|       json['lastUpdateCheck'] == null | ||||
|           ? null | ||||
|           : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck'])); | ||||
|  | ||||
|   Map<String, dynamic> toJson() => { | ||||
|         'id': id, | ||||
| @@ -61,20 +84,36 @@ class App { | ||||
|         'installedVersion': installedVersion, | ||||
|         'latestVersion': latestVersion, | ||||
|         'apkUrls': jsonEncode(apkUrls), | ||||
|         'preferredApkIndex': preferredApkIndex | ||||
|         'preferredApkIndex': preferredApkIndex, | ||||
|         'additionalData': jsonEncode(additionalData), | ||||
|         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch | ||||
|       }; | ||||
| } | ||||
|  | ||||
| escapeRegEx(String s) { | ||||
|   return s.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) { | ||||
|     return "\\${x[0]}"; | ||||
|     return '\\${x[0]}'; | ||||
|   }); | ||||
| } | ||||
|  | ||||
| const String couldNotFindReleases = 'Unable to fetch release info'; | ||||
| preStandardizeUrl(String url) { | ||||
|   if (url.toLowerCase().indexOf('http://') != 0 && | ||||
|       url.toLowerCase().indexOf('https://') != 0) { | ||||
|     url = 'https://$url'; | ||||
|   } | ||||
|   if (url.toLowerCase().indexOf('https://www.') == 0) { | ||||
|     url = 'https://${url.substring(12)}'; | ||||
|   } | ||||
|   return url; | ||||
| } | ||||
|  | ||||
| const String couldNotFindReleases = 'Could not find a suitable release'; | ||||
| const String couldNotFindLatestVersion = | ||||
|     'Could not determine latest release version'; | ||||
| const String notValidURL = 'Not a valid URL'; | ||||
| String notValidURL(String sourceName) { | ||||
|   return 'Not a valid $sourceName App URL'; | ||||
| } | ||||
|  | ||||
| const String noAPKFound = 'No APK found'; | ||||
|  | ||||
| List<String> getLinksFromParsedHTML( | ||||
| @@ -91,323 +130,37 @@ List<String> getLinksFromParsedHTML( | ||||
| abstract class AppSource { | ||||
|   late String host; | ||||
|   String standardizeURL(String url); | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl); | ||||
|   Future<APKDetails> getLatestAPKDetails( | ||||
|       String standardUrl, List<String> additionalData); | ||||
|   AppNames getAppNames(String standardUrl); | ||||
|   late List<List<GeneratedFormItem>> additionalDataFormItems; | ||||
|   late List<String> additionalDataDefaults; | ||||
|   late List<GeneratedFormItem> moreSourceSettingsFormItems; | ||||
| } | ||||
|  | ||||
| class GitHub implements AppSource { | ||||
|   @override | ||||
|   late String host = 'github.com'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL; | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl) async { | ||||
|     Response res = await get(Uri.parse( | ||||
|         'https://api.$host/repos${standardUrl.substring('https://$host'.length)}/releases')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var releases = jsonDecode(res.body) as List<dynamic>; | ||||
|       // Right now, the latest non-prerelease version is picked | ||||
|       // If none exists, the latest prerelease version is picked | ||||
|       // In the future, the user could be given a choice | ||||
|       var nonPrereleaseReleases = | ||||
|           releases.where((element) => element['prerelease'] != true).toList(); | ||||
|       var latestRelease = nonPrereleaseReleases.isNotEmpty | ||||
|           ? nonPrereleaseReleases[0] | ||||
|           : releases.isNotEmpty | ||||
|               ? releases[0] | ||||
|               : null; | ||||
|       if (latestRelease == null) { | ||||
|         throw couldNotFindReleases; | ||||
|       } | ||||
|       List<dynamic>? assets = latestRelease['assets']; | ||||
|       List<String>? apkUrlList = assets | ||||
|           ?.map((e) { | ||||
|             return e['browser_download_url'] != null | ||||
|                 ? e['browser_download_url'] as String | ||||
|                 : ''; | ||||
|           }) | ||||
|           .where((element) => element.toLowerCase().endsWith('.apk')) | ||||
|           .toList(); | ||||
|       if (apkUrlList == null || apkUrlList.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|       String? version = latestRelease['tag_name']; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, apkUrlList); | ||||
|     } 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 couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     String temp = standardUrl.substring(standardUrl.indexOf('://') + 3); | ||||
|     List<String> names = temp.substring(temp.indexOf('/') + 1).split('/'); | ||||
|     return AppNames(names[0], names[1]); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class GitLab implements AppSource { | ||||
|   @override | ||||
|   late String host = 'gitlab.com'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL; | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl) async { | ||||
|     Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var standardUri = Uri.parse(standardUrl); | ||||
|       var parsedHtml = parse(res.body); | ||||
|       var entry = parsedHtml.querySelector('entry'); | ||||
|       var entryContent = | ||||
|           parse(parseFragment(entry?.querySelector('content')!.innerHtml).text); | ||||
|       var apkUrlList = [ | ||||
|         ...getLinksFromParsedHTML( | ||||
|             entryContent, | ||||
|             RegExp( | ||||
|                 '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$', | ||||
|                 caseSensitive: false), | ||||
|             standardUri.origin), | ||||
|         // GitLab releases may contain links to externally hosted APKs | ||||
|         ...getLinksFromParsedHTML(entryContent, | ||||
|                 RegExp('/[^/]+\\.apk\$', caseSensitive: false), '') | ||||
|             .where((element) => Uri.parse(element).host != '') | ||||
|             .toList() | ||||
|       ]; | ||||
|       if (apkUrlList.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|  | ||||
|       var entryId = entry?.querySelector('id')?.innerHtml; | ||||
|       var version = | ||||
|           entryId == null ? null : Uri.parse(entryId).pathSegments.last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, apkUrlList); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     // Same as GitHub | ||||
|     return GitHub().getAppNames(standardUrl); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class Signal implements AppSource { | ||||
|   @override | ||||
|   late String host = 'signal.org'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     return 'https://$host'; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl) async { | ||||
|     Response res = | ||||
|         await get(Uri.parse('https://updates.$host/android/latest.json')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var json = jsonDecode(res.body); | ||||
|       String? apkUrl = json['url']; | ||||
|       if (apkUrl == null) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|       String? version = json['versionName']; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, [apkUrl]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) => AppNames('Signal', 'Signal'); | ||||
| } | ||||
|  | ||||
| class FDroid implements AppSource { | ||||
|   @override | ||||
|   late String host = 'f-droid.org'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/packages/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL; | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl) 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 version = latestReleaseDiv | ||||
|           ?.querySelector('.package-version-header b') | ||||
|           ?.innerHtml | ||||
|           .split(' ') | ||||
|           .last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, [apkUrl]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class Mullvad implements AppSource { | ||||
|   @override | ||||
|   late String host = 'mullvad.net'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL; | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl) async { | ||||
|     Response res = await get(Uri.parse('$standardUrl/en/download/android')); | ||||
|     if (res.statusCode == 200) { | ||||
|       var version = parse(res.body) | ||||
|           .querySelector('p.subtitle.is-6') | ||||
|           ?.querySelector('a') | ||||
|           ?.attributes['href'] | ||||
|           ?.split('/') | ||||
|           .last; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails( | ||||
|           version, ['https://mullvad.net/download/app/apk/latest']); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     return AppNames('Mullvad-VPN', 'Mullvad-VPN'); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class IzzyOnDroid implements AppSource { | ||||
|   @override | ||||
|   late String host = 'android.izzysoft.de'; | ||||
|  | ||||
|   @override | ||||
|   String standardizeURL(String url) { | ||||
|     RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+'); | ||||
|     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase()); | ||||
|     if (match == null) { | ||||
|       throw notValidURL; | ||||
|     } | ||||
|     return url.substring(0, match.end); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<APKDetails> getLatestAPKDetails(String standardUrl) async { | ||||
|     Response res = await get(Uri.parse(standardUrl)); | ||||
|     if (res.statusCode == 200) { | ||||
|       var parsedHtml = parse(res.body); | ||||
|       var multipleVersionApkUrls = parsedHtml | ||||
|           .querySelectorAll('a') | ||||
|           .where((element) => | ||||
|               element.attributes['href']?.toLowerCase().endsWith('.apk') ?? | ||||
|               false) | ||||
|           .map((e) => 'https://$host${e.attributes['href'] ?? ''}') | ||||
|           .toList(); | ||||
|       if (multipleVersionApkUrls.isEmpty) { | ||||
|         throw noAPKFound; | ||||
|       } | ||||
|       var version = parsedHtml | ||||
|           .querySelector('#keydata') | ||||
|           ?.querySelectorAll('b') | ||||
|           .where( | ||||
|               (element) => element.innerHtml.toLowerCase().contains('version')) | ||||
|           .toList()[0] | ||||
|           .parentNode | ||||
|           ?.parentNode | ||||
|           ?.children[1] | ||||
|           .innerHtml; | ||||
|       if (version == null) { | ||||
|         throw couldNotFindLatestVersion; | ||||
|       } | ||||
|       return APKDetails(version, [multipleVersionApkUrls[0]]); | ||||
|     } else { | ||||
|       throw couldNotFindReleases; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AppNames getAppNames(String standardUrl) { | ||||
|     return AppNames('IzzyOnDroid', Uri.parse(standardUrl).pathSegments.last); | ||||
|   } | ||||
| abstract class MassAppSource { | ||||
|   late String name; | ||||
|   late List<String> requiredArgs; | ||||
|   Future<List<String>> getUrls(List<String> args); | ||||
| } | ||||
|  | ||||
| class SourceProvider { | ||||
|   // Add more source classes here so they are available via the service | ||||
|   List<AppSource> sources = [ | ||||
|     GitHub(), | ||||
|     GitLab(), | ||||
|     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 source classes here so they are available via the service | ||||
|   AppSource getSource(String url) { | ||||
|     url = preStandardizeUrl(url); | ||||
|     AppSource? source; | ||||
|     for (var s in sources) { | ||||
|       if (url.toLowerCase().contains('://${s.host}')) { | ||||
| @@ -421,37 +174,48 @@ class SourceProvider { | ||||
|     return source; | ||||
|   } | ||||
|  | ||||
|   Future<App> getApp(String url) async { | ||||
|     if (url.toLowerCase().indexOf('http://') != 0 && | ||||
|         url.toLowerCase().indexOf('https://') != 0) { | ||||
|       url = 'https://$url'; | ||||
|   bool doesSourceHaveRequiredAdditionalData(AppSource source) { | ||||
|     for (var row in source.additionalDataFormItems) { | ||||
|       for (var element in row) { | ||||
|         if (element.required) { | ||||
|           return true; | ||||
|         } | ||||
|     if (url.toLowerCase().indexOf('https://www.') == 0) { | ||||
|       url = 'https://${url.substring(12)}'; | ||||
|       } | ||||
|     AppSource source = getSource(url); | ||||
|     String standardUrl = source.standardizeURL(url); | ||||
|     } | ||||
|     return false; | ||||
|   } | ||||
|  | ||||
|   Future<App> getApp(AppSource source, String url, List<String> additionalData, | ||||
|       {String customName = ''}) async { | ||||
|     String standardUrl = source.standardizeURL(preStandardizeUrl(url)); | ||||
|     AppNames names = source.getAppNames(standardUrl); | ||||
|     APKDetails apk = await source.getLatestAPKDetails(standardUrl); | ||||
|     APKDetails apk = | ||||
|         await source.getLatestAPKDetails(standardUrl, additionalData); | ||||
|     return App( | ||||
|         '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}', | ||||
|         standardUrl, | ||||
|         names.author[0].toUpperCase() + names.author.substring(1), | ||||
|         names.name[0].toUpperCase() + names.name.substring(1), | ||||
|         customName.trim().isNotEmpty | ||||
|             ? customName | ||||
|             : names.name[0].toUpperCase() + names.name.substring(1), | ||||
|         null, | ||||
|         apk.version, | ||||
|         apk.apkUrls, | ||||
|         apk.apkUrls.length - 1); | ||||
|         apk.apkUrls.length - 1, | ||||
|         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 { | ||||
|   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 { | ||||
|         apps.add(await getApp(url)); | ||||
|         var source = getSource(url); | ||||
|         apps.add(await getApp(source, url, source.additionalDataDefaults)); | ||||
|       } catch (e) { | ||||
|         errors.addAll(<String, dynamic>{url: e}); | ||||
|       } | ||||
| @@ -461,37 +225,3 @@ class SourceProvider { | ||||
|  | ||||
|   List<String> getSourceHosts() => sources.map((e) => e.host).toList(); | ||||
| } | ||||
|  | ||||
| abstract class MassAppSource { | ||||
|   late String name; | ||||
|   late List<String> requiredArgs; | ||||
|   Future<List<String>> getUrls(List<String> args); | ||||
| } | ||||
|  | ||||
| class GitHubStars implements MassAppSource { | ||||
|   @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')); | ||||
|     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 'Unable to find user\'s starred repos'; | ||||
|     } | ||||
|   } | ||||
| } | ||||
|   | ||||
							
								
								
									
										93
									
								
								pubspec.lock
									
									
									
									
									
								
							
							
						
						
									
										93
									
								
								pubspec.lock
									
									
									
									
									
								
							| @@ -7,7 +7,7 @@ packages: | ||||
|       name: animations | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.0.4" | ||||
|     version: "2.0.5" | ||||
|   archive: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -175,7 +175,7 @@ packages: | ||||
|       name: file_picker | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "5.1.0" | ||||
|     version: "5.2.0+1" | ||||
|   flutter: | ||||
|     dependency: "direct main" | ||||
|     description: flutter | ||||
| @@ -188,6 +188,13 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.2.0" | ||||
|   flutter_install_app: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: flutter_install_app | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.3.0" | ||||
|   flutter_launcher_icons: | ||||
|     dependency: "direct dev" | ||||
|     description: | ||||
| @@ -208,7 +215,7 @@ packages: | ||||
|       name: flutter_local_notifications | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "10.0.0" | ||||
|     version: "11.0.1" | ||||
|   flutter_local_notifications_linux: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -275,13 +282,6 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.2.0" | ||||
|   install_plugin_v2: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: install_plugin_v2 | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "1.0.0" | ||||
|   js: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -295,7 +295,7 @@ packages: | ||||
|       name: json_annotation | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "4.6.0" | ||||
|     version: "4.7.0" | ||||
|   lints: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -324,6 +324,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: | ||||
| @@ -379,7 +386,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,7 +400,7 @@ packages: | ||||
|       name: permission_handler | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "10.0.0" | ||||
|     version: "10.0.2" | ||||
|   permission_handler_android: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -414,7 +421,7 @@ packages: | ||||
|       name: permission_handler_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.7.0" | ||||
|     version: "3.8.0" | ||||
|   permission_handler_windows: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -457,6 +464,48 @@ packages: | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "6.0.3" | ||||
|   share_plus: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: share_plus | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "4.4.0" | ||||
|   share_plus_linux: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: share_plus_linux | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.0" | ||||
|   share_plus_macos: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: share_plus_macos | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.1" | ||||
|   share_plus_platform_interface: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: share_plus_platform_interface | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.3" | ||||
|   share_plus_web: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: share_plus_web | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.1" | ||||
|   share_plus_windows: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: share_plus_windows | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "3.0.1" | ||||
|   shared_preferences: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -538,7 +587,7 @@ packages: | ||||
|       name: stream_channel | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.1.0" | ||||
|     version: "2.1.1" | ||||
|   string_scanner: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -566,7 +615,7 @@ packages: | ||||
|       name: timezone | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "0.8.0" | ||||
|     version: "0.9.0" | ||||
|   typed_data: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -580,7 +629,7 @@ 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: | ||||
| @@ -615,7 +664,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: | ||||
| @@ -636,7 +685,7 @@ packages: | ||||
|       name: vector_math | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.1.3" | ||||
|     version: "2.1.4" | ||||
|   webview_flutter: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -650,21 +699,21 @@ packages: | ||||
|       name: webview_flutter_android | ||||
|       url: "https://pub.dartlang.org" | ||||
|     source: hosted | ||||
|     version: "2.10.1" | ||||
|     version: "2.10.3" | ||||
|   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: | ||||
|   | ||||
| @@ -17,7 +17,7 @@ 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.2.4+15 # When changing this, update the tag in main() accordingly | ||||
| version: 0.5.0+21 # When changing this, update the tag in main() accordingly | ||||
|  | ||||
| environment: | ||||
|   sdk: '>=2.19.0-79.0.dev <3.0.0' | ||||
| @@ -38,13 +38,12 @@ 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: ^11.0.1 | ||||
|   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 | ||||
| @@ -53,6 +52,8 @@ dependencies: | ||||
|   device_info_plus: ^4.1.2 | ||||
|   file_picker: ^5.1.0 | ||||
|   animations: ^2.0.4 | ||||
|   flutter_install_app: ^1.3.0 | ||||
|   share_plus: ^4.4.0 | ||||
|  | ||||
|  | ||||
| dev_dependencies: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user