mirror of
				https://github.com/ImranR98/Obtainium.git
				synced 2025-10-29 20:43:28 +01:00 
			
		
		
		
	Compare commits
	
		
			5 Commits
		
	
	
		
			v0.13.14-b
			...
			v0.13.15-b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | f74df57400 | ||
|  | 6b29a0f0f3 | ||
|  | 2a58ee8729 | ||
|  | 41d9edcf83 | ||
|  | 3ec33a1c77 | 
| @@ -234,6 +234,9 @@ | |||||||
|     "requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)", |     "requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)", | ||||||
|     "checkOnStart": "Überprüfe einmalig beim Start", |     "checkOnStart": "Überprüfe einmalig beim Start", | ||||||
|     "tryInferAppIdFromCode": "Try inferring App ID from source code", |     "tryInferAppIdFromCode": "Try inferring App ID from source code", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "App entfernen?", |         "one": "App entfernen?", | ||||||
|         "other": "Apps entfernen?" |         "other": "Apps entfernen?" | ||||||
|   | |||||||
| @@ -121,7 +121,7 @@ | |||||||
|     "followSystem": "Follow System", |     "followSystem": "Follow System", | ||||||
|     "obtainium": "Obtainium", |     "obtainium": "Obtainium", | ||||||
|     "materialYou": "Material You", |     "materialYou": "Material You", | ||||||
|     "useBlackTheme": "Use Pure Black Dark Theme", |     "useBlackTheme": "Use pure black dark theme", | ||||||
|     "appSortBy": "App Sort By", |     "appSortBy": "App Sort By", | ||||||
|     "authorName": "Author/Name", |     "authorName": "Author/Name", | ||||||
|     "nameAuthor": "Name/Author", |     "nameAuthor": "Name/Author", | ||||||
| @@ -132,8 +132,8 @@ | |||||||
|     "bgUpdateCheckInterval": "Background Update Checking Interval", |     "bgUpdateCheckInterval": "Background Update Checking Interval", | ||||||
|     "neverManualOnly": "Never - Manual Only", |     "neverManualOnly": "Never - Manual Only", | ||||||
|     "appearance": "Appearance", |     "appearance": "Appearance", | ||||||
|     "showWebInAppView": "Show Source Webpage in App View", |     "showWebInAppView": "Show Source webpage in App view", | ||||||
|     "pinUpdates": "Pin Updates to Top of Apps View", |     "pinUpdates": "Pin updates to top of Apps view", | ||||||
|     "updates": "Updates", |     "updates": "Updates", | ||||||
|     "sourceSpecific": "Source-Specific", |     "sourceSpecific": "Source-Specific", | ||||||
|     "appSource": "App Source", |     "appSource": "App Source", | ||||||
| @@ -226,14 +226,17 @@ | |||||||
|     "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible", |     "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible", | ||||||
|     "overrideSource": "Override Source", |     "overrideSource": "Override Source", | ||||||
|     "dontShowAgain": "Don't show this again", |     "dontShowAgain": "Don't show this again", | ||||||
|     "dontShowTrackOnlyWarnings": "Don't Show 'Track-Only' Warnings", |     "dontShowTrackOnlyWarnings": "Don't show 'Track-Only' warnings", | ||||||
|     "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings", |     "dontShowAPKOriginWarnings": "Don't show APK origin warnings", | ||||||
|     "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View", |     "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view", | ||||||
|     "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", |     "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", | ||||||
|     "about": "About", |     "about": "About", | ||||||
|     "requiresCredentialsInSettings": "This needs additional credentials (in Settings)", |     "requiresCredentialsInSettings": "This needs additional credentials (in Settings)", | ||||||
|     "checkOnStart": "Check Once on Start", |     "checkOnStart": "Check for updates on startup", | ||||||
|     "tryInferAppIdFromCode": "Try inferring App ID from source code", |     "tryInferAppIdFromCode": "Try inferring App ID from source code", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "Remove App?", |         "one": "Remove App?", | ||||||
|         "other": "Remove Apps?" |         "other": "Remove Apps?" | ||||||
|   | |||||||
| @@ -228,12 +228,15 @@ | |||||||
|     "dontShowAgain": "No mostrar de nuevo", |     "dontShowAgain": "No mostrar de nuevo", | ||||||
|     "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'", |     "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'", | ||||||
|     "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks", |     "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks", | ||||||
|     "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View", |     "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view", | ||||||
|     "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", |     "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", | ||||||
|     "about": "About", |     "about": "About", | ||||||
|     "requiresCredentialsInSettings": "This needs additional credentials (in Settings)", |     "requiresCredentialsInSettings": "This needs additional credentials (in Settings)", | ||||||
|     "checkOnStart": "Check Once on Start", |     "checkOnStart": "Check for updates on startup", | ||||||
|     "tryInferAppIdFromCode": "Try inferring App ID from source code", |     "tryInferAppIdFromCode": "Try inferring App ID from source code", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "¿Eliminar Aplicación?", |         "one": "¿Eliminar Aplicación?", | ||||||
|         "other": "¿Eliminar Aplicaciones?" |         "other": "¿Eliminar Aplicaciones?" | ||||||
|   | |||||||
| @@ -234,6 +234,9 @@ | |||||||
|     "requiresCredentialsInSettings": "این به اعتبارنامه های اضافی نیاز دارد (در تنظیمات)", |     "requiresCredentialsInSettings": "این به اعتبارنامه های اضافی نیاز دارد (در تنظیمات)", | ||||||
|     "checkOnStart": "بررسی در شروع", |     "checkOnStart": "بررسی در شروع", | ||||||
|     "tryInferAppIdFromCode": "شناسه برنامه را از کد منبع استنباط کنید", |     "tryInferAppIdFromCode": "شناسه برنامه را از کد منبع استنباط کنید", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "برنامه حذف شود؟", |         "one": "برنامه حذف شود؟", | ||||||
|         "other": "برنامه ها حذف شوند؟" |         "other": "برنامه ها حذف شوند؟" | ||||||
|   | |||||||
| @@ -121,7 +121,7 @@ | |||||||
|     "followSystem": "Suivre le système", |     "followSystem": "Suivre le système", | ||||||
|     "obtainium": "Obtainium", |     "obtainium": "Obtainium", | ||||||
|     "materialYou": "Material You", |     "materialYou": "Material You", | ||||||
|     "useBlackTheme": "Use Pure Black Dark Theme", |     "useBlackTheme": "Use pure black dark theme", | ||||||
|     "appSortBy": "Applications triées par", |     "appSortBy": "Applications triées par", | ||||||
|     "authorName": "Auteur/Nom", |     "authorName": "Auteur/Nom", | ||||||
|     "nameAuthor": "Nom/Auteur", |     "nameAuthor": "Nom/Auteur", | ||||||
| @@ -227,13 +227,16 @@ | |||||||
|     "overrideSource": "Override Source", |     "overrideSource": "Override Source", | ||||||
|     "dontShowAgain": "Don't show this again", |     "dontShowAgain": "Don't show this again", | ||||||
|     "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning", |     "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning", | ||||||
|     "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings", |     "dontShowAPKOriginWarnings": "Don't show APK origin warnings", | ||||||
|     "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View", |     "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view", | ||||||
|     "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", |     "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", | ||||||
|     "about": "About", |     "about": "About", | ||||||
|     "requiresCredentialsInSettings": "This needs additional credentials (in Settings)", |     "requiresCredentialsInSettings": "This needs additional credentials (in Settings)", | ||||||
|     "checkOnStart": "Check Once on Start", |     "checkOnStart": "Check for updates on startup", | ||||||
|     "tryInferAppIdFromCode": "Try inferring App ID from source code", |     "tryInferAppIdFromCode": "Try inferring App ID from source code", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "Supprimer l'application ?", |         "one": "Supprimer l'application ?", | ||||||
|         "other": "Supprimer les applications ?" |         "other": "Supprimer les applications ?" | ||||||
|   | |||||||
| @@ -233,6 +233,9 @@ | |||||||
|     "requiresCredentialsInSettings": "Ehhez további hitelesítő adatokra van szükség (a Beállításokban)", |     "requiresCredentialsInSettings": "Ehhez további hitelesítő adatokra van szükség (a Beállításokban)", | ||||||
|     "checkOnStart": "Egyszer az indításkor", |     "checkOnStart": "Egyszer az indításkor", | ||||||
|     "tryInferAppIdFromCode": "Próbálja kikövetkeztetni az app azonosítót a forráskódból", |     "tryInferAppIdFromCode": "Próbálja kikövetkeztetni az app azonosítót a forráskódból", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "Eltávolítja az alkalmazást?", |         "one": "Eltávolítja az alkalmazást?", | ||||||
|         "other": "Eltávolítja az alkalmazást?" |         "other": "Eltávolítja az alkalmazást?" | ||||||
|   | |||||||
| @@ -234,6 +234,9 @@ | |||||||
|     "requiresCredentialsInSettings": "Servono credenziali aggiuntive (in Impostazioni)", |     "requiresCredentialsInSettings": "Servono credenziali aggiuntive (in Impostazioni)", | ||||||
|     "checkOnStart": "Controlla una volta all'avvio", |     "checkOnStart": "Controlla una volta all'avvio", | ||||||
|     "tryInferAppIdFromCode": "Prova a dedurre l'ID dell'app dal codice sorgente", |     "tryInferAppIdFromCode": "Prova a dedurre l'ID dell'app dal codice sorgente", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "Rimuovere l'app?", |         "one": "Rimuovere l'app?", | ||||||
|         "other": "Rimuovere le app?" |         "other": "Rimuovere le app?" | ||||||
|   | |||||||
| @@ -232,8 +232,11 @@ | |||||||
|     "gitlabPATLabel": "GitLab パーソナルアクセストークン (検索を有効化する)", |     "gitlabPATLabel": "GitLab パーソナルアクセストークン (検索を有効化する)", | ||||||
|     "about": "概要", |     "about": "概要", | ||||||
|     "requiresCredentialsInSettings": "これには追加の認証が必要です (設定にて)", |     "requiresCredentialsInSettings": "これには追加の認証が必要です (設定にて)", | ||||||
|     "checkOnStart": "Check Once on Start", |     "checkOnStart": "Check for updates on startup", | ||||||
|     "tryInferAppIdFromCode": "Try inferring App ID from source code", |     "tryInferAppIdFromCode": "Try inferring App ID from source code", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "アプリを削除しますか?", |         "one": "アプリを削除しますか?", | ||||||
|         "other": "アプリを削除しますか?" |         "other": "アプリを削除しますか?" | ||||||
|   | |||||||
| @@ -238,6 +238,9 @@ | |||||||
|     "requiresCredentialsInSettings": "Wymaga to dodatkowych poświadczeń (w Ustawieniach)", |     "requiresCredentialsInSettings": "Wymaga to dodatkowych poświadczeń (w Ustawieniach)", | ||||||
|     "checkOnStart": "Sprawdź raz przy starcie", |     "checkOnStart": "Sprawdź raz przy starcie", | ||||||
|     "tryInferAppIdFromCode": "Spróbuj wywnioskować identyfikator aplikacji z kodu źródłowego", |     "tryInferAppIdFromCode": "Spróbuj wywnioskować identyfikator aplikacji z kodu źródłowego", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "Usunąć aplikację?", |         "one": "Usunąć aplikację?", | ||||||
|         "other": "Usunąć aplikacje?" |         "other": "Usunąć aplikacje?" | ||||||
|   | |||||||
| @@ -234,6 +234,9 @@ | |||||||
|     "requiresCredentialsInSettings": "Для этого требуются дополнительные учетные данные (в настройках)", |     "requiresCredentialsInSettings": "Для этого требуются дополнительные учетные данные (в настройках)", | ||||||
|     "checkOnStart": "Проверить один раз при запуске", |     "checkOnStart": "Проверить один раз при запуске", | ||||||
|     "tryInferAppIdFromCode": "Попытаться определить ID приложения из исходного кода", |     "tryInferAppIdFromCode": "Попытаться определить ID приложения из исходного кода", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "Удалить приложение?", |         "one": "Удалить приложение?", | ||||||
|         "other": "Удалить приложения?" |         "other": "Удалить приложения?" | ||||||
|   | |||||||
| @@ -234,6 +234,9 @@ | |||||||
|     "requiresCredentialsInSettings": "此功能需要额外的凭据(在“设置”中添加)", |     "requiresCredentialsInSettings": "此功能需要额外的凭据(在“设置”中添加)", | ||||||
|     "checkOnStart": "启动时进行一次检查", |     "checkOnStart": "启动时进行一次检查", | ||||||
|     "tryInferAppIdFromCode": "尝试从源代码推断应用 ID", |     "tryInferAppIdFromCode": "尝试从源代码推断应用 ID", | ||||||
|  |     "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps", | ||||||
|  |     "pickHighestVersionCode": "Auto-select highest version code APK", | ||||||
|  |     "checkUpdateOnDetailPage": "Check for updates on opening an App detail page", | ||||||
|     "removeAppQuestion": { |     "removeAppQuestion": { | ||||||
|         "one": "是否删除应用?", |         "one": "是否删除应用?", | ||||||
|         "other": "是否删除应用?" |         "other": "是否删除应用?" | ||||||
|   | |||||||
| @@ -14,6 +14,10 @@ class FDroidRepo extends AppSource { | |||||||
|             label: tr('appIdOrName'), |             label: tr('appIdOrName'), | ||||||
|             hint: tr('reposHaveMultipleApps'), |             hint: tr('reposHaveMultipleApps'), | ||||||
|             required: true) |             required: true) | ||||||
|  |       ], | ||||||
|  |       [ | ||||||
|  |         GeneratedFormSwitch('pickHighestVersionCode', | ||||||
|  |             label: tr('pickHighestVersionCode'), defaultValue: false) | ||||||
|       ] |       ] | ||||||
|     ]; |     ]; | ||||||
|   } |   } | ||||||
| @@ -24,6 +28,7 @@ class FDroidRepo extends AppSource { | |||||||
|     Map<String, dynamic> additionalSettings, |     Map<String, dynamic> additionalSettings, | ||||||
|   ) async { |   ) async { | ||||||
|     String? appIdOrName = additionalSettings['appIdOrName']; |     String? appIdOrName = additionalSettings['appIdOrName']; | ||||||
|  |     bool pickHighestVersionCode = additionalSettings['pickHighestVersionCode']; | ||||||
|     if (appIdOrName == null) { |     if (appIdOrName == null) { | ||||||
|       throw NoReleasesError(); |       throw NoReleasesError(); | ||||||
|     } |     } | ||||||
| @@ -62,10 +67,19 @@ class FDroidRepo extends AppSource { | |||||||
|       if (latestVersion == null) { |       if (latestVersion == null) { | ||||||
|         throw NoVersionError(); |         throw NoVersionError(); | ||||||
|       } |       } | ||||||
|       List<String> apkUrls = releases |       var latestVersionReleases = releases | ||||||
|           .where((element) => |           .where((element) => | ||||||
|               element.querySelector('version')?.innerHtml == latestVersion && |               element.querySelector('version')?.innerHtml == latestVersion && | ||||||
|               element.querySelector('apkname') != null) |               element.querySelector('apkname') != null) | ||||||
|  |           .toList(); | ||||||
|  |       if (latestVersionReleases.length > 1 && pickHighestVersionCode) { | ||||||
|  |         latestVersionReleases.sort((e1, e2) { | ||||||
|  |           return int.parse(e2.querySelector('versioncode')!.innerHtml) | ||||||
|  |               .compareTo(int.parse(e1.querySelector('versioncode')!.innerHtml)); | ||||||
|  |         }); | ||||||
|  |         latestVersionReleases = [latestVersionReleases[0]]; | ||||||
|  |       } | ||||||
|  |       List<String> apkUrls = latestVersionReleases | ||||||
|           .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}') |           .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}') | ||||||
|           .toList(); |           .toList(); | ||||||
|       return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls), |       return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls), | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart'; | |||||||
| // ignore: implementation_imports | // ignore: implementation_imports | ||||||
| import 'package:easy_localization/src/localization.dart'; | import 'package:easy_localization/src/localization.dart'; | ||||||
|  |  | ||||||
| const String currentVersion = '0.13.14'; | const String currentVersion = '0.13.15'; | ||||||
| const String currentReleaseTag = | const String currentReleaseTag = | ||||||
|     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES |     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES | ||||||
|  |  | ||||||
| @@ -226,9 +226,9 @@ class _ObtainiumState extends State<Obtainium> { | |||||||
|       if (!supportedLocales |       if (!supportedLocales | ||||||
|               .map((e) => e.key.languageCode) |               .map((e) => e.key.languageCode) | ||||||
|               .contains(context.locale.languageCode) || |               .contains(context.locale.languageCode) || | ||||||
|           settingsProvider.forcedLocale == null && |           (settingsProvider.forcedLocale == null && | ||||||
|               context.deviceLocale.languageCode != |               context.deviceLocale.languageCode != | ||||||
|                   context.locale.languageCode) { |                   context.locale.languageCode)) { | ||||||
|         settingsProvider.resetLocaleSafe(context); |         settingsProvider.resetLocaleSafe(context); | ||||||
|       } |       } | ||||||
|       // Register the background update task according to the user's setting |       // Register the background update task according to the user's setting | ||||||
|   | |||||||
| @@ -44,7 +44,10 @@ class _AppPageState extends State<AppPage> { | |||||||
|         ? sourceProvider.getSource(app.app.url, |         ? sourceProvider.getSource(app.app.url, | ||||||
|             overrideSource: app.app.overrideSource) |             overrideSource: app.app.overrideSource) | ||||||
|         : null; |         : null; | ||||||
|     if (!areDownloadsRunning && prevApp == null && app != null) { |     if (!areDownloadsRunning && | ||||||
|  |         prevApp == null && | ||||||
|  |         app != null && | ||||||
|  |         settingsProvider.checkUpdateOnDetailPage) { | ||||||
|       prevApp = app; |       prevApp = app; | ||||||
|       getUpdate(app.app.id); |       getUpdate(app.app.id); | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -240,6 +240,21 @@ class _SettingsPageState extends State<SettingsPage> { | |||||||
|                                     }) |                                     }) | ||||||
|                               ], |                               ], | ||||||
|                             ), |                             ), | ||||||
|  |                             height16, | ||||||
|  |                             Row( | ||||||
|  |                               mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||||
|  |                               children: [ | ||||||
|  |                                 Flexible( | ||||||
|  |                                     child: Text(tr('checkUpdateOnDetailPage'))), | ||||||
|  |                                 Switch( | ||||||
|  |                                     value: settingsProvider | ||||||
|  |                                         .checkUpdateOnDetailPage, | ||||||
|  |                                     onChanged: (value) { | ||||||
|  |                                       settingsProvider.checkUpdateOnDetailPage = | ||||||
|  |                                           value; | ||||||
|  |                                     }) | ||||||
|  |                               ], | ||||||
|  |                             ), | ||||||
|                             height32, |                             height32, | ||||||
|                             Text( |                             Text( | ||||||
|                               tr('sourceSpecific'), |                               tr('sourceSpecific'), | ||||||
| @@ -322,6 +337,22 @@ class _SettingsPageState extends State<SettingsPage> { | |||||||
|                               ], |                               ], | ||||||
|                             ), |                             ), | ||||||
|                             height16, |                             height16, | ||||||
|  |                             Row( | ||||||
|  |                               mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||||
|  |                               children: [ | ||||||
|  |                                 Flexible( | ||||||
|  |                                     child: | ||||||
|  |                                         Text(tr('removeOnExternalUninstall'))), | ||||||
|  |                                 Switch( | ||||||
|  |                                     value: settingsProvider | ||||||
|  |                                         .removeOnExternalUninstall, | ||||||
|  |                                     onChanged: (value) { | ||||||
|  |                                       settingsProvider | ||||||
|  |                                           .removeOnExternalUninstall = value; | ||||||
|  |                                     }) | ||||||
|  |                               ], | ||||||
|  |                             ), | ||||||
|  |                             height16, | ||||||
|                             Row( |                             Row( | ||||||
|                               mainAxisAlignment: MainAxisAlignment.spaceBetween, |                               mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||||
|                               children: [ |                               children: [ | ||||||
|   | |||||||
| @@ -335,19 +335,21 @@ class AppsProvider with ChangeNotifier { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   Future<void> unzipFile(String filePath, String destinationPath) async { |   Future<void> unzipFile(String filePath, String destinationPath) async { | ||||||
|     await ZipFile.extractToDirectory(zipFile: File(filePath), destinationDir: Directory(destinationPath)); |     await ZipFile.extractToDirectory( | ||||||
|  |         zipFile: File(filePath), destinationDir: Directory(destinationPath)); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   Future<void> installXApkDir(DownloadedXApkDir dir, |   Future<void> installXApkDir(DownloadedXApkDir dir, | ||||||
|       {bool silent = false}) async { |       {bool silent = false}) async { | ||||||
|     try { |     try { | ||||||
|       var somethingInstalled = false; |       var somethingInstalled = false; | ||||||
|       for (var file in dir.extracted.listSync(recursive: true, followLinks: false).whereType<File>()) { |       for (var file in dir.extracted | ||||||
|  |           .listSync(recursive: true, followLinks: false) | ||||||
|  |           .whereType<File>()) { | ||||||
|         if (file.path.toLowerCase().endsWith('.apk')) { |         if (file.path.toLowerCase().endsWith('.apk')) { | ||||||
|           somethingInstalled = somethingInstalled || |           somethingInstalled = somethingInstalled || | ||||||
|               await installApk(DownloadedApk(dir.appId, file), silent: silent); |               await installApk(DownloadedApk(dir.appId, file), silent: silent); | ||||||
|         } |         } else if (file.path.toLowerCase().endsWith('.obb')) { | ||||||
|         else if (file.path.toLowerCase().endsWith('.obb')) { |  | ||||||
|           await moveObbFile(file, dir.appId); |           await moveObbFile(file, dir.appId); | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
| @@ -389,7 +391,7 @@ class AppsProvider with ChangeNotifier { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   Future<void> moveObbFile(File file, String appId) async { |   Future<void> moveObbFile(File file, String appId) async { | ||||||
|     if(!file.path.toLowerCase().endsWith('.obb')) return; |     if (!file.path.toLowerCase().endsWith('.obb')) return; | ||||||
|  |  | ||||||
|     // TODO: Does not support Android 11+ |     // TODO: Does not support Android 11+ | ||||||
|     if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) { |     if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) { | ||||||
| @@ -754,21 +756,37 @@ class AppsProvider with ChangeNotifier { | |||||||
|     } |     } | ||||||
|     loadingApps = false; |     loadingApps = false; | ||||||
|     notifyListeners(); |     notifyListeners(); | ||||||
|     refreshInstallStatuses(); |  | ||||||
|  |     refreshInstallStatuses(useExistingInstalledInfo: true); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   Future<void> refreshInstallStatuses() async { |   Future<void> refreshInstallStatuses( | ||||||
|  |       {bool useExistingInstalledInfo = false}) async { | ||||||
|     if (await doesInstalledAppsPluginWork()) { |     if (await doesInstalledAppsPluginWork()) { | ||||||
|       List<App> modifiedApps = []; |       List<App> modifiedApps = []; | ||||||
|       for (var app in apps.values) { |       for (var app in apps.values) { | ||||||
|         var moddedApp = |         var moddedApp = getCorrectedInstallStatusAppIfPossible( | ||||||
|             getCorrectedInstallStatusAppIfPossible(app.app, app.installedInfo); |             app.app, | ||||||
|  |             useExistingInstalledInfo | ||||||
|  |                 ? app.installedInfo | ||||||
|  |                 : await getInstalledInfo(app.app.id)); | ||||||
|         if (moddedApp != null) { |         if (moddedApp != null) { | ||||||
|           modifiedApps.add(moddedApp); |           modifiedApps.add(moddedApp); | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|       if (modifiedApps.isNotEmpty) { |       if (modifiedApps.isNotEmpty) { | ||||||
|         await saveApps(modifiedApps, attemptToCorrectInstallStatus: false); |         await saveApps(modifiedApps, attemptToCorrectInstallStatus: false); | ||||||
|  |         var removedAppIds = modifiedApps | ||||||
|  |             .where((a) => a.installedVersion == null) | ||||||
|  |             .map((e) => e.id) | ||||||
|  |             .toList(); | ||||||
|  |         if (removedAppIds.isNotEmpty) { | ||||||
|  |           var settingsProvider = SettingsProvider(); | ||||||
|  |           await settingsProvider.initializeSettings(); | ||||||
|  |           if (settingsProvider.removeOnExternalUninstall) { | ||||||
|  |             await removeApps(removedAppIds); | ||||||
|  |           } | ||||||
|  |         } | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -273,4 +273,22 @@ class SettingsProvider with ChangeNotifier { | |||||||
|       context.deleteSaveLocale(); |       context.deleteSaveLocale(); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   bool get removeOnExternalUninstall { | ||||||
|  |     return prefs?.getBool('removeOnExternalUninstall') ?? false; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   set removeOnExternalUninstall(bool show) { | ||||||
|  |     prefs?.setBool('removeOnExternalUninstall', show); | ||||||
|  |     notifyListeners(); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   bool get checkUpdateOnDetailPage { | ||||||
|  |     return prefs?.getBool('checkUpdateOnDetailPage') ?? true; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   set checkUpdateOnDetailPage(bool show) { | ||||||
|  |     prefs?.setBool('checkUpdateOnDetailPage', show); | ||||||
|  |     notifyListeners(); | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										56
									
								
								pubspec.lock
									
									
									
									
									
								
							
							
						
						
									
										56
									
								
								pubspec.lock
									
									
									
									
									
								
							| @@ -402,10 +402,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: markdown |       name: markdown | ||||||
|       sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e" |       sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "7.1.0" |     version: "7.1.1" | ||||||
|   matcher: |   matcher: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -490,10 +490,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: path_provider_foundation |       name: path_provider_foundation | ||||||
|       sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3" |       sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "2.2.3" |     version: "2.2.4" | ||||||
|   path_provider_linux: |   path_provider_linux: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -522,34 +522,34 @@ packages: | |||||||
|     dependency: "direct main" |     dependency: "direct main" | ||||||
|     description: |     description: | ||||||
|       name: permission_handler |       name: permission_handler | ||||||
|       sha256: "415af30ba76a84faccfe1eb251fe1e4fdc790f876924c65ad7d6ed7a1404bcd6" |       sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "10.4.2" |     version: "10.4.3" | ||||||
|   permission_handler_android: |   permission_handler_android: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: permission_handler_android |       name: permission_handler_android | ||||||
|       sha256: "3b61f3da3b1c83bc3fb6a2b431e8dab01d0e5b45f6a3d9c7609770ec88b2a89e" |       sha256: c0c9754479a4c4b1c1f3862ddc11930c9b3f03bef2816bb4ea6eed1e13551d6f | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "10.3.0" |     version: "10.3.2" | ||||||
|   permission_handler_apple: |   permission_handler_apple: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: permission_handler_apple |       name: permission_handler_apple | ||||||
|       sha256: "7a187b671a39919462af2b5e813148365b71a615979165a119868d667fe90c03" |       sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "9.1.3" |     version: "9.1.4" | ||||||
|   permission_handler_platform_interface: |   permission_handler_platform_interface: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: permission_handler_platform_interface |       name: permission_handler_platform_interface | ||||||
|       sha256: "463a07cb7cc6c758a7a1c7da36ce666bb80a0b4b5e92df0fa36872e0ed456993" |       sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.11.1" |     version: "3.11.3" | ||||||
|   permission_handler_windows: |   permission_handler_windows: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -590,14 +590,6 @@ packages: | |||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.7.3" |     version: "3.7.3" | ||||||
|   process: |  | ||||||
|     dependency: transitive |  | ||||||
|     description: |  | ||||||
|       name: process |  | ||||||
|       sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" |  | ||||||
|       url: "https://pub.dev" |  | ||||||
|     source: hosted |  | ||||||
|     version: "4.2.4" |  | ||||||
|   provider: |   provider: | ||||||
|     dependency: "direct main" |     dependency: "direct main" | ||||||
|     description: |     description: | ||||||
| @@ -642,10 +634,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: shared_preferences_foundation |       name: shared_preferences_foundation | ||||||
|       sha256: b046999bf0ff58f04c364491bb803dcfa8f42e47b19c75478f53d323684a8cc1 |       sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4 | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "2.3.1" |     version: "2.3.2" | ||||||
|   shared_preferences_linux: |   shared_preferences_linux: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -807,10 +799,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: url_launcher_macos |       name: url_launcher_macos | ||||||
|       sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e" |       sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.0.5" |     version: "3.0.6" | ||||||
|   url_launcher_platform_interface: |   url_launcher_platform_interface: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -863,26 +855,26 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: webview_flutter_android |       name: webview_flutter_android | ||||||
|       sha256: "1c93e96f3069bacdc734fad6b7e1d3a480fd516a3ae5b8858becf7f07515a2f3" |       sha256: "27ad6a99c4b2d5e1ffd2b993a10f738b6b4979f139b4d64c34ac511595fcd748" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.8.2" |     version: "3.9.0" | ||||||
|   webview_flutter_platform_interface: |   webview_flutter_platform_interface: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: webview_flutter_platform_interface |       name: webview_flutter_platform_interface | ||||||
|       sha256: "656e2aeaef318900fffd21468b6ddc7958c7092a642f0e7220bac328b70d4a81" |       sha256: "564ef378cafc1a0e29f1d76ce175ef517a0a6115875dff7b43fccbef2b0aeb30" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "2.3.1" |     version: "2.4.0" | ||||||
|   webview_flutter_wkwebview: |   webview_flutter_wkwebview: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: webview_flutter_wkwebview |       name: webview_flutter_wkwebview | ||||||
|       sha256: a8d7e8b4be2a79e83b70235369971ec97d14df4cdbb40d305a8eeae67d8e6432 |       sha256: "369fdf6160944a7db660ff15fa048c2bd681b09557907beaef1f95e8557d21dc" | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.6.2" |     version: "3.7.0" | ||||||
|   win32: |   win32: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -903,10 +895,10 @@ packages: | |||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: xdg_directories |       name: xdg_directories | ||||||
|       sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 |       sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff | ||||||
|       url: "https://pub.dev" |       url: "https://pub.dev" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "1.0.0" |     version: "1.0.1" | ||||||
|   xml: |   xml: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     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 | # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html | ||||||
| # In Windows, build-name is used as the major, minor, and patch parts | # In Windows, build-name is used as the major, minor, and patch parts | ||||||
| # of the product and file versions while build-number is used as the build suffix. | # of the product and file versions while build-number is used as the build suffix. | ||||||
| version: 0.13.14+178 # When changing this, update the tag in main() accordingly | version: 0.13.15+179 # When changing this, update the tag in main() accordingly | ||||||
|  |  | ||||||
| environment: | environment: | ||||||
|   sdk: '>=2.18.2 <3.0.0' |   sdk: '>=2.18.2 <3.0.0' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user