merge and bump version to v0.3.32
This commit is contained in:
parent
b3eea02853
commit
770152b431
|
@ -357,7 +357,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
|
|||
),
|
||||
);
|
||||
}
|
||||
if (!foundActivePlan) {
|
||||
if (!foundActivePlan && _hasActiveSubscription) {
|
||||
_addCurrentPlanWidget(planWidgets);
|
||||
}
|
||||
return planWidgets;
|
||||
|
|
|
@ -270,7 +270,7 @@ class _SubscriptionPageState extends State<SubscriptionPage> {
|
|||
),
|
||||
);
|
||||
}
|
||||
if (!foundActivePlan) {
|
||||
if (!foundActivePlan && _hasActiveSubscription) {
|
||||
_addCurrentPlanWidget(planWidgets);
|
||||
}
|
||||
return planWidgets;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue