Merge branch 'develop' into fix/fd-1047
This commit is contained in:
commit
dc38f19d47
|
@ -1,5 +1,4 @@
|
|||
import 'dart:async';
|
||||
import 'dart:developer';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_spinkit/flutter_spinkit.dart';
|
||||
|
@ -11,7 +10,6 @@ import 'package:hub/flutter_flow/flutter_flow_icon_button.dart';
|
|||
import 'package:hub/flutter_flow/flutter_flow_theme.dart';
|
||||
import 'package:hub/flutter_flow/flutter_flow_util.dart';
|
||||
import 'package:hub/shared/utils/dialog_util.dart';
|
||||
import 'package:hub/shared/utils/limited_text_size.dart';
|
||||
import 'package:hub/shared/utils/log_util.dart';
|
||||
import 'package:hub/shared/utils/snackbar_util.dart';
|
||||
|
||||
|
@ -21,8 +19,10 @@ import 'package:rxdart/rxdart.dart';
|
|||
// ignore: must_be_immutable
|
||||
class ProvisionalHistoryPage extends StatefulWidget {
|
||||
Map<String, String> opt;
|
||||
|
||||
ProvisionalHistoryPage({super.key, Map<String, String>? opt})
|
||||
: opt = opt ?? const {'AGP_STATUS': '.*'};
|
||||
|
||||
@override
|
||||
State<ProvisionalHistoryPage> createState() => ProvisionalHistoryState(opt);
|
||||
}
|
||||
|
@ -159,8 +159,8 @@ class ProvisionalHistoryState extends State<ProvisionalHistoryPage> {
|
|||
{
|
||||
'title': FFLocalizations.of(context)
|
||||
.getVariableText(
|
||||
ptText: 'Convidado',
|
||||
enText: 'Guest',
|
||||
ptText: 'Concluído',
|
||||
enText: 'Completed',
|
||||
),
|
||||
'value': 'CO',
|
||||
},
|
||||
|
|
|
@ -95,7 +95,7 @@ class LicenseRemoteDataSourceImpl implements LicenseRemoteDataSource {
|
|||
} catch (e, s) {
|
||||
log('Erro ao obter licenças: $e', stackTrace: s);
|
||||
// return await setupLicense(DatabaseStorage.database, isNewVersion);
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -20,9 +20,10 @@ class LicenseRepositoryImpl implements LicenseRepository {
|
|||
log('updateLicense');
|
||||
bool result = false;
|
||||
final bool isNewVersion = await localDataSource.isNewVersion();
|
||||
result = await remoteDataSource.setupLicense(database, isNewVersion);
|
||||
if (isNewVersion) {
|
||||
result = await remoteDataSource.fetchLicenses(isNewVersion);
|
||||
} else {
|
||||
result = await remoteDataSource.setupLicense(database, isNewVersion);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
Loading…
Reference in New Issue