Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-24 06:49:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

flutter fix

Browse Source
This commit is contained in:
John Smith 2023-05-29 17:40:49 -07:00
parent 8651e39ca8
commit 9d01b0e928
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/cursive vendored

@ -1 +1 @@
Subproject commit 250d35f37f526221539c8d59d7a2056803bf0010 Subproject commit 7df15342b1f08b6b7a5cdc7aa8f97342d2e4ad7b

10
veilid-flutter/example/windows/runner/Runner.rc
View File

@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico"
// Version // Version
// //
#ifdef FLUTTER_BUILD_NUMBER #if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER #define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
#else #else
#define VERSION_AS_NUMBER 1,0,0 #define VERSION_AS_NUMBER 1,0,0,0
#endif #endif
#ifdef FLUTTER_BUILD_NAME #if defined(FLUTTER_VERSION)
#define VERSION_AS_STRING #FLUTTER_BUILD_NAME #define VERSION_AS_STRING FLUTTER_VERSION
#else #else
#define VERSION_AS_STRING "1.0.0" #define VERSION_AS_STRING "1.0.0"
#endif #endif

4
veilid-flutter/lib/default_config.dart
View File

@ -66,8 +66,8 @@ Future<VeilidConfig> getDefaultVeilidConfig(String programName) async {
alwaysUseInsecureStorage: false, alwaysUseInsecureStorage: false,
directory: "", directory: "",
delete: false, delete: false,
deviceEncryptionKey: "", deviceEncryptionKeyPassword: "",
newDeviceEncryptionKey: null, newDeviceEncryptionKeyPassword: null,
), ),
tableStore: VeilidConfigTableStore( tableStore: VeilidConfigTableStore(
directory: kIsWeb directory: kIsWeb

16
veilid-flutter/lib/veilid_config.dart
View File

@ -828,16 +828,16 @@ class VeilidConfigProtectedStore {
bool alwaysUseInsecureStorage; bool alwaysUseInsecureStorage;
String directory; String directory;
bool delete; bool delete;
String deviceEncryptionKey; String deviceEncryptionKeyPassword;
String? newDeviceEncryptionKey; String? newDeviceEncryptionKeyPassword;
VeilidConfigProtectedStore( VeilidConfigProtectedStore(
{required this.allowInsecureFallback, {required this.allowInsecureFallback,
required this.alwaysUseInsecureStorage, required this.alwaysUseInsecureStorage,
required this.directory, required this.directory,
required this.delete, required this.delete,
required this.deviceEncryptionKey, required this.deviceEncryptionKeyPassword,
String? newDeviceEncryptionKey}); String? newDeviceEncryptionKeyPassword});
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
return { return {
@ -845,8 +845,8 @@ class VeilidConfigProtectedStore {
'always_use_insecure_storage': alwaysUseInsecureStorage, 'always_use_insecure_storage': alwaysUseInsecureStorage,
'directory': directory, 'directory': directory,
'delete': delete, 'delete': delete,
'device_encryption_key': deviceEncryptionKey, 'device_encryption_key_password': deviceEncryptionKeyPassword,
'new_device_encryption_key': newDeviceEncryptionKey, 'new_device_encryption_key': newDeviceEncryptionKeyPassword,
}; };
} }
@ -855,8 +855,8 @@ class VeilidConfigProtectedStore {
alwaysUseInsecureStorage = json['always_use_insecure_storage'], alwaysUseInsecureStorage = json['always_use_insecure_storage'],
directory = json['directory'], directory = json['directory'],
delete = json['delete'], delete = json['delete'],
deviceEncryptionKey = json['device_encryption_key'], deviceEncryptionKeyPassword = json['device_encryption_key_password'],
newDeviceEncryptionKey = json['new_device_encryption_key']; newDeviceEncryptionKeyPassword = json['new_device_encryption_key_password'];
} }
//////////// ////////////