beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

merge and bump version to v0.3.32

Browse source
This commit is contained in:
Neeraj Gupta 2021-10-02 00:39:07 +05:30
parent b3eea02853
commit 770152b431
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ui/payment/stripe_subscription_page.dart
View file

@ -357,7 +357,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
),
);
}
if (!foundActivePlan) {
if (!foundActivePlan && _hasActiveSubscription) {
_addCurrentPlanWidget(planWidgets);
}
return planWidgets;

2
lib/ui/payment/subscription_page.dart
View file

@ -270,7 +270,7 @@ class _SubscriptionPageState extends State<SubscriptionPage> {
),
);
}
if (!foundActivePlan) {
if (!foundActivePlan && _hasActiveSubscription) {
_addCurrentPlanWidget(planWidgets);
}
return planWidgets;

28
lib/utils/diff_fetcher.dart
View file

@ -19,18 +19,17 @@ class DiffFetcher {
Future<Diff> getEncryptedFilesDiff(
int collectionID, int sinceTime, int limit) async {
return _dio.get(
Configuration.instance.getHttpEndpoint() + "/collections/diff",
options:
Options(headers: {"X-Auth-Token": Configuration.instance.getToken()}),
queryParameters: {
"collectionID": collectionID,
"sinceTime": sinceTime,
"limit": limit,
},
).catchError((e) {
_logger.severe(e);
}).then((response) async {
try {
final response = await _dio.get(
Configuration.instance.getHttpEndpoint() + "/collections/diff",
options: Options(
headers: {"X-Auth-Token": Configuration.instance.getToken()}),
queryParameters: {
"collectionID": collectionID,
"sinceTime": sinceTime,
"limit": limit,
},
);
final files = <File>[];
if (response != null) {
Bus.instance.fire(RemoteSyncEvent(true));
@ -101,7 +100,10 @@ class DiffFetcher {
Bus.instance.fire(RemoteSyncEvent(false));
return Diff(<File>[], <File>[], 0);
}
});
} catch (e, s) {
_logger.severe(e, s);
rethrow;
}
}
}

2
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: ente photos application
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 0.3.30+240
version: 0.3.32+242
environment:
sdk: ">=2.10.0 <3.0.0"