mirror of
https://github.com/ImranR98/Obtainium.git
synced 2025-08-19 05:00:21 +02:00
Merge branch 'main' into re7gog
This commit is contained in:
@@ -10,7 +10,7 @@ class APKCombo extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/+[^/]+/+[^/]+');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/+[^/]+/+[^/]+');
|
||||
var match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -34,7 +34,7 @@ class APKPure extends AppSource {
|
||||
url = 'https://$host${Uri.parse(url).path}';
|
||||
}
|
||||
RegExp standardUrlRegExA =
|
||||
RegExp('^https?://$host/+[^/]+/+[^/]+(/+[^/]+)?');
|
||||
RegExp('^https?://(www\\.)?$host/+[^/]+/+[^/]+(/+[^/]+)?');
|
||||
match = standardUrlRegExA.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -7,7 +7,7 @@ import 'package:obtainium/providers/source_provider.dart';
|
||||
class Aptoide extends AppSource {
|
||||
Aptoide() {
|
||||
host = 'aptoide.com';
|
||||
name = tr('Aptoide');
|
||||
name = 'Aptoide';
|
||||
allowSubDomains = true;
|
||||
naiveStandardVersionDetection = true;
|
||||
}
|
||||
|
@@ -16,7 +16,7 @@ class Codeberg extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -38,13 +38,14 @@ class FDroid extends AppSource {
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegExB =
|
||||
RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
|
||||
RegExp('^https?://(www\\.)?$host/+[^/]+/+packages/+[^/]+');
|
||||
RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
|
||||
if (match != null) {
|
||||
url =
|
||||
'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
|
||||
}
|
||||
RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
|
||||
RegExp standardUrlRegExA =
|
||||
RegExp('^https?://(www\\.)?$host/+packages/+[^/]+');
|
||||
match = standardUrlRegExA.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -149,7 +149,7 @@ class GitHub extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -52,7 +52,7 @@ class GitLab extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -88,62 +88,77 @@ bool _isNumeric(String s) {
|
||||
}
|
||||
|
||||
class HTML extends AppSource {
|
||||
var finalStepFormitems = [
|
||||
[
|
||||
GeneratedFormTextField('customLinkFilterRegex',
|
||||
label: tr('customLinkFilterRegex'),
|
||||
hint: 'download/(.*/)?(android|apk|mobile)',
|
||||
required: false,
|
||||
additionalValidators: [
|
||||
(value) {
|
||||
return regExValidator(value);
|
||||
}
|
||||
])
|
||||
],
|
||||
[
|
||||
GeneratedFormTextField('versionExtractionRegEx',
|
||||
label: tr('versionExtractionRegEx'),
|
||||
required: false,
|
||||
additionalValidators: [(value) => regExValidator(value)]),
|
||||
],
|
||||
[
|
||||
GeneratedFormTextField('matchGroupToUse',
|
||||
label: tr('matchGroupToUse'),
|
||||
required: false,
|
||||
hint: '0',
|
||||
textInputType: const TextInputType.numberWithOptions(),
|
||||
additionalValidators: [
|
||||
(value) {
|
||||
if (value?.isEmpty == true) {
|
||||
value = null;
|
||||
}
|
||||
value ??= '0';
|
||||
return intValidator(value);
|
||||
}
|
||||
])
|
||||
],
|
||||
[
|
||||
GeneratedFormSwitch('versionExtractWholePage',
|
||||
label: tr('versionExtractWholePage'))
|
||||
],
|
||||
[
|
||||
GeneratedFormSwitch('supportFixedAPKURL',
|
||||
defaultValue: true, label: tr('supportFixedAPKURL')),
|
||||
],
|
||||
];
|
||||
var commonFormItems = [
|
||||
[GeneratedFormSwitch('filterByLinkText', label: tr('filterByLinkText'))],
|
||||
[GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
|
||||
[GeneratedFormSwitch('reverseSort', label: tr('takeFirstLink'))],
|
||||
[
|
||||
GeneratedFormSwitch('sortByLastLinkSegment',
|
||||
label: tr('sortByLastLinkSegment'))
|
||||
],
|
||||
];
|
||||
var intermediateFormItems = [
|
||||
[
|
||||
GeneratedFormTextField('customLinkFilterRegex',
|
||||
label: tr('intermediateLinkRegex'),
|
||||
hint: '([0-9]+.)*[0-9]+/\$',
|
||||
required: true,
|
||||
additionalValidators: [(value) => regExValidator(value)])
|
||||
],
|
||||
];
|
||||
HTML() {
|
||||
additionalSourceAppSpecificSettingFormItems = [
|
||||
[
|
||||
GeneratedFormSwitch('sortByFileNamesNotLinks',
|
||||
label: tr('sortByFileNamesNotLinks'))
|
||||
GeneratedFormSubForm(
|
||||
'intermediateLink', [...intermediateFormItems, ...commonFormItems],
|
||||
label: tr('intermediateLink'))
|
||||
],
|
||||
[GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
|
||||
[GeneratedFormSwitch('reverseSort', label: tr('takeFirstLink'))],
|
||||
[
|
||||
GeneratedFormSwitch('supportFixedAPKURL',
|
||||
defaultValue: true, label: tr('supportFixedAPKURL')),
|
||||
],
|
||||
[
|
||||
GeneratedFormTextField('customLinkFilterRegex',
|
||||
label: tr('customLinkFilterRegex'),
|
||||
hint: 'download/(.*/)?(android|apk|mobile)',
|
||||
required: false,
|
||||
additionalValidators: [
|
||||
(value) {
|
||||
return regExValidator(value);
|
||||
}
|
||||
])
|
||||
],
|
||||
[
|
||||
GeneratedFormTextField('intermediateLinkRegex',
|
||||
label: tr('intermediateLinkRegex'),
|
||||
hint: '([0-9]+.)*[0-9]+/\$',
|
||||
required: false,
|
||||
additionalValidators: [(value) => regExValidator(value)])
|
||||
],
|
||||
[
|
||||
GeneratedFormTextField('versionExtractionRegEx',
|
||||
label: tr('versionExtractionRegEx'),
|
||||
required: false,
|
||||
additionalValidators: [(value) => regExValidator(value)]),
|
||||
],
|
||||
[
|
||||
GeneratedFormTextField('matchGroupToUse',
|
||||
label: tr('matchGroupToUse'),
|
||||
required: false,
|
||||
hint: '0',
|
||||
textInputType: const TextInputType.numberWithOptions(),
|
||||
additionalValidators: [
|
||||
(value) {
|
||||
if (value?.isEmpty == true) {
|
||||
value = null;
|
||||
}
|
||||
value ??= '0';
|
||||
return intValidator(value);
|
||||
}
|
||||
])
|
||||
],
|
||||
[
|
||||
GeneratedFormSwitch('versionExtractWholePage',
|
||||
label: tr('versionExtractWholePage'))
|
||||
]
|
||||
finalStepFormitems[0],
|
||||
...commonFormItems,
|
||||
...finalStepFormitems.sublist(1)
|
||||
];
|
||||
overrideVersionDetectionFormDefault('noVersionDetection',
|
||||
disableStandard: false, disableRelDate: true);
|
||||
@@ -164,107 +179,120 @@ class HTML extends AppSource {
|
||||
return url;
|
||||
}
|
||||
|
||||
// Given an HTTP response, grab some links according to the common additional settings
|
||||
// (those that apply to intermediate and final steps)
|
||||
Future<List<MapEntry<String, String>>> grabLinksCommon(
|
||||
Response res, Map<String, dynamic> additionalSettings) async {
|
||||
if (res.statusCode != 200) {
|
||||
throw getObtainiumHttpError(res);
|
||||
}
|
||||
var html = parse(res.body);
|
||||
List<MapEntry<String, String>> allLinks = html
|
||||
.querySelectorAll('a')
|
||||
.map((element) => MapEntry(
|
||||
element.attributes['href'] ?? '',
|
||||
element.text.isNotEmpty
|
||||
? element.text
|
||||
: (element.attributes['href'] ?? '').split('/').last))
|
||||
.where((element) => element.key.isNotEmpty)
|
||||
.toList();
|
||||
if (allLinks.isEmpty) {
|
||||
allLinks = RegExp(
|
||||
r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
|
||||
.allMatches(res.body)
|
||||
.map((match) =>
|
||||
MapEntry(match.group(0)!, match.group(0)?.split('/').last ?? ''))
|
||||
.toList();
|
||||
}
|
||||
List<MapEntry<String, String>> links = [];
|
||||
bool skipSort = additionalSettings['skipSort'] == true;
|
||||
bool filterLinkByText = additionalSettings['filterByLinkText'] == true;
|
||||
if ((additionalSettings['customLinkFilterRegex'] as String?)?.isNotEmpty ==
|
||||
true) {
|
||||
var reg = RegExp(additionalSettings['customLinkFilterRegex']);
|
||||
links = allLinks
|
||||
.where((element) =>
|
||||
reg.hasMatch(filterLinkByText ? element.value : element.key))
|
||||
.toList();
|
||||
} else {
|
||||
links = allLinks
|
||||
.where((element) =>
|
||||
Uri.parse(filterLinkByText ? element.value : element.key)
|
||||
.path
|
||||
.toLowerCase()
|
||||
.endsWith('.apk'))
|
||||
.toList();
|
||||
}
|
||||
if (!skipSort) {
|
||||
links.sort((a, b) => additionalSettings['sortByLastLinkSegment'] == true
|
||||
? compareAlphaNumeric(
|
||||
a.key.split('/').where((e) => e.isNotEmpty).last,
|
||||
b.key.split('/').where((e) => e.isNotEmpty).last)
|
||||
: compareAlphaNumeric(a.key, b.key));
|
||||
}
|
||||
if (additionalSettings['reverseSort'] == true) {
|
||||
links = links.reversed.toList();
|
||||
}
|
||||
return links;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<APKDetails> getLatestAPKDetails(
|
||||
String standardUrl,
|
||||
Map<String, dynamic> additionalSettings,
|
||||
) async {
|
||||
var uri = Uri.parse(standardUrl);
|
||||
Response res = await sourceRequest(standardUrl);
|
||||
if (res.statusCode == 200) {
|
||||
var html = parse(res.body);
|
||||
List<String> allLinks = html
|
||||
.querySelectorAll('a')
|
||||
.map((element) => element.attributes['href'] ?? '')
|
||||
.where((element) => element.isNotEmpty)
|
||||
.toList();
|
||||
if (allLinks.isEmpty) {
|
||||
allLinks = RegExp(
|
||||
r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
|
||||
.allMatches(res.body)
|
||||
.map((match) => match.group(0)!)
|
||||
.toList();
|
||||
}
|
||||
List<String> links = [];
|
||||
bool skipSort = additionalSettings['skipSort'] == true;
|
||||
if ((additionalSettings['intermediateLinkRegex'] as String?)
|
||||
?.isNotEmpty ==
|
||||
true) {
|
||||
var reg = RegExp(additionalSettings['intermediateLinkRegex']);
|
||||
links = allLinks.where((element) => reg.hasMatch(element)).toList();
|
||||
if (!skipSort) {
|
||||
links.sort((a, b) => compareAlphaNumeric(a, b));
|
||||
}
|
||||
if (links.isEmpty) {
|
||||
throw ObtainiumError(tr('intermediateLinkNotFound'));
|
||||
}
|
||||
Map<String, dynamic> additionalSettingsTemp =
|
||||
Map.from(additionalSettings);
|
||||
additionalSettingsTemp['intermediateLinkRegex'] = null;
|
||||
return getLatestAPKDetails(
|
||||
ensureAbsoluteUrl(links.last, uri), additionalSettingsTemp);
|
||||
}
|
||||
if ((additionalSettings['customLinkFilterRegex'] as String?)
|
||||
?.isNotEmpty ==
|
||||
true) {
|
||||
var reg = RegExp(additionalSettings['customLinkFilterRegex']);
|
||||
links = allLinks.where((element) => reg.hasMatch(element)).toList();
|
||||
} else {
|
||||
links = allLinks
|
||||
.where((element) =>
|
||||
Uri.parse(element).path.toLowerCase().endsWith('.apk'))
|
||||
.toList();
|
||||
}
|
||||
if (!skipSort) {
|
||||
links.sort((a, b) =>
|
||||
additionalSettings['sortByFileNamesNotLinks'] == true
|
||||
? compareAlphaNumeric(
|
||||
a.split('/').where((e) => e.isNotEmpty).last,
|
||||
b.split('/').where((e) => e.isNotEmpty).last)
|
||||
: compareAlphaNumeric(a, b));
|
||||
}
|
||||
if (additionalSettings['reverseSort'] == true) {
|
||||
links = links.reversed.toList();
|
||||
}
|
||||
if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty ==
|
||||
true) {
|
||||
var reg = RegExp(additionalSettings['apkFilterRegEx']);
|
||||
links = links.where((element) => reg.hasMatch(element)).toList();
|
||||
}
|
||||
if (links.isEmpty) {
|
||||
var currentUrl = standardUrl;
|
||||
for (int i = 0;
|
||||
i < (additionalSettings['intermediateLink']?.length ?? 0);
|
||||
i++) {
|
||||
var intLinks = await grabLinksCommon(await sourceRequest(currentUrl),
|
||||
additionalSettings['intermediateLink'][i]);
|
||||
if (intLinks.isEmpty) {
|
||||
throw NoReleasesError();
|
||||
} else {
|
||||
currentUrl = intLinks.last.key;
|
||||
}
|
||||
var rel = links.last;
|
||||
String? version;
|
||||
if (additionalSettings['supportFixedAPKURL'] != true) {
|
||||
version = rel.hashCode.toString();
|
||||
}
|
||||
var versionExtractionRegEx =
|
||||
additionalSettings['versionExtractionRegEx'] as String?;
|
||||
if (versionExtractionRegEx?.isNotEmpty == true) {
|
||||
var match = RegExp(versionExtractionRegEx!).allMatches(
|
||||
additionalSettings['versionExtractWholePage'] == true
|
||||
? res.body.split('\r\n').join('\n').split('\n').join('\\n')
|
||||
: rel);
|
||||
if (match.isEmpty) {
|
||||
throw NoVersionError();
|
||||
}
|
||||
String matchGroupString =
|
||||
(additionalSettings['matchGroupToUse'] as String).trim();
|
||||
if (matchGroupString.isEmpty) {
|
||||
matchGroupString = "0";
|
||||
}
|
||||
version = match.last.group(int.parse(matchGroupString));
|
||||
if (version?.isEmpty == true) {
|
||||
throw NoVersionError();
|
||||
}
|
||||
}
|
||||
rel = ensureAbsoluteUrl(rel, uri);
|
||||
version ??= (await checkDownloadHash(rel)).toString();
|
||||
return APKDetails(version, [rel].map((e) => MapEntry(e, e)).toList(),
|
||||
AppNames(uri.host, tr('app')));
|
||||
} else {
|
||||
throw getObtainiumHttpError(res);
|
||||
}
|
||||
|
||||
var uri = Uri.parse(currentUrl);
|
||||
Response res = await sourceRequest(currentUrl);
|
||||
var links = await grabLinksCommon(res, additionalSettings);
|
||||
|
||||
if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty == true) {
|
||||
var reg = RegExp(additionalSettings['apkFilterRegEx']);
|
||||
links = links.where((element) => reg.hasMatch(element.key)).toList();
|
||||
}
|
||||
if (links.isEmpty) {
|
||||
throw NoReleasesError();
|
||||
}
|
||||
var rel = links.last.key;
|
||||
String? version;
|
||||
if (additionalSettings['supportFixedAPKURL'] != true) {
|
||||
version = rel.hashCode.toString();
|
||||
}
|
||||
var versionExtractionRegEx =
|
||||
additionalSettings['versionExtractionRegEx'] as String?;
|
||||
if (versionExtractionRegEx?.isNotEmpty == true) {
|
||||
var match = RegExp(versionExtractionRegEx!).allMatches(
|
||||
additionalSettings['versionExtractWholePage'] == true
|
||||
? res.body.split('\r\n').join('\n').split('\n').join('\\n')
|
||||
: rel);
|
||||
if (match.isEmpty) {
|
||||
throw NoVersionError();
|
||||
}
|
||||
String matchGroupString =
|
||||
(additionalSettings['matchGroupToUse'] as String).trim();
|
||||
if (matchGroupString.isEmpty) {
|
||||
matchGroupString = "0";
|
||||
}
|
||||
version = match.last.group(int.parse(matchGroupString));
|
||||
if (version?.isEmpty == true) {
|
||||
throw NoVersionError();
|
||||
}
|
||||
}
|
||||
rel = ensureAbsoluteUrl(rel, uri);
|
||||
version ??= (await checkDownloadHash(rel)).toString();
|
||||
return APKDetails(version, [rel].map((e) => MapEntry(e, e)).toList(),
|
||||
AppNames(uri.host, tr('app')));
|
||||
}
|
||||
}
|
||||
|
@@ -13,7 +13,7 @@ class HuaweiAppGallery extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/app/[^/]+');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/app/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -11,7 +11,7 @@ class Mullvad extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -10,7 +10,8 @@ class NeutronCode extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
|
||||
RegExp standardUrlRegEx =
|
||||
RegExp('^https?://(www\\.)?$host/downloads/file/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -10,13 +10,14 @@ class SourceForge extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegExB = RegExp('^https?://$host/p/[^/]+');
|
||||
RegExp standardUrlRegExB = RegExp('^https?://(www\\.)?$host/p/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
|
||||
if (match != null) {
|
||||
url =
|
||||
'https://${Uri.parse(url.substring(0, match.end)).host}/projects/${url.substring(Uri.parse(url.substring(0, match.end)).host.length + '/projects/'.length + 1)}';
|
||||
}
|
||||
RegExp standardUrlRegExA = RegExp('^https?://$host/projects/[^/]+');
|
||||
RegExp standardUrlRegExA =
|
||||
RegExp('^https?://(www\\.)?$host/projects/[^/]+');
|
||||
match = standardUrlRegExA.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -20,7 +20,7 @@ class SourceHut extends AppSource {
|
||||
|
||||
@override
|
||||
String sourceSpecificStandardizeURL(String url) {
|
||||
RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
|
||||
RegExp standardUrlRegEx = RegExp('^https?://(www\\.)?$host/[^/]+/[^/]+');
|
||||
RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
|
||||
if (match == null) {
|
||||
throw InvalidURLError(name);
|
||||
|
@@ -6,6 +6,8 @@ import 'package:obtainium/providers/source_provider.dart';
|
||||
class WhatsApp extends AppSource {
|
||||
WhatsApp() {
|
||||
host = 'whatsapp.com';
|
||||
overrideVersionDetectionFormDefault('noVersionDetection',
|
||||
disableStandard: true, disableRelDate: true);
|
||||
}
|
||||
|
||||
@override
|
||||
|
@@ -4,6 +4,7 @@ import 'package:hsluv/hsluv.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:obtainium/components/generated_form_modal.dart';
|
||||
import 'package:obtainium/providers/source_provider.dart';
|
||||
|
||||
abstract class GeneratedFormItem {
|
||||
late String key;
|
||||
@@ -31,7 +32,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
|
||||
{super.label,
|
||||
super.belowWidgets,
|
||||
String super.defaultValue = '',
|
||||
List<String? Function(String? value)> super.additionalValidators = const [],
|
||||
List<String? Function(String? value)> super.additionalValidators =
|
||||
const [],
|
||||
this.required = true,
|
||||
this.max = 1,
|
||||
this.hint,
|
||||
@@ -117,6 +119,18 @@ class GeneratedForm extends StatefulWidget {
|
||||
State<GeneratedForm> createState() => _GeneratedFormState();
|
||||
}
|
||||
|
||||
class GeneratedFormSubForm extends GeneratedFormItem {
|
||||
final List<List<GeneratedFormItem>> items;
|
||||
|
||||
GeneratedFormSubForm(super.key, this.items,
|
||||
{super.label, super.belowWidgets, super.defaultValue});
|
||||
|
||||
@override
|
||||
ensureType(val) {
|
||||
return val; // Not easy to validate List<Map<String, dynamic>>
|
||||
}
|
||||
}
|
||||
|
||||
// Generates a color in the HSLuv (Pastel) color space
|
||||
// https://pub.dev/documentation/hsluv/latest/hsluv/Hsluv/hpluvToRgb.html
|
||||
Color generateRandomLightColor() {
|
||||
@@ -133,28 +147,39 @@ Color generateRandomLightColor() {
|
||||
return Color.fromARGB(255, rgbValues[0], rgbValues[1], rgbValues[2]);
|
||||
}
|
||||
|
||||
int generateRandomNumber(int seed1,
|
||||
{int seed2 = 0, int seed3 = 0, max = 10000}) {
|
||||
int combinedSeed = seed1.hashCode ^ seed2.hashCode ^ seed3.hashCode;
|
||||
Random random = Random(combinedSeed);
|
||||
int randomNumber = random.nextInt(max);
|
||||
return randomNumber;
|
||||
}
|
||||
|
||||
bool validateTextField(TextFormField tf) =>
|
||||
(tf.key as GlobalKey<FormFieldState>).currentState?.isValid == true;
|
||||
|
||||
class _GeneratedFormState extends State<GeneratedForm> {
|
||||
final _formKey = GlobalKey<FormState>();
|
||||
Map<String, dynamic> values = {};
|
||||
late List<List<Widget>> formInputs;
|
||||
List<List<Widget>> rows = [];
|
||||
String? initKey;
|
||||
int forceUpdateKeyCount = 0;
|
||||
|
||||
// If any value changes, call this to update the parent with value and validity
|
||||
void someValueChanged({bool isBuilding = false}) {
|
||||
void someValueChanged({bool isBuilding = false, bool forceInvalid = false}) {
|
||||
Map<String, dynamic> returnValues = values;
|
||||
var valid = true;
|
||||
for (int r = 0; r < widget.items.length; r++) {
|
||||
for (int i = 0; i < widget.items[r].length; i++) {
|
||||
if (formInputs[r][i] is TextFormField) {
|
||||
var fieldState =
|
||||
(formInputs[r][i].key as GlobalKey<FormFieldState>).currentState;
|
||||
if (fieldState != null) {
|
||||
valid = valid && fieldState.isValid;
|
||||
}
|
||||
valid = valid && validateTextField(formInputs[r][i] as TextFormField);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (forceInvalid) {
|
||||
valid = false;
|
||||
}
|
||||
widget.onValueChanges(returnValues, valid, isBuilding);
|
||||
}
|
||||
|
||||
@@ -229,6 +254,17 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
someValueChanged();
|
||||
});
|
||||
});
|
||||
} else if (formItem is GeneratedFormSubForm) {
|
||||
values[formItem.key] = [];
|
||||
for (Map<String, dynamic> v
|
||||
in ((formItem.defaultValue ?? []) as List<dynamic>)) {
|
||||
var fullDefaults = getDefaultValuesFromFormItems(formItem.items);
|
||||
for (var element in v.entries) {
|
||||
fullDefaults[element.key] = element.value;
|
||||
}
|
||||
values[formItem.key].add(fullDefaults);
|
||||
}
|
||||
return Container();
|
||||
} else {
|
||||
return Container(); // Some input types added in build
|
||||
}
|
||||
@@ -250,6 +286,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
}
|
||||
for (var r = 0; r < formInputs.length; r++) {
|
||||
for (var e = 0; e < formInputs[r].length; e++) {
|
||||
String fieldKey = widget.items[r][e].key;
|
||||
if (widget.items[r][e] is GeneratedFormSwitch) {
|
||||
formInputs[r][e] = Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
@@ -259,10 +296,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
width: 8,
|
||||
),
|
||||
Switch(
|
||||
value: values[widget.items[r][e].key],
|
||||
value: values[fieldKey],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
values[widget.items[r][e].key] = value;
|
||||
values[fieldKey] = value;
|
||||
someValueChanged();
|
||||
});
|
||||
})
|
||||
@@ -271,8 +308,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
} else if (widget.items[r][e] is GeneratedFormTagInput) {
|
||||
formInputs[r][e] =
|
||||
Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
|
||||
if ((values[widget.items[r][e].key]
|
||||
as Map<String, MapEntry<int, bool>>?)
|
||||
if ((values[fieldKey] as Map<String, MapEntry<int, bool>>?)
|
||||
?.isNotEmpty ==
|
||||
true &&
|
||||
(widget.items[r][e] as GeneratedFormTagInput)
|
||||
@@ -295,8 +331,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
(widget.items[r][e] as GeneratedFormTagInput).alignment,
|
||||
crossAxisAlignment: WrapCrossAlignment.center,
|
||||
children: [
|
||||
(values[widget.items[r][e].key]
|
||||
as Map<String, MapEntry<int, bool>>?)
|
||||
(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
|
||||
?.isEmpty ==
|
||||
true
|
||||
? Text(
|
||||
@@ -304,8 +339,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
.emptyMessage,
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
...(values[widget.items[r][e].key]
|
||||
as Map<String, MapEntry<int, bool>>?)
|
||||
...(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
|
||||
?.entries
|
||||
.map((e2) {
|
||||
return Padding(
|
||||
@@ -318,11 +352,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
selected: e2.value.value,
|
||||
onSelected: (value) {
|
||||
setState(() {
|
||||
(values[widget.items[r][e].key] as Map<String,
|
||||
(values[fieldKey] as Map<String,
|
||||
MapEntry<int, bool>>)[e2.key] =
|
||||
MapEntry(
|
||||
(values[widget.items[r][e].key] as Map<
|
||||
String,
|
||||
(values[fieldKey] as Map<String,
|
||||
MapEntry<int, bool>>)[e2.key]!
|
||||
.key,
|
||||
value);
|
||||
@@ -330,22 +363,18 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
as GeneratedFormTagInput)
|
||||
.singleSelect &&
|
||||
value == true) {
|
||||
for (var key in (values[
|
||||
widget.items[r][e].key]
|
||||
for (var key in (values[fieldKey]
|
||||
as Map<String, MapEntry<int, bool>>)
|
||||
.keys) {
|
||||
if (key != e2.key) {
|
||||
(values[widget.items[r][e].key] as Map<
|
||||
String,
|
||||
MapEntry<int, bool>>)[key] =
|
||||
MapEntry(
|
||||
(values[widget.items[r][e].key]
|
||||
as Map<
|
||||
String,
|
||||
MapEntry<int,
|
||||
bool>>)[key]!
|
||||
.key,
|
||||
false);
|
||||
(values[fieldKey] as Map<
|
||||
String,
|
||||
MapEntry<int,
|
||||
bool>>)[key] = MapEntry(
|
||||
(values[fieldKey] as Map<String,
|
||||
MapEntry<int, bool>>)[key]!
|
||||
.key,
|
||||
false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -355,8 +384,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
));
|
||||
}) ??
|
||||
[const SizedBox.shrink()],
|
||||
(values[widget.items[r][e].key]
|
||||
as Map<String, MapEntry<int, bool>>?)
|
||||
(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
|
||||
?.values
|
||||
.where((e) => e.value)
|
||||
.length ==
|
||||
@@ -366,7 +394,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
child: IconButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var temp = values[widget.items[r][e].key]
|
||||
var temp = values[fieldKey]
|
||||
as Map<String, MapEntry<int, bool>>;
|
||||
// get selected category str where bool is true
|
||||
final oldEntry = temp.entries
|
||||
@@ -379,7 +407,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
// Update entry with new color, remain selected
|
||||
temp.update(oldEntry.key,
|
||||
(old) => MapEntry(newColor, old.value));
|
||||
values[widget.items[r][e].key] = temp;
|
||||
values[fieldKey] = temp;
|
||||
someValueChanged();
|
||||
});
|
||||
},
|
||||
@@ -388,8 +416,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
tooltip: tr('colour'),
|
||||
))
|
||||
: const SizedBox.shrink(),
|
||||
(values[widget.items[r][e].key]
|
||||
as Map<String, MapEntry<int, bool>>?)
|
||||
(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
|
||||
?.values
|
||||
.where((e) => e.value)
|
||||
.isNotEmpty ==
|
||||
@@ -400,10 +427,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
onPressed: () {
|
||||
fn() {
|
||||
setState(() {
|
||||
var temp = values[widget.items[r][e].key]
|
||||
var temp = values[fieldKey]
|
||||
as Map<String, MapEntry<int, bool>>;
|
||||
temp.removeWhere((key, value) => value.value);
|
||||
values[widget.items[r][e].key] = temp;
|
||||
values[fieldKey] = temp;
|
||||
someValueChanged();
|
||||
});
|
||||
}
|
||||
@@ -454,7 +481,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
String? label = value?['label'];
|
||||
if (label != null) {
|
||||
setState(() {
|
||||
var temp = values[widget.items[r][e].key]
|
||||
var temp = values[fieldKey]
|
||||
as Map<String, MapEntry<int, bool>>?;
|
||||
temp ??= {};
|
||||
if (temp[label] == null) {
|
||||
@@ -467,7 +494,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
temp[label] = MapEntry(
|
||||
generateRandomLightColor().value,
|
||||
!(someSelected && singleSelect));
|
||||
values[widget.items[r][e].key] = temp;
|
||||
values[fieldKey] = temp;
|
||||
someValueChanged();
|
||||
}
|
||||
});
|
||||
@@ -481,6 +508,93 @@ class _GeneratedFormState extends State<GeneratedForm> {
|
||||
],
|
||||
)
|
||||
]);
|
||||
} else if (widget.items[r][e] is GeneratedFormSubForm) {
|
||||
List<Widget> subformColumn = [];
|
||||
for (int i = 0; i < values[fieldKey].length; i++) {
|
||||
var items = (widget.items[r][e] as GeneratedFormSubForm)
|
||||
.items
|
||||
.map((x) => x.map((y) {
|
||||
y.defaultValue = values[fieldKey]?[i]?[y.key];
|
||||
return y;
|
||||
}).toList())
|
||||
.toList();
|
||||
var internalFormKey = ValueKey(generateRandomNumber(
|
||||
values[fieldKey].length,
|
||||
seed2: i,
|
||||
seed3: forceUpdateKeyCount));
|
||||
subformColumn.add(Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Divider(),
|
||||
const SizedBox(
|
||||
height: 16,
|
||||
),
|
||||
Text(
|
||||
'${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
|
||||
style: const TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
GeneratedForm(
|
||||
key: internalFormKey,
|
||||
items: items,
|
||||
onValueChanges: (values, valid, isBuilding) {
|
||||
if (valid) {
|
||||
this.values[fieldKey]?[i] = values;
|
||||
}
|
||||
someValueChanged(
|
||||
isBuilding: isBuilding, forceInvalid: !valid);
|
||||
},
|
||||
),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
TextButton.icon(
|
||||
style: TextButton.styleFrom(
|
||||
foregroundColor:
|
||||
Theme.of(context).colorScheme.error),
|
||||
onPressed: (values[fieldKey].length > 0)
|
||||
? () {
|
||||
var temp = List.from(values[fieldKey]);
|
||||
temp.removeAt(i);
|
||||
values[fieldKey] = List.from(temp);
|
||||
forceUpdateKeyCount++;
|
||||
someValueChanged();
|
||||
}
|
||||
: null,
|
||||
label: Text(
|
||||
'${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
|
||||
),
|
||||
icon: const Icon(
|
||||
Icons.delete_outline_rounded,
|
||||
))
|
||||
],
|
||||
),
|
||||
],
|
||||
));
|
||||
}
|
||||
subformColumn.add(Padding(
|
||||
padding: EdgeInsets.only(
|
||||
bottom: values[fieldKey].length > 0 ? 24 : 0, top: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: ElevatedButton.icon(
|
||||
onPressed: () {
|
||||
values[fieldKey].add(getDefaultValuesFromFormItems(
|
||||
(widget.items[r][e] as GeneratedFormSubForm)
|
||||
.items));
|
||||
forceUpdateKeyCount++;
|
||||
someValueChanged();
|
||||
},
|
||||
icon: const Icon(Icons.add),
|
||||
label: Text((widget.items[r][e] as GeneratedFormSubForm)
|
||||
.label))),
|
||||
],
|
||||
),
|
||||
));
|
||||
if (values[fieldKey].length > 0) {
|
||||
subformColumn.add(const Divider());
|
||||
}
|
||||
formInputs[r][e] = Column(children: subformColumn);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -13,14 +13,14 @@ import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:dynamic_color/dynamic_color.dart';
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
|
||||
import 'package:background_fetch/background_fetch.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
// ignore: implementation_imports
|
||||
import 'package:easy_localization/src/easy_localization_controller.dart';
|
||||
// ignore: implementation_imports
|
||||
import 'package:easy_localization/src/localization.dart';
|
||||
|
||||
const String currentVersion = '0.14.41';
|
||||
const String currentVersion = '0.15.3';
|
||||
const String currentReleaseTag =
|
||||
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
|
||||
|
||||
@@ -77,6 +77,19 @@ Future<void> loadTranslations() async {
|
||||
fallbackTranslations: controller.fallbackTranslations);
|
||||
}
|
||||
|
||||
@pragma('vm:entry-point')
|
||||
void backgroundFetchHeadlessTask(HeadlessTask task) async {
|
||||
String taskId = task.taskId;
|
||||
bool isTimeout = task.timeout;
|
||||
if (isTimeout) {
|
||||
print('BG update task timed out.');
|
||||
BackgroundFetch.finish(taskId);
|
||||
return;
|
||||
}
|
||||
await bgUpdateCheck(taskId, null);
|
||||
BackgroundFetch.finish(taskId);
|
||||
}
|
||||
|
||||
void main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
try {
|
||||
@@ -94,7 +107,6 @@ void main() async {
|
||||
);
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
}
|
||||
await AndroidAlarmManager.initialize();
|
||||
runApp(MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider(create: (context) => AppsProvider()),
|
||||
@@ -109,6 +121,7 @@ void main() async {
|
||||
useOnlyLangCode: true,
|
||||
child: const Obtainium()),
|
||||
));
|
||||
BackgroundFetch.registerHeadlessTask(backgroundFetchHeadlessTask);
|
||||
}
|
||||
|
||||
var defaultThemeColour = Colors.deepPurple;
|
||||
@@ -123,6 +136,32 @@ class Obtainium extends StatefulWidget {
|
||||
class _ObtainiumState extends State<Obtainium> {
|
||||
var existingUpdateInterval = -1;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
initPlatformState();
|
||||
}
|
||||
|
||||
Future<void> initPlatformState() async {
|
||||
await BackgroundFetch.configure(
|
||||
BackgroundFetchConfig(
|
||||
minimumFetchInterval: 15,
|
||||
stopOnTerminate: false,
|
||||
enableHeadless: true,
|
||||
requiresBatteryNotLow: false,
|
||||
requiresCharging: false,
|
||||
requiresStorageNotLow: false,
|
||||
requiresDeviceIdle: false,
|
||||
requiredNetworkType: NetworkType.ANY), (String taskId) async {
|
||||
await bgUpdateCheck(taskId, null);
|
||||
BackgroundFetch.finish(taskId);
|
||||
}, (String taskId) async {
|
||||
context.read<LogsProvider>().add('BG update task timed out.');
|
||||
BackgroundFetch.finish(taskId);
|
||||
});
|
||||
if (!mounted) return;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
SettingsProvider settingsProvider = context.watch<SettingsProvider>();
|
||||
@@ -162,30 +201,6 @@ class _ObtainiumState extends State<Obtainium> {
|
||||
context.locale.languageCode)) {
|
||||
settingsProvider.resetLocaleSafe(context);
|
||||
}
|
||||
// Register the background update task according to the user's setting
|
||||
var actualUpdateInterval = settingsProvider.updateInterval;
|
||||
if (existingUpdateInterval != actualUpdateInterval) {
|
||||
if (actualUpdateInterval == 0) {
|
||||
AndroidAlarmManager.cancel(bgUpdateCheckAlarmId);
|
||||
} else {
|
||||
var settingChanged = existingUpdateInterval != -1;
|
||||
var lastCheckWasTooLongAgo = actualUpdateInterval != 0 &&
|
||||
settingsProvider.lastBGCheckTime
|
||||
.add(Duration(minutes: actualUpdateInterval + 60))
|
||||
.isBefore(DateTime.now());
|
||||
if (settingChanged || lastCheckWasTooLongAgo) {
|
||||
logs.add(
|
||||
'Update interval was set to ${actualUpdateInterval.toString()} (reason: ${settingChanged ? 'setting changed' : 'last check was ${settingsProvider.lastBGCheckTime.toLocal().toString()}'}).');
|
||||
AndroidAlarmManager.periodic(
|
||||
Duration(minutes: actualUpdateInterval),
|
||||
bgUpdateCheckAlarmId,
|
||||
bgUpdateCheck,
|
||||
rescheduleOnReboot: true,
|
||||
wakeup: true);
|
||||
}
|
||||
}
|
||||
existingUpdateInterval = actualUpdateInterval;
|
||||
}
|
||||
settingsProvider.addListener(() async {
|
||||
if (settingsProvider.tryUseSystemFont &&
|
||||
settingsProvider.appFont == "Metropolis") {
|
||||
|
@@ -286,10 +286,14 @@ class AddAppPageState extends State<AddAppPage> {
|
||||
selectedByDefault: true,
|
||||
onlyOneSelectionAllowed: false,
|
||||
titlesAreLinks: false,
|
||||
deselectThese: settingsProvider.searchDeselected,
|
||||
);
|
||||
}) ??
|
||||
[];
|
||||
if (searchSources.isNotEmpty) {
|
||||
settingsProvider.searchDeselected = sourceStrings.keys
|
||||
.where((s) => !searchSources.contains(s))
|
||||
.toList();
|
||||
var results = await Future.wait(sourceProvider.sources
|
||||
.where((e) => searchSources.contains(e.name))
|
||||
.map((e) async {
|
||||
@@ -306,7 +310,6 @@ class AddAppPageState extends State<AddAppPage> {
|
||||
}
|
||||
}));
|
||||
|
||||
// .then((results) async {
|
||||
// Interleave results instead of simple reduce
|
||||
Map<String, List<String>> res = {};
|
||||
var si = 0;
|
||||
|
@@ -604,11 +604,13 @@ class SelectionModal extends StatefulWidget {
|
||||
this.selectedByDefault = true,
|
||||
this.onlyOneSelectionAllowed = false,
|
||||
this.titlesAreLinks = true,
|
||||
this.title});
|
||||
this.title,
|
||||
this.deselectThese = const []});
|
||||
|
||||
String? title;
|
||||
Map<String, List<String>> entries;
|
||||
bool selectedByDefault;
|
||||
List<String> deselectThese;
|
||||
bool onlyOneSelectionAllowed;
|
||||
bool titlesAreLinks;
|
||||
|
||||
@@ -622,9 +624,13 @@ class _SelectionModalState extends State<SelectionModal> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
for (var url in widget.entries.entries) {
|
||||
entrySelections.putIfAbsent(url,
|
||||
() => widget.selectedByDefault && !widget.onlyOneSelectionAllowed);
|
||||
for (var entry in widget.entries.entries) {
|
||||
entrySelections.putIfAbsent(
|
||||
entry,
|
||||
() =>
|
||||
widget.selectedByDefault &&
|
||||
!widget.onlyOneSelectionAllowed &&
|
||||
!widget.deselectThese.contains(entry.key));
|
||||
}
|
||||
if (widget.selectedByDefault && widget.onlyOneSelectionAllowed) {
|
||||
selectOnlyOne(widget.entries.entries.first.key);
|
||||
|
@@ -1,4 +1,3 @@
|
||||
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -619,38 +618,35 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||
const Divider(
|
||||
height: 32,
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
|
||||
child: Column(children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Flexible(child: Text(tr('debugMenu'))),
|
||||
Switch(
|
||||
value: settingsProvider.showDebugOpts,
|
||||
onChanged: (value) {
|
||||
settingsProvider.showDebugOpts = value;
|
||||
})
|
||||
],
|
||||
),
|
||||
if (settingsProvider.showDebugOpts)
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
height16,
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
AndroidAlarmManager.oneShot(
|
||||
const Duration(seconds: 0),
|
||||
bgUpdateCheckAlarmId + 200,
|
||||
bgUpdateCheck);
|
||||
showMessage(tr('bgTaskStarted'), context);
|
||||
},
|
||||
child: Text(tr('runBgCheckNow')))
|
||||
],
|
||||
),
|
||||
]),
|
||||
),
|
||||
// Padding(
|
||||
// padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
|
||||
// child: Column(children: [
|
||||
// Row(
|
||||
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
// children: [
|
||||
// Flexible(child: Text(tr('debugMenu'))),
|
||||
// Switch(
|
||||
// value: settingsProvider.showDebugOpts,
|
||||
// onChanged: (value) {
|
||||
// settingsProvider.showDebugOpts = value;
|
||||
// })
|
||||
// ],
|
||||
// ),
|
||||
// if (settingsProvider.showDebugOpts)
|
||||
// Column(
|
||||
// crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
// children: [
|
||||
// height16,
|
||||
// TextButton(
|
||||
// onPressed: () {
|
||||
// bgUpdateCheck('taskId', null);
|
||||
// showMessage(tr('bgTaskStarted'), context);
|
||||
// },
|
||||
// child: Text(tr('runBgCheckNow')))
|
||||
// ],
|
||||
// ),
|
||||
// ]),
|
||||
// ),
|
||||
],
|
||||
),
|
||||
)
|
||||
|
@@ -8,7 +8,6 @@ import 'dart:math';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:crypto/crypto.dart';
|
||||
|
||||
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
|
||||
import 'package:android_intent_plus/flag.dart';
|
||||
import 'package:android_package_installer/android_package_installer.dart';
|
||||
import 'package:android_package_manager/android_package_manager.dart';
|
||||
@@ -621,7 +620,8 @@ class AppsProvider with ChangeNotifier {
|
||||
// Returns an array of Ids for Apps that were successfully downloaded, regardless of installation result
|
||||
Future<List<String>> downloadAndInstallLatestApps(
|
||||
List<String> appIds, BuildContext? context,
|
||||
{NotificationsProvider? notificationsProvider}) async {
|
||||
{NotificationsProvider? notificationsProvider,
|
||||
bool forceParallelDownloads = false}) async {
|
||||
notificationsProvider =
|
||||
notificationsProvider ?? context?.read<NotificationsProvider>();
|
||||
List<String> appsToInstall = [];
|
||||
@@ -742,7 +742,7 @@ class AppsProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
if (!settingsProvider.parallelDownloads) {
|
||||
if (forceParallelDownloads || !settingsProvider.parallelDownloads) {
|
||||
for (var id in appsToInstall) {
|
||||
await updateFn(id);
|
||||
}
|
||||
@@ -1448,19 +1448,17 @@ class _APKOriginWarningDialogState extends State<APKOriginWarningDialog> {
|
||||
/// When toCheck is empty, the function is in "install mode" (else it is in "update mode").
|
||||
/// In update mode, all apps in toCheck are checked for updates (in parallel).
|
||||
/// If an update is available and it cannot be installed silently, the user is notified of the available update.
|
||||
/// If there are any errors, the task is run again for the remaining apps after a few minutes (based on the error with the longest retry interval).
|
||||
/// Any app that has reached it's retry limit, the user is notified that it could not be checked.
|
||||
/// If there are any errors, we recursively call the same function with retry count for the relevant apps decremented (if zero, the user is notified).
|
||||
///
|
||||
/// Once all update checks are complete, the task is run again in install mode.
|
||||
/// In this mode, all pending silent updates are downloaded and installed in the background (serially - one at a time).
|
||||
/// If there is an error, the offending app is moved to the back of the line of remaining apps, and the task is retried.
|
||||
/// If an app repeatedly fails to install up to its retry limit, the user is notified.
|
||||
/// In this mode, all pending silent updates are downloaded (in parallel) and installed in the background.
|
||||
/// If there is an error, the user is notified.
|
||||
///
|
||||
@pragma('vm:entry-point')
|
||||
Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
Future<void> bgUpdateCheck(String taskId, Map<String, dynamic>? params) async {
|
||||
// ignore: avoid_print
|
||||
print('Started $taskId: ${params.toString()}');
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
await EasyLocalization.ensureInitialized();
|
||||
await AndroidAlarmManager.initialize();
|
||||
await loadTranslations();
|
||||
|
||||
LogsProvider logs = LogsProvider();
|
||||
@@ -1469,11 +1467,20 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
await appsProvider.loadApps();
|
||||
|
||||
int maxAttempts = 4;
|
||||
int maxRetryWaitSeconds = 5;
|
||||
|
||||
var netResult = await (Connectivity().checkConnectivity());
|
||||
if (netResult == ConnectivityResult.none) {
|
||||
logs.add('BG update task: No network.');
|
||||
return;
|
||||
}
|
||||
|
||||
params ??= {};
|
||||
if (params['toCheck'] == null) {
|
||||
appsProvider.settingsProvider.lastBGCheckTime = DateTime.now();
|
||||
}
|
||||
|
||||
bool firstEverUpdateTask = DateTime.fromMillisecondsSinceEpoch(0)
|
||||
.compareTo(appsProvider.settingsProvider.lastCompletedBGCheckTime) ==
|
||||
0;
|
||||
|
||||
List<MapEntry<String, int>> toCheck = <MapEntry<String, int>>[
|
||||
...(params['toCheck']
|
||||
?.map((entry) => MapEntry<String, int>(
|
||||
@@ -1481,6 +1488,11 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
.toList() ??
|
||||
appsProvider
|
||||
.getAppsSortedByUpdateCheckTime(
|
||||
ignoreAppsCheckedAfter: params['toCheck'] == null
|
||||
? firstEverUpdateTask
|
||||
? null
|
||||
: appsProvider.settingsProvider.lastCompletedBGCheckTime
|
||||
: null,
|
||||
onlyCheckInstalledOrTrackOnlyApps: appsProvider
|
||||
.settingsProvider.onlyCheckInstalledOrTrackOnlyApps)
|
||||
.map((e) => MapEntry(e, 0)))
|
||||
@@ -1493,51 +1505,34 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
(<List<MapEntry<String, int>>>[]))
|
||||
];
|
||||
|
||||
var netResult = await (Connectivity().checkConnectivity());
|
||||
|
||||
if (netResult == ConnectivityResult.none) {
|
||||
var networkBasedRetryInterval = 15;
|
||||
var nextRegularCheck = appsProvider.settingsProvider.lastBGCheckTime
|
||||
.add(Duration(minutes: appsProvider.settingsProvider.updateInterval));
|
||||
var potentialNetworkRetryCheck =
|
||||
DateTime.now().add(Duration(minutes: networkBasedRetryInterval));
|
||||
var shouldRetry = potentialNetworkRetryCheck.isBefore(nextRegularCheck);
|
||||
logs.add(
|
||||
'BG update task $taskId: No network. Will ${shouldRetry ? 'retry in $networkBasedRetryInterval minutes' : 'not retry'}.');
|
||||
AndroidAlarmManager.oneShot(
|
||||
const Duration(minutes: 15), taskId + 1, bgUpdateCheck,
|
||||
params: {
|
||||
'toCheck': toCheck
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
'toInstall': toInstall
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
var networkRestricted = false;
|
||||
if (appsProvider.settingsProvider.bgUpdatesOnWiFiOnly) {
|
||||
networkRestricted = (netResult != ConnectivityResult.wifi) &&
|
||||
(netResult != ConnectivityResult.ethernet);
|
||||
}
|
||||
|
||||
bool installMode =
|
||||
toCheck.isEmpty; // Task is either in update mode or install mode
|
||||
|
||||
logs.add(
|
||||
'BG ${installMode ? 'install' : 'update'} task $taskId: Started (${installMode ? toInstall.length : toCheck.length}).');
|
||||
|
||||
if (!installMode) {
|
||||
if (toCheck.isNotEmpty) {
|
||||
// Task is either in update mode or install mode
|
||||
// If in update mode, we check for updates.
|
||||
// We divide the results into 4 groups:
|
||||
// - toNotify - Apps with updates that the user will be notified about (can't be silently installed)
|
||||
// - toRetry - Apps with update check errors that will be retried in a while
|
||||
// - toThrow - Apps with update check errors that the user will be notified about (no retry)
|
||||
// After grouping the updates, we take care of toNotify and toThrow first
|
||||
// Then if toRetry is not empty, we schedule another update task to run in a while
|
||||
// If toRetry is empty, we take care of schedule another task that will run in install mode (toCheck is empty)
|
||||
// Then we run the function again in install mode (toCheck is empty)
|
||||
|
||||
var enoughTimePassed = appsProvider.settingsProvider.updateInterval != 0 &&
|
||||
appsProvider.settingsProvider.lastCompletedBGCheckTime
|
||||
.add(
|
||||
Duration(minutes: appsProvider.settingsProvider.updateInterval))
|
||||
.isBefore(DateTime.now());
|
||||
if (!enoughTimePassed) {
|
||||
// ignore: avoid_print
|
||||
print(
|
||||
'BG update task: Too early for another check (last check was ${appsProvider.settingsProvider.lastCompletedBGCheckTime.toIso8601String()}, interval is ${appsProvider.settingsProvider.updateInterval}).');
|
||||
return;
|
||||
}
|
||||
|
||||
logs.add('BG update task: Started (${toCheck.length}).');
|
||||
|
||||
// Init. vars.
|
||||
List<App> updates = []; // All updates found (silent and non-silent)
|
||||
@@ -1545,8 +1540,7 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
[]; // All non-silent updates that the user will be notified about
|
||||
List<MapEntry<String, int>> toRetry =
|
||||
[]; // All apps that got errors while checking
|
||||
var retryAfterXSeconds =
|
||||
0; // How long to wait until the next attempt (if there are errors)
|
||||
var retryAfterXSeconds = 0;
|
||||
MultiAppMultiError?
|
||||
errors; // All errors including those that will lead to a retry
|
||||
MultiAppMultiError toThrow =
|
||||
@@ -1569,27 +1563,32 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
specificIds: toCheck.map((e) => e.key).toList(),
|
||||
sp: appsProvider.settingsProvider);
|
||||
} catch (e) {
|
||||
// If there were errors, group them into toRetry and toThrow based on max retry count per app
|
||||
if (e is Map) {
|
||||
updates = e['updates'];
|
||||
errors = e['errors'];
|
||||
errors!.rawErrors.forEach((key, err) {
|
||||
logs.add(
|
||||
'BG update task $taskId: Got error on checking for $key \'${err.toString()}\'.');
|
||||
'BG update task: Got error on checking for $key \'${err.toString()}\'.');
|
||||
|
||||
var toCheckApp = toCheck.where((element) => element.key == key).first;
|
||||
if (toCheckApp.value < maxAttempts) {
|
||||
toRetry.add(MapEntry(toCheckApp.key, toCheckApp.value + 1));
|
||||
// Next task interval is based on the error with the longest retry time
|
||||
var minRetryIntervalForThisApp = err is RateLimitError
|
||||
int minRetryIntervalForThisApp = err is RateLimitError
|
||||
? (err.remainingMinutes * 60)
|
||||
: e is ClientException
|
||||
? (15 * 60)
|
||||
: pow(toCheckApp.value + 1, 2).toInt();
|
||||
: (toCheckApp.value + 1);
|
||||
if (minRetryIntervalForThisApp > maxRetryWaitSeconds) {
|
||||
minRetryIntervalForThisApp = maxRetryWaitSeconds;
|
||||
}
|
||||
if (minRetryIntervalForThisApp > retryAfterXSeconds) {
|
||||
retryAfterXSeconds = minRetryIntervalForThisApp;
|
||||
}
|
||||
} else {
|
||||
toThrow.add(key, err, appName: errors?.appIdNames[key]);
|
||||
if (err is! RateLimitError) {
|
||||
toThrow.add(key, err, appName: errors?.appIdNames[key]);
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -1624,37 +1623,32 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
id: Random().nextInt(10000)));
|
||||
}
|
||||
}
|
||||
|
||||
// if there are update checks to retry, schedule a retry task
|
||||
logs.add('BG update task: Done checking for updates.');
|
||||
if (toRetry.isNotEmpty) {
|
||||
logs.add(
|
||||
'BG update task $taskId: Will retry in $retryAfterXSeconds seconds.');
|
||||
AndroidAlarmManager.oneShot(
|
||||
Duration(seconds: retryAfterXSeconds), taskId + 1, bgUpdateCheck,
|
||||
params: {
|
||||
'toCheck': toRetry
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
'toInstall': toInstall
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
});
|
||||
return await bgUpdateCheck(taskId, {
|
||||
'toCheck': toRetry
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
'toInstall': toInstall
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
});
|
||||
} else {
|
||||
// If there are no more update checks, schedule an install task
|
||||
logs.add(
|
||||
'BG update task $taskId: Done. Scheduling install task to run immediately.');
|
||||
AndroidAlarmManager.oneShot(
|
||||
const Duration(minutes: 0), taskId + 1, bgUpdateCheck,
|
||||
params: {
|
||||
'toCheck': [],
|
||||
'toInstall': toInstall
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList()
|
||||
});
|
||||
// If there are no more update checks, call the function in install mode
|
||||
logs.add('BG update task: Done checking for updates.');
|
||||
return await bgUpdateCheck(taskId, {
|
||||
'toCheck': [],
|
||||
'toInstall': toInstall
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList()
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// In install mode...
|
||||
// If you haven't explicitly been given updates to install (which is the case for new tasks), grab all available silent updates
|
||||
// If you haven't explicitly been given updates to install, grab all available silent updates
|
||||
if (toInstall.isEmpty && !networkRestricted) {
|
||||
var temp = appsProvider.findExistingUpdates(installedOnly: true);
|
||||
for (var i = 0; i < temp.length; i++) {
|
||||
@@ -1664,60 +1658,34 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
|
||||
}
|
||||
}
|
||||
}
|
||||
var didCompleteInstalling = false;
|
||||
var tempObtArr = toInstall.where((element) => element.key == obtainiumId);
|
||||
if (tempObtArr.isNotEmpty) {
|
||||
// Move obtainium to the end of the list as it must always install last
|
||||
var obt = tempObtArr.first;
|
||||
toInstall = moveStrToEndMapEntryWithCount(toInstall, obt);
|
||||
}
|
||||
// Loop through all updates and install each
|
||||
for (var i = 0; i < toInstall.length; i++) {
|
||||
var appId = toInstall[i].key;
|
||||
var retryCount = toInstall[i].value;
|
||||
if (toInstall.isNotEmpty) {
|
||||
logs.add('BG install task: Started (${toInstall.length}).');
|
||||
var tempObtArr = toInstall.where((element) => element.key == obtainiumId);
|
||||
if (tempObtArr.isNotEmpty) {
|
||||
// Move obtainium to the end of the list as it must always install last
|
||||
var obt = tempObtArr.first;
|
||||
toInstall = moveStrToEndMapEntryWithCount(toInstall, obt);
|
||||
}
|
||||
// Loop through all updates and install each
|
||||
try {
|
||||
logs.add(
|
||||
'BG install task $taskId: Attempting to update $appId in the background.');
|
||||
await appsProvider.downloadAndInstallLatestApps([appId], null,
|
||||
notificationsProvider: notificationsProvider);
|
||||
await Future.delayed(const Duration(
|
||||
seconds:
|
||||
5)); // Just in case task ending causes install fail (not clear)
|
||||
if (i == (toCheck.length - 1)) {
|
||||
didCompleteInstalling = true;
|
||||
}
|
||||
await appsProvider.downloadAndInstallLatestApps(
|
||||
toInstall.map((e) => e.key).toList(), null,
|
||||
notificationsProvider: notificationsProvider,
|
||||
forceParallelDownloads: true);
|
||||
} catch (e) {
|
||||
// If you got an error, move the offender to the back of the line (increment their fail count) and schedule another task to continue installing shortly
|
||||
logs.add(
|
||||
'BG install task $taskId: Got error on updating $appId \'${e.toString()}\'.');
|
||||
if (retryCount < maxAttempts) {
|
||||
var remainingSeconds = retryCount;
|
||||
logs.add(
|
||||
'BG install task $taskId: Will continue in $remainingSeconds seconds (with $appId moved to the end of the line).');
|
||||
var remainingToInstall = moveStrToEndMapEntryWithCount(
|
||||
toInstall.sublist(i), MapEntry(appId, retryCount + 1));
|
||||
AndroidAlarmManager.oneShot(
|
||||
Duration(seconds: remainingSeconds), taskId + 1, bgUpdateCheck,
|
||||
params: {
|
||||
'toCheck': toCheck
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
'toInstall': remainingToInstall
|
||||
.map((entry) => {'key': entry.key, 'value': entry.value})
|
||||
.toList(),
|
||||
});
|
||||
break;
|
||||
if (e is MultiAppMultiError) {
|
||||
e.idsByErrorString.forEach((key, value) {
|
||||
notificationsProvider.notify(ErrorCheckingUpdatesNotification(
|
||||
e.errorsAppsString(key, value)));
|
||||
});
|
||||
} else {
|
||||
// If the offender has reached its fail limit, notify the user and remove it from the list (task can continue)
|
||||
toInstall.removeAt(i);
|
||||
i--;
|
||||
notificationsProvider
|
||||
.notify(ErrorCheckingUpdatesNotification(e.toString()));
|
||||
// We don't expect to ever get here in any situation so no need to catch (but log it in case)
|
||||
logs.add('Fatal error in BG install task: ${e.toString()}');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (didCompleteInstalling || toInstall.isEmpty) {
|
||||
logs.add('BG install task $taskId: Done.');
|
||||
logs.add('BG install task: Done installing updates.');
|
||||
}
|
||||
}
|
||||
appsProvider.settingsProvider.lastCompletedBGCheckTime = DateTime.now();
|
||||
}
|
||||
|
@@ -70,8 +70,8 @@ class SettingsProvider with ChangeNotifier {
|
||||
}
|
||||
|
||||
InstallMethodSettings get installMethod {
|
||||
return InstallMethodSettings
|
||||
.values[prefs?.getInt('installMethod') ?? InstallMethodSettings.normal.index];
|
||||
return InstallMethodSettings.values[
|
||||
prefs?.getInt('installMethod') ?? InstallMethodSettings.normal.index];
|
||||
}
|
||||
|
||||
set installMethod(InstallMethodSettings t) {
|
||||
@@ -363,15 +363,15 @@ class SettingsProvider with ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
DateTime get lastBGCheckTime {
|
||||
int? temp = prefs?.getInt('lastBGCheckTime');
|
||||
DateTime get lastCompletedBGCheckTime {
|
||||
int? temp = prefs?.getInt('lastCompletedBGCheckTime');
|
||||
return temp != null
|
||||
? DateTime.fromMillisecondsSinceEpoch(temp)
|
||||
: DateTime.fromMillisecondsSinceEpoch(0);
|
||||
}
|
||||
|
||||
set lastBGCheckTime(DateTime val) {
|
||||
prefs?.setInt('lastBGCheckTime', val.millisecondsSinceEpoch);
|
||||
set lastCompletedBGCheckTime(DateTime val) {
|
||||
prefs?.setInt('lastCompletedBGCheckTime', val.millisecondsSinceEpoch);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@@ -464,4 +464,13 @@ class SettingsProvider with ChangeNotifier {
|
||||
prefs?.setBool('parallelDownloads', val);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
List<String> get searchDeselected {
|
||||
return prefs?.getStringList('searchDeselected') ?? [];
|
||||
}
|
||||
|
||||
set searchDeselected(List<String> list) {
|
||||
prefs?.setStringList('searchDeselected', list);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
@@ -135,10 +135,34 @@ appJSONCompatibilityModifiers(Map<String, dynamic> json) {
|
||||
if (additionalSettings['autoApkFilterByArch'] == null) {
|
||||
additionalSettings['autoApkFilterByArch'] = false;
|
||||
}
|
||||
// HTML 'fixed URL' support should be disabled if it previously did not exist
|
||||
if (source.runtimeType == HTML().runtimeType &&
|
||||
originalAdditionalSettings['supportFixedAPKURL'] == null) {
|
||||
additionalSettings['supportFixedAPKURL'] = false;
|
||||
if (source.runtimeType == HTML().runtimeType) {
|
||||
// HTML 'fixed URL' support should be disabled if it previously did not exist
|
||||
if (originalAdditionalSettings['supportFixedAPKURL'] == null) {
|
||||
additionalSettings['supportFixedAPKURL'] = false;
|
||||
}
|
||||
// HTML key rename
|
||||
if (originalAdditionalSettings['sortByFileNamesNotLinks'] != null) {
|
||||
additionalSettings['sortByLastLinkSegment'] =
|
||||
originalAdditionalSettings['sortByFileNamesNotLinks'];
|
||||
}
|
||||
// HTML single 'intermediate link' should be converted to multi-support version
|
||||
if (originalAdditionalSettings['intermediateLinkRegex'] != null &&
|
||||
additionalSettings['intermediateLinkRegex']?.isNotEmpty != true) {
|
||||
additionalSettings['intermediateLink'] = [
|
||||
{
|
||||
'customLinkFilterRegex':
|
||||
originalAdditionalSettings['intermediateLinkRegex'],
|
||||
'filterByLinkText':
|
||||
originalAdditionalSettings['intermediateLinkByText']
|
||||
}
|
||||
];
|
||||
}
|
||||
if ((additionalSettings['intermediateLink']?.length ?? 0) > 0) {
|
||||
additionalSettings['intermediateLink'] =
|
||||
additionalSettings['intermediateLink'].where((e) {
|
||||
return e['customLinkFilterRegex']?.isNotEmpty == true;
|
||||
}).toList();
|
||||
}
|
||||
}
|
||||
json['additionalSettings'] = jsonEncode(additionalSettings);
|
||||
// F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
|
||||
|
Reference in New Issue
Block a user