From b0edb257c6baf23455fb724db9529afc7df1e191 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Tue, 3 Aug 2021 16:14:42 +0200 Subject: [PATCH] Analytics: Cleanup I don't see any way of getting the app install source. Run the formatter on the rest --- lib/analytics/analytics.proto | 8 - lib/analytics/experiment.dart | 82 ----- lib/analytics/generated/analytics.pb.dart | 89 ----- lib/analytics/generated/analytics.pbenum.dart | 95 ++++-- lib/analytics/generated/analytics.pbjson.dart | 311 ++++++++++++++---- lib/core/notes_folder_fs.dart | 6 +- 6 files changed, 331 insertions(+), 260 deletions(-) delete mode 100644 lib/analytics/experiment.dart diff --git a/lib/analytics/analytics.proto b/lib/analytics/analytics.proto index a3caff94..6886069f 100644 --- a/lib/analytics/analytics.proto +++ b/lib/analytics/analytics.proto @@ -16,7 +16,6 @@ message AnalyticsMessage { DeviceInfo deviceInfo = 3; PackageInfo packageInfo = 4; - // FIXME: What about AppInfo } // message Any { @@ -61,13 +60,6 @@ message PackageInfo { string buildSignature = 5; } -message AppInfo { - string id = 1; - string version = 2; - string firebaseAppId = 3; - string installSource = 4; -} - enum Platform { android = 0; ios = 1; diff --git a/lib/analytics/experiment.dart b/lib/analytics/experiment.dart deleted file mode 100644 index cd2ec8b0..00000000 --- a/lib/analytics/experiment.dart +++ /dev/null @@ -1,82 +0,0 @@ -import 'package:device_info_plus/device_info_plus.dart'; -import 'package:universal_io/io.dart' show Platform; - -// - https://support.google.com/firebase/answer/7029846?hl=en -// - https://support.google.com/firebase/answer/6317485?hl=en - -class Event { - DateTime? date; - String? name; - Map? params; - - String? userId; - String? psuedoId; - Map? userProperties; - - // Unique session identifier (based on the timestamp of the session_start - // event) associated with each event that occurs within a session - String? sessionID; - - String? platform; - DateTime? userFirstTouchTimestamp; -} - -class Device { - String? category; // mobile - String? mobileBrandName; - String? mobileModelName; - String? mobileOsHardwareModel; - String? operatingSystem; - String? operatingSystemVersion; - String? vendorId; - String? language; - bool? isLimitedAdTracking; - int? timeZoneOffsetSeconds; - - static Future build() async { - var device = Device(); - var deviceInfo = DeviceInfoPlugin(); - if (Platform.isAndroid) { - var d = await deviceInfo.androidInfo; - device.category = "mobile"; - device.mobileBrandName = d.brand; - device.mobileModelName = d.model; - device.mobileOsHardwareModel = ""; - device.operatingSystem = "android"; - device.operatingSystemVersion = ""; - device.vendorId = ""; - device.language = ""; - device.isLimitedAdTracking = true; - } else if (Platform.isIOS) { - var d = await deviceInfo.iosInfo; - device.category = "mobile"; - device.mobileBrandName = d.name; - device.mobileModelName = d.model; - device.mobileOsHardwareModel = ""; - device.operatingSystem = d.systemName; - device.operatingSystemVersion = d.systemVersion; - device.vendorId = d.identifierForVendor; - device.language = ""; - device.isLimitedAdTracking = true; - } - - device.timeZoneOffsetSeconds = DateTime.now().timeZoneOffset.inSeconds; - return device; - } -} - -class AppInfo { - String? id; - String? version; - String? firebaseAppId; - String? installSource; -} - -// -// * Write a converter for the firebase data to this data format -// -// Local tasks - -// - Create gj versions of the other events -// - Store the events in a local db - use hive -// - Populate the other data -// diff --git a/lib/analytics/generated/analytics.pb.dart b/lib/analytics/generated/analytics.pb.dart index 3233e927..8004a270 100644 --- a/lib/analytics/generated/analytics.pb.dart +++ b/lib/analytics/generated/analytics.pb.dart @@ -532,95 +532,6 @@ class PackageInfo extends $pb.GeneratedMessage { void clearBuildSignature() => clearField(5); } -class AppInfo extends $pb.GeneratedMessage { - static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'AppInfo', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'gitjournal'), createEmptyInstance: create) - ..aOS(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'id') - ..aOS(2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'version') - ..aOS(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'firebaseAppId', protoName: 'firebaseAppId') - ..aOS(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'installSource', protoName: 'installSource') - ..hasRequiredFields = false - ; - - AppInfo._() : super(); - factory AppInfo({ - $core.String? id, - $core.String? version, - $core.String? firebaseAppId, - $core.String? installSource, - }) { - final _result = create(); - if (id != null) { - _result.id = id; - } - if (version != null) { - _result.version = version; - } - if (firebaseAppId != null) { - _result.firebaseAppId = firebaseAppId; - } - if (installSource != null) { - _result.installSource = installSource; - } - return _result; - } - factory AppInfo.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory AppInfo.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - AppInfo clone() => AppInfo()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - AppInfo copyWith(void Function(AppInfo) updates) => super.copyWith((message) => updates(message as AppInfo)) as AppInfo; // ignore: deprecated_member_use - $pb.BuilderInfo get info_ => _i; - @$core.pragma('dart2js:noInline') - static AppInfo create() => AppInfo._(); - AppInfo createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static AppInfo getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static AppInfo? _defaultInstance; - - @$pb.TagNumber(1) - $core.String get id => $_getSZ(0); - @$pb.TagNumber(1) - set id($core.String v) { $_setString(0, v); } - @$pb.TagNumber(1) - $core.bool hasId() => $_has(0); - @$pb.TagNumber(1) - void clearId() => clearField(1); - - @$pb.TagNumber(2) - $core.String get version => $_getSZ(1); - @$pb.TagNumber(2) - set version($core.String v) { $_setString(1, v); } - @$pb.TagNumber(2) - $core.bool hasVersion() => $_has(1); - @$pb.TagNumber(2) - void clearVersion() => clearField(2); - - @$pb.TagNumber(3) - $core.String get firebaseAppId => $_getSZ(2); - @$pb.TagNumber(3) - set firebaseAppId($core.String v) { $_setString(2, v); } - @$pb.TagNumber(3) - $core.bool hasFirebaseAppId() => $_has(2); - @$pb.TagNumber(3) - void clearFirebaseAppId() => clearField(3); - - @$pb.TagNumber(4) - $core.String get installSource => $_getSZ(3); - @$pb.TagNumber(4) - set installSource($core.String v) { $_setString(3, v); } - @$pb.TagNumber(4) - $core.bool hasInstallSource() => $_has(3); - @$pb.TagNumber(4) - void clearInstallSource() => clearField(4); -} - class AndroidBuildVersion extends $pb.GeneratedMessage { static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'AndroidBuildVersion', package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'gitjournal'), createEmptyInstance: create) ..aOS(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'baseOS', protoName: 'baseOS') diff --git a/lib/analytics/generated/analytics.pbenum.dart b/lib/analytics/generated/analytics.pbenum.dart index cbd3c1a0..cae2a8e5 100644 --- a/lib/analytics/generated/analytics.pbenum.dart +++ b/lib/analytics/generated/analytics.pbenum.dart @@ -12,14 +12,38 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; class Platform extends $pb.ProtobufEnum { - static const Platform android = Platform._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'android'); - static const Platform ios = Platform._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ios'); - static const Platform linux = Platform._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'linux'); - static const Platform macos = Platform._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'macos'); - static const Platform windows = Platform._(4, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'windows'); - static const Platform web = Platform._(5, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'web'); + static const Platform android = Platform._( + 0, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'android'); + static const Platform ios = Platform._( + 1, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'ios'); + static const Platform linux = Platform._( + 2, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'linux'); + static const Platform macos = Platform._( + 3, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'macos'); + static const Platform windows = Platform._( + 4, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'windows'); + static const Platform web = Platform._( + 5, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'web'); - static const $core.List values = [ + static const $core.List values = [ android, ios, linux, @@ -28,23 +52,56 @@ class Platform extends $pb.ProtobufEnum { web, ]; - static final $core.Map<$core.int, Platform> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, Platform> _byValue = + $pb.ProtobufEnum.initByValue(values); static Platform? valueOf($core.int value) => _byValue[value]; const Platform._($core.int v, $core.String n) : super(v, n); } class BrowserName extends $pb.ProtobufEnum { - static const BrowserName unknown = BrowserName._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'unknown'); - static const BrowserName firefox = BrowserName._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'firefox'); - static const BrowserName samsungInternet = BrowserName._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'samsungInternet'); - static const BrowserName opera = BrowserName._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'opera'); - static const BrowserName msie = BrowserName._(4, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'msie'); - static const BrowserName edge = BrowserName._(5, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'edge'); - static const BrowserName chrome = BrowserName._(6, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'chrome'); - static const BrowserName safari = BrowserName._(7, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'safari'); + static const BrowserName unknown = BrowserName._( + 0, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'unknown'); + static const BrowserName firefox = BrowserName._( + 1, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'firefox'); + static const BrowserName samsungInternet = BrowserName._( + 2, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'samsungInternet'); + static const BrowserName opera = BrowserName._( + 3, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'opera'); + static const BrowserName msie = BrowserName._( + 4, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'msie'); + static const BrowserName edge = BrowserName._( + 5, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'edge'); + static const BrowserName chrome = BrowserName._( + 6, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'chrome'); + static const BrowserName safari = BrowserName._( + 7, + const $core.bool.fromEnvironment('protobuf.omit_enum_names') + ? '' + : 'safari'); - static const $core.List values = [ + static const $core.List values = [ unknown, firefox, samsungInternet, @@ -55,9 +112,9 @@ class BrowserName extends $pb.ProtobufEnum { safari, ]; - static final $core.Map<$core.int, BrowserName> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, BrowserName> _byValue = + $pb.ProtobufEnum.initByValue(values); static BrowserName? valueOf($core.int value) => _byValue[value]; const BrowserName._($core.int v, $core.String n) : super(v, n); } - diff --git a/lib/analytics/generated/analytics.pbjson.dart b/lib/analytics/generated/analytics.pbjson.dart index f68c0dfd..5cb7d1a5 100644 --- a/lib/analytics/generated/analytics.pbjson.dart +++ b/lib/analytics/generated/analytics.pbjson.dart @@ -23,7 +23,8 @@ const Platform$json = const { }; /// Descriptor for `Platform`. Decode as a `google.protobuf.EnumDescriptorProto`. -final $typed_data.Uint8List platformDescriptor = $convert.base64Decode('CghQbGF0Zm9ybRILCgdhbmRyb2lkEAASBwoDaW9zEAESCQoFbGludXgQAhIJCgVtYWNvcxADEgsKB3dpbmRvd3MQBBIHCgN3ZWIQBQ=='); +final $typed_data.Uint8List platformDescriptor = $convert.base64Decode( + 'CghQbGF0Zm9ybRILCgdhbmRyb2lkEAASBwoDaW9zEAESCQoFbGludXgQAhIJCgVtYWNvcxADEgsKB3dpbmRvd3MQBBIHCgN3ZWIQBQ=='); @$core.Deprecated('Use browserNameDescriptor instead') const BrowserName$json = const { '1': 'BrowserName', @@ -40,39 +41,83 @@ const BrowserName$json = const { }; /// Descriptor for `BrowserName`. Decode as a `google.protobuf.EnumDescriptorProto`. -final $typed_data.Uint8List browserNameDescriptor = $convert.base64Decode('CgtCcm93c2VyTmFtZRILCgd1bmtub3duEAASCwoHZmlyZWZveBABEhMKD3NhbXN1bmdJbnRlcm5ldBACEgkKBW9wZXJhEAMSCAoEbXNpZRAEEggKBGVkZ2UQBRIKCgZjaHJvbWUQBhIKCgZzYWZhcmkQBw=='); +final $typed_data.Uint8List browserNameDescriptor = $convert.base64Decode( + 'CgtCcm93c2VyTmFtZRILCgd1bmtub3duEAASCwoHZmlyZWZveBABEhMKD3NhbXN1bmdJbnRlcm5ldBACEgkKBW9wZXJhEAMSCAoEbXNpZRAEEggKBGVkZ2UQBRIKCgZjaHJvbWUQBhIKCgZzYWZhcmkQBw=='); @$core.Deprecated('Use analyticsReplyDescriptor instead') const AnalyticsReply$json = const { '1': 'AnalyticsReply', }; /// Descriptor for `AnalyticsReply`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List analyticsReplyDescriptor = $convert.base64Decode('Cg5BbmFseXRpY3NSZXBseQ=='); +final $typed_data.Uint8List analyticsReplyDescriptor = + $convert.base64Decode('Cg5BbmFseXRpY3NSZXBseQ=='); @$core.Deprecated('Use analyticsMessageDescriptor instead') const AnalyticsMessage$json = const { '1': 'AnalyticsMessage', '2': const [ const {'1': 'appId', '3': 1, '4': 1, '5': 9, '10': 'appId'}, - const {'1': 'events', '3': 2, '4': 3, '5': 11, '6': '.gitjournal.Event', '10': 'events'}, - const {'1': 'deviceInfo', '3': 3, '4': 1, '5': 11, '6': '.gitjournal.DeviceInfo', '10': 'deviceInfo'}, - const {'1': 'packageInfo', '3': 4, '4': 1, '5': 11, '6': '.gitjournal.PackageInfo', '10': 'packageInfo'}, + const { + '1': 'events', + '3': 2, + '4': 3, + '5': 11, + '6': '.gitjournal.Event', + '10': 'events' + }, + const { + '1': 'deviceInfo', + '3': 3, + '4': 1, + '5': 11, + '6': '.gitjournal.DeviceInfo', + '10': 'deviceInfo' + }, + const { + '1': 'packageInfo', + '3': 4, + '4': 1, + '5': 11, + '6': '.gitjournal.PackageInfo', + '10': 'packageInfo' + }, ], }; /// Descriptor for `AnalyticsMessage`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List analyticsMessageDescriptor = $convert.base64Decode('ChBBbmFseXRpY3NNZXNzYWdlEhQKBWFwcElkGAEgASgJUgVhcHBJZBIpCgZldmVudHMYAiADKAsyES5naXRqb3VybmFsLkV2ZW50UgZldmVudHMSNgoKZGV2aWNlSW5mbxgDIAEoCzIWLmdpdGpvdXJuYWwuRGV2aWNlSW5mb1IKZGV2aWNlSW5mbxI5CgtwYWNrYWdlSW5mbxgEIAEoCzIXLmdpdGpvdXJuYWwuUGFja2FnZUluZm9SC3BhY2thZ2VJbmZv'); +final $typed_data.Uint8List analyticsMessageDescriptor = $convert.base64Decode( + 'ChBBbmFseXRpY3NNZXNzYWdlEhQKBWFwcElkGAEgASgJUgVhcHBJZBIpCgZldmVudHMYAiADKAsyES5naXRqb3VybmFsLkV2ZW50UgZldmVudHMSNgoKZGV2aWNlSW5mbxgDIAEoCzIWLmdpdGpvdXJuYWwuRGV2aWNlSW5mb1IKZGV2aWNlSW5mbxI5CgtwYWNrYWdlSW5mbxgEIAEoCzIXLmdpdGpvdXJuYWwuUGFja2FnZUluZm9SC3BhY2thZ2VJbmZv'); @$core.Deprecated('Use eventDescriptor instead') const Event$json = const { '1': 'Event', '2': const [ const {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'}, const {'1': 'date', '3': 2, '4': 1, '5': 3, '10': 'date'}, - const {'1': 'params', '3': 3, '4': 3, '5': 11, '6': '.gitjournal.Event.ParamsEntry', '10': 'params'}, + const { + '1': 'params', + '3': 3, + '4': 3, + '5': 11, + '6': '.gitjournal.Event.ParamsEntry', + '10': 'params' + }, const {'1': 'userId', '3': 4, '4': 1, '5': 9, '10': 'userId'}, const {'1': 'pseudoId', '3': 5, '4': 1, '5': 9, '10': 'pseudoId'}, - const {'1': 'userProperties', '3': 6, '4': 3, '5': 11, '6': '.gitjournal.Event.UserPropertiesEntry', '10': 'userProperties'}, + const { + '1': 'userProperties', + '3': 6, + '4': 3, + '5': 11, + '6': '.gitjournal.Event.UserPropertiesEntry', + '10': 'userProperties' + }, const {'1': 'sessionID', '3': 7, '4': 1, '5': 9, '10': 'sessionID'}, - const {'1': 'userFirstTouchTimestamp', '3': 8, '4': 1, '5': 3, '10': 'userFirstTouchTimestamp'}, + const { + '1': 'userFirstTouchTimestamp', + '3': 8, + '4': 1, + '5': 3, + '10': 'userFirstTouchTimestamp' + }, ], '3': const [Event_ParamsEntry$json, Event_UserPropertiesEntry$json], }; @@ -98,18 +143,74 @@ const Event_UserPropertiesEntry$json = const { }; /// Descriptor for `Event`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List eventDescriptor = $convert.base64Decode('CgVFdmVudBISCgRuYW1lGAEgASgJUgRuYW1lEhIKBGRhdGUYAiABKANSBGRhdGUSNQoGcGFyYW1zGAMgAygLMh0uZ2l0am91cm5hbC5FdmVudC5QYXJhbXNFbnRyeVIGcGFyYW1zEhYKBnVzZXJJZBgEIAEoCVIGdXNlcklkEhoKCHBzZXVkb0lkGAUgASgJUghwc2V1ZG9JZBJNCg51c2VyUHJvcGVydGllcxgGIAMoCzIlLmdpdGpvdXJuYWwuRXZlbnQuVXNlclByb3BlcnRpZXNFbnRyeVIOdXNlclByb3BlcnRpZXMSHAoJc2Vzc2lvbklEGAcgASgJUglzZXNzaW9uSUQSOAoXdXNlckZpcnN0VG91Y2hUaW1lc3RhbXAYCCABKANSF3VzZXJGaXJzdFRvdWNoVGltZXN0YW1wGjkKC1BhcmFtc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUgV2YWx1ZToCOAEaQQoTVXNlclByb3BlcnRpZXNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgB'); +final $typed_data.Uint8List eventDescriptor = $convert.base64Decode( + 'CgVFdmVudBISCgRuYW1lGAEgASgJUgRuYW1lEhIKBGRhdGUYAiABKANSBGRhdGUSNQoGcGFyYW1zGAMgAygLMh0uZ2l0am91cm5hbC5FdmVudC5QYXJhbXNFbnRyeVIGcGFyYW1zEhYKBnVzZXJJZBgEIAEoCVIGdXNlcklkEhoKCHBzZXVkb0lkGAUgASgJUghwc2V1ZG9JZBJNCg51c2VyUHJvcGVydGllcxgGIAMoCzIlLmdpdGpvdXJuYWwuRXZlbnQuVXNlclByb3BlcnRpZXNFbnRyeVIOdXNlclByb3BlcnRpZXMSHAoJc2Vzc2lvbklEGAcgASgJUglzZXNzaW9uSUQSOAoXdXNlckZpcnN0VG91Y2hUaW1lc3RhbXAYCCABKANSF3VzZXJGaXJzdFRvdWNoVGltZXN0YW1wGjkKC1BhcmFtc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUgV2YWx1ZToCOAEaQQoTVXNlclByb3BlcnRpZXNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgB'); @$core.Deprecated('Use deviceInfoDescriptor instead') const DeviceInfo$json = const { '1': 'DeviceInfo', '2': const [ - const {'1': 'platform', '3': 1, '4': 1, '5': 14, '6': '.gitjournal.Platform', '10': 'platform'}, - const {'1': 'androidDeviceInfo', '3': 11, '4': 1, '5': 11, '6': '.gitjournal.AndroidDeviceInfo', '9': 0, '10': 'androidDeviceInfo'}, - const {'1': 'iosDeviceInfo', '3': 12, '4': 1, '5': 11, '6': '.gitjournal.IosDeviceInfo', '9': 0, '10': 'iosDeviceInfo'}, - const {'1': 'linuxDeviceInfo', '3': 13, '4': 1, '5': 11, '6': '.gitjournal.LinuxDeviceInfo', '9': 0, '10': 'linuxDeviceInfo'}, - const {'1': 'macOSDeviceInfo', '3': 14, '4': 1, '5': 11, '6': '.gitjournal.MacOSDeviceInfo', '9': 0, '10': 'macOSDeviceInfo'}, - const {'1': 'windowsDeviceInfo', '3': 15, '4': 1, '5': 11, '6': '.gitjournal.WindowsDeviceInfo', '9': 0, '10': 'windowsDeviceInfo'}, - const {'1': 'webBrowserInfo', '3': 16, '4': 1, '5': 11, '6': '.gitjournal.WebBrowserInfo', '9': 0, '10': 'webBrowserInfo'}, + const { + '1': 'platform', + '3': 1, + '4': 1, + '5': 14, + '6': '.gitjournal.Platform', + '10': 'platform' + }, + const { + '1': 'androidDeviceInfo', + '3': 11, + '4': 1, + '5': 11, + '6': '.gitjournal.AndroidDeviceInfo', + '9': 0, + '10': 'androidDeviceInfo' + }, + const { + '1': 'iosDeviceInfo', + '3': 12, + '4': 1, + '5': 11, + '6': '.gitjournal.IosDeviceInfo', + '9': 0, + '10': 'iosDeviceInfo' + }, + const { + '1': 'linuxDeviceInfo', + '3': 13, + '4': 1, + '5': 11, + '6': '.gitjournal.LinuxDeviceInfo', + '9': 0, + '10': 'linuxDeviceInfo' + }, + const { + '1': 'macOSDeviceInfo', + '3': 14, + '4': 1, + '5': 11, + '6': '.gitjournal.MacOSDeviceInfo', + '9': 0, + '10': 'macOSDeviceInfo' + }, + const { + '1': 'windowsDeviceInfo', + '3': 15, + '4': 1, + '5': 11, + '6': '.gitjournal.WindowsDeviceInfo', + '9': 0, + '10': 'windowsDeviceInfo' + }, + const { + '1': 'webBrowserInfo', + '3': 16, + '4': 1, + '5': 11, + '6': '.gitjournal.WebBrowserInfo', + '9': 0, + '10': 'webBrowserInfo' + }, ], '8': const [ const {'1': 'deviceInfo'}, @@ -117,7 +218,8 @@ const DeviceInfo$json = const { }; /// Descriptor for `DeviceInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List deviceInfoDescriptor = $convert.base64Decode('CgpEZXZpY2VJbmZvEjAKCHBsYXRmb3JtGAEgASgOMhQuZ2l0am91cm5hbC5QbGF0Zm9ybVIIcGxhdGZvcm0STQoRYW5kcm9pZERldmljZUluZm8YCyABKAsyHS5naXRqb3VybmFsLkFuZHJvaWREZXZpY2VJbmZvSABSEWFuZHJvaWREZXZpY2VJbmZvEkEKDWlvc0RldmljZUluZm8YDCABKAsyGS5naXRqb3VybmFsLklvc0RldmljZUluZm9IAFINaW9zRGV2aWNlSW5mbxJHCg9saW51eERldmljZUluZm8YDSABKAsyGy5naXRqb3VybmFsLkxpbnV4RGV2aWNlSW5mb0gAUg9saW51eERldmljZUluZm8SRwoPbWFjT1NEZXZpY2VJbmZvGA4gASgLMhsuZ2l0am91cm5hbC5NYWNPU0RldmljZUluZm9IAFIPbWFjT1NEZXZpY2VJbmZvEk0KEXdpbmRvd3NEZXZpY2VJbmZvGA8gASgLMh0uZ2l0am91cm5hbC5XaW5kb3dzRGV2aWNlSW5mb0gAUhF3aW5kb3dzRGV2aWNlSW5mbxJECg53ZWJCcm93c2VySW5mbxgQIAEoCzIaLmdpdGpvdXJuYWwuV2ViQnJvd3NlckluZm9IAFIOd2ViQnJvd3NlckluZm9CDAoKZGV2aWNlSW5mbw=='); +final $typed_data.Uint8List deviceInfoDescriptor = $convert.base64Decode( + 'CgpEZXZpY2VJbmZvEjAKCHBsYXRmb3JtGAEgASgOMhQuZ2l0am91cm5hbC5QbGF0Zm9ybVIIcGxhdGZvcm0STQoRYW5kcm9pZERldmljZUluZm8YCyABKAsyHS5naXRqb3VybmFsLkFuZHJvaWREZXZpY2VJbmZvSABSEWFuZHJvaWREZXZpY2VJbmZvEkEKDWlvc0RldmljZUluZm8YDCABKAsyGS5naXRqb3VybmFsLklvc0RldmljZUluZm9IAFINaW9zRGV2aWNlSW5mbxJHCg9saW51eERldmljZUluZm8YDSABKAsyGy5naXRqb3VybmFsLkxpbnV4RGV2aWNlSW5mb0gAUg9saW51eERldmljZUluZm8SRwoPbWFjT1NEZXZpY2VJbmZvGA4gASgLMhsuZ2l0am91cm5hbC5NYWNPU0RldmljZUluZm9IAFIPbWFjT1NEZXZpY2VJbmZvEk0KEXdpbmRvd3NEZXZpY2VJbmZvGA8gASgLMh0uZ2l0am91cm5hbC5XaW5kb3dzRGV2aWNlSW5mb0gAUhF3aW5kb3dzRGV2aWNlSW5mbxJECg53ZWJCcm93c2VySW5mbxgQIAEoCzIaLmdpdGpvdXJuYWwuV2ViQnJvd3NlckluZm9IAFIOd2ViQnJvd3NlckluZm9CDAoKZGV2aWNlSW5mbw=='); @$core.Deprecated('Use packageInfoDescriptor instead') const PackageInfo$json = const { '1': 'PackageInfo', @@ -126,25 +228,19 @@ const PackageInfo$json = const { const {'1': 'packageName', '3': 2, '4': 1, '5': 9, '10': 'packageName'}, const {'1': 'version', '3': 3, '4': 1, '5': 9, '10': 'version'}, const {'1': 'buildNumber', '3': 4, '4': 1, '5': 9, '10': 'buildNumber'}, - const {'1': 'buildSignature', '3': 5, '4': 1, '5': 9, '10': 'buildSignature'}, + const { + '1': 'buildSignature', + '3': 5, + '4': 1, + '5': 9, + '10': 'buildSignature' + }, ], }; /// Descriptor for `PackageInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List packageInfoDescriptor = $convert.base64Decode('CgtQYWNrYWdlSW5mbxIYCgdhcHBOYW1lGAEgASgJUgdhcHBOYW1lEiAKC3BhY2thZ2VOYW1lGAIgASgJUgtwYWNrYWdlTmFtZRIYCgd2ZXJzaW9uGAMgASgJUgd2ZXJzaW9uEiAKC2J1aWxkTnVtYmVyGAQgASgJUgtidWlsZE51bWJlchImCg5idWlsZFNpZ25hdHVyZRgFIAEoCVIOYnVpbGRTaWduYXR1cmU='); -@$core.Deprecated('Use appInfoDescriptor instead') -const AppInfo$json = const { - '1': 'AppInfo', - '2': const [ - const {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'}, - const {'1': 'version', '3': 2, '4': 1, '5': 9, '10': 'version'}, - const {'1': 'firebaseAppId', '3': 3, '4': 1, '5': 9, '10': 'firebaseAppId'}, - const {'1': 'installSource', '3': 4, '4': 1, '5': 9, '10': 'installSource'}, - ], -}; - -/// Descriptor for `AppInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List appInfoDescriptor = $convert.base64Decode('CgdBcHBJbmZvEg4KAmlkGAEgASgJUgJpZBIYCgd2ZXJzaW9uGAIgASgJUgd2ZXJzaW9uEiQKDWZpcmViYXNlQXBwSWQYAyABKAlSDWZpcmViYXNlQXBwSWQSJAoNaW5zdGFsbFNvdXJjZRgEIAEoCVINaW5zdGFsbFNvdXJjZQ=='); +final $typed_data.Uint8List packageInfoDescriptor = $convert.base64Decode( + 'CgtQYWNrYWdlSW5mbxIYCgdhcHBOYW1lGAEgASgJUgdhcHBOYW1lEiAKC3BhY2thZ2VOYW1lGAIgASgJUgtwYWNrYWdlTmFtZRIYCgd2ZXJzaW9uGAMgASgJUgd2ZXJzaW9uEiAKC2J1aWxkTnVtYmVyGAQgASgJUgtidWlsZE51bWJlchImCg5idWlsZFNpZ25hdHVyZRgFIAEoCVIOYnVpbGRTaWduYXR1cmU='); @$core.Deprecated('Use androidBuildVersionDescriptor instead') const AndroidBuildVersion$json = const { '1': 'AndroidBuildVersion', @@ -160,12 +256,20 @@ const AndroidBuildVersion$json = const { }; /// Descriptor for `AndroidBuildVersion`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List androidBuildVersionDescriptor = $convert.base64Decode('ChNBbmRyb2lkQnVpbGRWZXJzaW9uEhYKBmJhc2VPUxgBIAEoCVIGYmFzZU9TEhoKCGNvZGVuYW1lGAIgASgJUghjb2RlbmFtZRIgCgtpbmNyZW1lbnRhbBgDIAEoCVILaW5jcmVtZW50YWwSJAoNcHJldmlld1Nka0ludBgEIAEoBVINcHJldmlld1Nka0ludBIYCgdyZWxlYXNlGAUgASgJUgdyZWxlYXNlEhYKBnNka0ludBgGIAEoBVIGc2RrSW50EiQKDXNlY3VyaXR5UGF0Y2gYByABKAlSDXNlY3VyaXR5UGF0Y2g='); +final $typed_data.Uint8List androidBuildVersionDescriptor = $convert.base64Decode( + 'ChNBbmRyb2lkQnVpbGRWZXJzaW9uEhYKBmJhc2VPUxgBIAEoCVIGYmFzZU9TEhoKCGNvZGVuYW1lGAIgASgJUghjb2RlbmFtZRIgCgtpbmNyZW1lbnRhbBgDIAEoCVILaW5jcmVtZW50YWwSJAoNcHJldmlld1Nka0ludBgEIAEoBVINcHJldmlld1Nka0ludBIYCgdyZWxlYXNlGAUgASgJUgdyZWxlYXNlEhYKBnNka0ludBgGIAEoBVIGc2RrSW50EiQKDXNlY3VyaXR5UGF0Y2gYByABKAlSDXNlY3VyaXR5UGF0Y2g='); @$core.Deprecated('Use androidDeviceInfoDescriptor instead') const AndroidDeviceInfo$json = const { '1': 'AndroidDeviceInfo', '2': const [ - const {'1': 'version', '3': 1, '4': 1, '5': 11, '6': '.gitjournal.AndroidBuildVersion', '10': 'version'}, + const { + '1': 'version', + '3': 1, + '4': 1, + '5': 11, + '6': '.gitjournal.AndroidBuildVersion', + '10': 'version' + }, const {'1': 'board', '3': 2, '4': 1, '5': 9, '10': 'board'}, const {'1': 'bootloader', '3': 3, '4': 1, '5': 9, '10': 'bootloader'}, const {'1': 'brand', '3': 4, '4': 1, '5': 9, '10': 'brand'}, @@ -178,19 +282,50 @@ const AndroidDeviceInfo$json = const { const {'1': 'manufacturer', '3': 11, '4': 1, '5': 9, '10': 'manufacturer'}, const {'1': 'model', '3': 12, '4': 1, '5': 9, '10': 'model'}, const {'1': 'product', '3': 13, '4': 1, '5': 9, '10': 'product'}, - const {'1': 'supported32BitAbis', '3': 14, '4': 3, '5': 9, '10': 'supported32BitAbis'}, - const {'1': 'supported64BitAbis', '3': 15, '4': 3, '5': 9, '10': 'supported64BitAbis'}, - const {'1': 'supportedAbis', '3': 16, '4': 3, '5': 9, '10': 'supportedAbis'}, + const { + '1': 'supported32BitAbis', + '3': 14, + '4': 3, + '5': 9, + '10': 'supported32BitAbis' + }, + const { + '1': 'supported64BitAbis', + '3': 15, + '4': 3, + '5': 9, + '10': 'supported64BitAbis' + }, + const { + '1': 'supportedAbis', + '3': 16, + '4': 3, + '5': 9, + '10': 'supportedAbis' + }, const {'1': 'tags', '3': 17, '4': 1, '5': 9, '10': 'tags'}, const {'1': 'type', '3': 18, '4': 1, '5': 9, '10': 'type'}, - const {'1': 'isPhysicalDevice', '3': 19, '4': 1, '5': 8, '10': 'isPhysicalDevice'}, + const { + '1': 'isPhysicalDevice', + '3': 19, + '4': 1, + '5': 8, + '10': 'isPhysicalDevice' + }, const {'1': 'androidId', '3': 20, '4': 1, '5': 9, '10': 'androidId'}, - const {'1': 'systemFeatures', '3': 21, '4': 3, '5': 9, '10': 'systemFeatures'}, + const { + '1': 'systemFeatures', + '3': 21, + '4': 3, + '5': 9, + '10': 'systemFeatures' + }, ], }; /// Descriptor for `AndroidDeviceInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List androidDeviceInfoDescriptor = $convert.base64Decode('ChFBbmRyb2lkRGV2aWNlSW5mbxI5Cgd2ZXJzaW9uGAEgASgLMh8uZ2l0am91cm5hbC5BbmRyb2lkQnVpbGRWZXJzaW9uUgd2ZXJzaW9uEhQKBWJvYXJkGAIgASgJUgVib2FyZBIeCgpib290bG9hZGVyGAMgASgJUgpib290bG9hZGVyEhQKBWJyYW5kGAQgASgJUgVicmFuZBIWCgZkZXZpY2UYBSABKAlSBmRldmljZRIYCgdkaXNwbGF5GAYgASgJUgdkaXNwbGF5EiAKC2ZpbmdlcnByaW50GAcgASgJUgtmaW5nZXJwcmludBIaCghoYXJkd2FyZRgIIAEoCVIIaGFyZHdhcmUSEgoEaG9zdBgJIAEoCVIEaG9zdBIOCgJpZBgKIAEoCVICaWQSIgoMbWFudWZhY3R1cmVyGAsgASgJUgxtYW51ZmFjdHVyZXISFAoFbW9kZWwYDCABKAlSBW1vZGVsEhgKB3Byb2R1Y3QYDSABKAlSB3Byb2R1Y3QSLgoSc3VwcG9ydGVkMzJCaXRBYmlzGA4gAygJUhJzdXBwb3J0ZWQzMkJpdEFiaXMSLgoSc3VwcG9ydGVkNjRCaXRBYmlzGA8gAygJUhJzdXBwb3J0ZWQ2NEJpdEFiaXMSJAoNc3VwcG9ydGVkQWJpcxgQIAMoCVINc3VwcG9ydGVkQWJpcxISCgR0YWdzGBEgASgJUgR0YWdzEhIKBHR5cGUYEiABKAlSBHR5cGUSKgoQaXNQaHlzaWNhbERldmljZRgTIAEoCFIQaXNQaHlzaWNhbERldmljZRIcCglhbmRyb2lkSWQYFCABKAlSCWFuZHJvaWRJZBImCg5zeXN0ZW1GZWF0dXJlcxgVIAMoCVIOc3lzdGVtRmVhdHVyZXM='); +final $typed_data.Uint8List androidDeviceInfoDescriptor = $convert.base64Decode( + 'ChFBbmRyb2lkRGV2aWNlSW5mbxI5Cgd2ZXJzaW9uGAEgASgLMh8uZ2l0am91cm5hbC5BbmRyb2lkQnVpbGRWZXJzaW9uUgd2ZXJzaW9uEhQKBWJvYXJkGAIgASgJUgVib2FyZBIeCgpib290bG9hZGVyGAMgASgJUgpib290bG9hZGVyEhQKBWJyYW5kGAQgASgJUgVicmFuZBIWCgZkZXZpY2UYBSABKAlSBmRldmljZRIYCgdkaXNwbGF5GAYgASgJUgdkaXNwbGF5EiAKC2ZpbmdlcnByaW50GAcgASgJUgtmaW5nZXJwcmludBIaCghoYXJkd2FyZRgIIAEoCVIIaGFyZHdhcmUSEgoEaG9zdBgJIAEoCVIEaG9zdBIOCgJpZBgKIAEoCVICaWQSIgoMbWFudWZhY3R1cmVyGAsgASgJUgxtYW51ZmFjdHVyZXISFAoFbW9kZWwYDCABKAlSBW1vZGVsEhgKB3Byb2R1Y3QYDSABKAlSB3Byb2R1Y3QSLgoSc3VwcG9ydGVkMzJCaXRBYmlzGA4gAygJUhJzdXBwb3J0ZWQzMkJpdEFiaXMSLgoSc3VwcG9ydGVkNjRCaXRBYmlzGA8gAygJUhJzdXBwb3J0ZWQ2NEJpdEFiaXMSJAoNc3VwcG9ydGVkQWJpcxgQIAMoCVINc3VwcG9ydGVkQWJpcxISCgR0YWdzGBEgASgJUgR0YWdzEhIKBHR5cGUYEiABKAlSBHR5cGUSKgoQaXNQaHlzaWNhbERldmljZRgTIAEoCFIQaXNQaHlzaWNhbERldmljZRIcCglhbmRyb2lkSWQYFCABKAlSCWFuZHJvaWRJZBImCg5zeXN0ZW1GZWF0dXJlcxgVIAMoCVIOc3lzdGVtRmVhdHVyZXM='); @$core.Deprecated('Use iosUtsnameDescriptor instead') const IosUtsname$json = const { '1': 'IosUtsname', @@ -204,7 +339,8 @@ const IosUtsname$json = const { }; /// Descriptor for `IosUtsname`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List iosUtsnameDescriptor = $convert.base64Decode('CgpJb3NVdHNuYW1lEhgKB3N5c25hbWUYASABKAlSB3N5c25hbWUSGgoIbm9kZW5hbWUYAiABKAlSCG5vZGVuYW1lEhgKB3JlbGVhc2UYAyABKAlSB3JlbGVhc2USGAoHdmVyc2lvbhgEIAEoCVIHdmVyc2lvbhIYCgdtYWNoaW5lGAUgASgJUgdtYWNoaW5l'); +final $typed_data.Uint8List iosUtsnameDescriptor = $convert.base64Decode( + 'CgpJb3NVdHNuYW1lEhgKB3N5c25hbWUYASABKAlSB3N5c25hbWUSGgoIbm9kZW5hbWUYAiABKAlSCG5vZGVuYW1lEhgKB3JlbGVhc2UYAyABKAlSB3JlbGVhc2USGAoHdmVyc2lvbhgEIAEoCVIHdmVyc2lvbhIYCgdtYWNoaW5lGAUgASgJUgdtYWNoaW5l'); @$core.Deprecated('Use iosDeviceInfoDescriptor instead') const IosDeviceInfo$json = const { '1': 'IosDeviceInfo', @@ -213,15 +349,41 @@ const IosDeviceInfo$json = const { const {'1': 'systemName', '3': 2, '4': 1, '5': 9, '10': 'systemName'}, const {'1': 'systemVersion', '3': 3, '4': 1, '5': 9, '10': 'systemVersion'}, const {'1': 'model', '3': 4, '4': 1, '5': 9, '10': 'model'}, - const {'1': 'localizedModel', '3': 5, '4': 1, '5': 9, '10': 'localizedModel'}, - const {'1': 'identifierForVendor', '3': 6, '4': 1, '5': 9, '10': 'identifierForVendor'}, - const {'1': 'isPhysicalDevice', '3': 7, '4': 1, '5': 8, '10': 'isPhysicalDevice'}, - const {'1': 'utsname', '3': 8, '4': 1, '5': 11, '6': '.gitjournal.IosUtsname', '10': 'utsname'}, + const { + '1': 'localizedModel', + '3': 5, + '4': 1, + '5': 9, + '10': 'localizedModel' + }, + const { + '1': 'identifierForVendor', + '3': 6, + '4': 1, + '5': 9, + '10': 'identifierForVendor' + }, + const { + '1': 'isPhysicalDevice', + '3': 7, + '4': 1, + '5': 8, + '10': 'isPhysicalDevice' + }, + const { + '1': 'utsname', + '3': 8, + '4': 1, + '5': 11, + '6': '.gitjournal.IosUtsname', + '10': 'utsname' + }, ], }; /// Descriptor for `IosDeviceInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List iosDeviceInfoDescriptor = $convert.base64Decode('Cg1Jb3NEZXZpY2VJbmZvEhIKBG5hbWUYASABKAlSBG5hbWUSHgoKc3lzdGVtTmFtZRgCIAEoCVIKc3lzdGVtTmFtZRIkCg1zeXN0ZW1WZXJzaW9uGAMgASgJUg1zeXN0ZW1WZXJzaW9uEhQKBW1vZGVsGAQgASgJUgVtb2RlbBImCg5sb2NhbGl6ZWRNb2RlbBgFIAEoCVIObG9jYWxpemVkTW9kZWwSMAoTaWRlbnRpZmllckZvclZlbmRvchgGIAEoCVITaWRlbnRpZmllckZvclZlbmRvchIqChBpc1BoeXNpY2FsRGV2aWNlGAcgASgIUhBpc1BoeXNpY2FsRGV2aWNlEjAKB3V0c25hbWUYCCABKAsyFi5naXRqb3VybmFsLklvc1V0c25hbWVSB3V0c25hbWU='); +final $typed_data.Uint8List iosDeviceInfoDescriptor = $convert.base64Decode( + 'Cg1Jb3NEZXZpY2VJbmZvEhIKBG5hbWUYASABKAlSBG5hbWUSHgoKc3lzdGVtTmFtZRgCIAEoCVIKc3lzdGVtTmFtZRIkCg1zeXN0ZW1WZXJzaW9uGAMgASgJUg1zeXN0ZW1WZXJzaW9uEhQKBW1vZGVsGAQgASgJUgVtb2RlbBImCg5sb2NhbGl6ZWRNb2RlbBgFIAEoCVIObG9jYWxpemVkTW9kZWwSMAoTaWRlbnRpZmllckZvclZlbmRvchgGIAEoCVITaWRlbnRpZmllckZvclZlbmRvchIqChBpc1BoeXNpY2FsRGV2aWNlGAcgASgIUhBpc1BoeXNpY2FsRGV2aWNlEjAKB3V0c25hbWUYCCABKAsyFi5naXRqb3VybmFsLklvc1V0c25hbWVSB3V0c25hbWU='); @$core.Deprecated('Use linuxDeviceInfoDescriptor instead') const LinuxDeviceInfo$json = const { '1': 'LinuxDeviceInfo', @@ -230,7 +392,13 @@ const LinuxDeviceInfo$json = const { const {'1': 'version', '3': 2, '4': 1, '5': 9, '10': 'version'}, const {'1': 'id', '3': 3, '4': 1, '5': 9, '10': 'id'}, const {'1': 'idLike', '3': 4, '4': 3, '5': 9, '10': 'idLike'}, - const {'1': 'versionCodename', '3': 5, '4': 1, '5': 9, '10': 'versionCodename'}, + const { + '1': 'versionCodename', + '3': 5, + '4': 1, + '5': 9, + '10': 'versionCodename' + }, const {'1': 'versionId', '3': 6, '4': 1, '5': 9, '10': 'versionId'}, const {'1': 'prettyName', '3': 7, '4': 1, '5': 9, '10': 'prettyName'}, const {'1': 'buildId', '3': 8, '4': 1, '5': 9, '10': 'buildId'}, @@ -241,7 +409,8 @@ const LinuxDeviceInfo$json = const { }; /// Descriptor for `LinuxDeviceInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List linuxDeviceInfoDescriptor = $convert.base64Decode('Cg9MaW51eERldmljZUluZm8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgd2ZXJzaW9uGAIgASgJUgd2ZXJzaW9uEg4KAmlkGAMgASgJUgJpZBIWCgZpZExpa2UYBCADKAlSBmlkTGlrZRIoCg92ZXJzaW9uQ29kZW5hbWUYBSABKAlSD3ZlcnNpb25Db2RlbmFtZRIcCgl2ZXJzaW9uSWQYBiABKAlSCXZlcnNpb25JZBIeCgpwcmV0dHlOYW1lGAcgASgJUgpwcmV0dHlOYW1lEhgKB2J1aWxkSWQYCCABKAlSB2J1aWxkSWQSGAoHdmFyaWFudBgJIAEoCVIHdmFyaWFudBIcCgl2YXJpYW50SWQYCiABKAlSCXZhcmlhbnRJZBIcCgltYWNoaW5lSWQYCyABKAlSCW1hY2hpbmVJZA=='); +final $typed_data.Uint8List linuxDeviceInfoDescriptor = $convert.base64Decode( + 'Cg9MaW51eERldmljZUluZm8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgd2ZXJzaW9uGAIgASgJUgd2ZXJzaW9uEg4KAmlkGAMgASgJUgJpZBIWCgZpZExpa2UYBCADKAlSBmlkTGlrZRIoCg92ZXJzaW9uQ29kZW5hbWUYBSABKAlSD3ZlcnNpb25Db2RlbmFtZRIcCgl2ZXJzaW9uSWQYBiABKAlSCXZlcnNpb25JZBIeCgpwcmV0dHlOYW1lGAcgASgJUgpwcmV0dHlOYW1lEhgKB2J1aWxkSWQYCCABKAlSB2J1aWxkSWQSGAoHdmFyaWFudBgJIAEoCVIHdmFyaWFudBIcCgl2YXJpYW50SWQYCiABKAlSCXZhcmlhbnRJZBIcCgltYWNoaW5lSWQYCyABKAlSCW1hY2hpbmVJZA=='); @$core.Deprecated('Use macOSDeviceInfoDescriptor instead') const MacOSDeviceInfo$json = const { '1': 'MacOSDeviceInfo', @@ -259,24 +428,39 @@ const MacOSDeviceInfo$json = const { }; /// Descriptor for `MacOSDeviceInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List macOSDeviceInfoDescriptor = $convert.base64Decode('Cg9NYWNPU0RldmljZUluZm8SIgoMY29tcHV0ZXJOYW1lGAEgASgJUgxjb21wdXRlck5hbWUSGgoIaG9zdE5hbWUYAiABKAlSCGhvc3ROYW1lEhIKBGFyY2gYAyABKAlSBGFyY2gSFAoFbW9kZWwYBCABKAlSBW1vZGVsEiQKDWtlcm5lbFZlcnNpb24YBSABKAlSDWtlcm5lbFZlcnNpb24SHAoJb3NSZWxlYXNlGAYgASgJUglvc1JlbGVhc2USHgoKYWN0aXZlQ1BVcxgHIAEoBVIKYWN0aXZlQ1BVcxIeCgptZW1vcnlTaXplGAggASgFUgptZW1vcnlTaXplEiIKDGNwdUZyZXF1ZW5jeRgJIAEoBVIMY3B1RnJlcXVlbmN5'); +final $typed_data.Uint8List macOSDeviceInfoDescriptor = $convert.base64Decode( + 'Cg9NYWNPU0RldmljZUluZm8SIgoMY29tcHV0ZXJOYW1lGAEgASgJUgxjb21wdXRlck5hbWUSGgoIaG9zdE5hbWUYAiABKAlSCGhvc3ROYW1lEhIKBGFyY2gYAyABKAlSBGFyY2gSFAoFbW9kZWwYBCABKAlSBW1vZGVsEiQKDWtlcm5lbFZlcnNpb24YBSABKAlSDWtlcm5lbFZlcnNpb24SHAoJb3NSZWxlYXNlGAYgASgJUglvc1JlbGVhc2USHgoKYWN0aXZlQ1BVcxgHIAEoBVIKYWN0aXZlQ1BVcxIeCgptZW1vcnlTaXplGAggASgFUgptZW1vcnlTaXplEiIKDGNwdUZyZXF1ZW5jeRgJIAEoBVIMY3B1RnJlcXVlbmN5'); @$core.Deprecated('Use windowsDeviceInfoDescriptor instead') const WindowsDeviceInfo$json = const { '1': 'WindowsDeviceInfo', '2': const [ const {'1': 'computerName', '3': 1, '4': 1, '5': 9, '10': 'computerName'}, const {'1': 'numberOfCores', '3': 2, '4': 1, '5': 5, '10': 'numberOfCores'}, - const {'1': 'systemMemoryInMegabytes', '3': 3, '4': 1, '5': 5, '10': 'systemMemoryInMegabytes'}, + const { + '1': 'systemMemoryInMegabytes', + '3': 3, + '4': 1, + '5': 5, + '10': 'systemMemoryInMegabytes' + }, ], }; /// Descriptor for `WindowsDeviceInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List windowsDeviceInfoDescriptor = $convert.base64Decode('ChFXaW5kb3dzRGV2aWNlSW5mbxIiCgxjb21wdXRlck5hbWUYASABKAlSDGNvbXB1dGVyTmFtZRIkCg1udW1iZXJPZkNvcmVzGAIgASgFUg1udW1iZXJPZkNvcmVzEjgKF3N5c3RlbU1lbW9yeUluTWVnYWJ5dGVzGAMgASgFUhdzeXN0ZW1NZW1vcnlJbk1lZ2FieXRlcw=='); +final $typed_data.Uint8List windowsDeviceInfoDescriptor = $convert.base64Decode( + 'ChFXaW5kb3dzRGV2aWNlSW5mbxIiCgxjb21wdXRlck5hbWUYASABKAlSDGNvbXB1dGVyTmFtZRIkCg1udW1iZXJPZkNvcmVzGAIgASgFUg1udW1iZXJPZkNvcmVzEjgKF3N5c3RlbU1lbW9yeUluTWVnYWJ5dGVzGAMgASgFUhdzeXN0ZW1NZW1vcnlJbk1lZ2FieXRlcw=='); @$core.Deprecated('Use webBrowserInfoDescriptor instead') const WebBrowserInfo$json = const { '1': 'WebBrowserInfo', '2': const [ - const {'1': 'browserName', '3': 1, '4': 1, '5': 14, '6': '.gitjournal.BrowserName', '10': 'browserName'}, + const { + '1': 'browserName', + '3': 1, + '4': 1, + '5': 14, + '6': '.gitjournal.BrowserName', + '10': 'browserName' + }, const {'1': 'appCodeName', '3': 2, '4': 1, '5': 9, '10': 'appCodeName'}, const {'1': 'appName', '3': 3, '4': 1, '5': 9, '10': 'appName'}, const {'1': 'appVersion', '3': 4, '4': 1, '5': 9, '10': 'appVersion'}, @@ -289,10 +473,23 @@ const WebBrowserInfo$json = const { const {'1': 'userAgent', '3': 11, '4': 1, '5': 9, '10': 'userAgent'}, const {'1': 'vendor', '3': 12, '4': 1, '5': 9, '10': 'vendor'}, const {'1': 'vendorSub', '3': 13, '4': 1, '5': 9, '10': 'vendorSub'}, - const {'1': 'hardwareConcurrency', '3': 14, '4': 1, '5': 5, '10': 'hardwareConcurrency'}, - const {'1': 'maxTouchPoints', '3': 15, '4': 1, '5': 5, '10': 'maxTouchPoints'}, + const { + '1': 'hardwareConcurrency', + '3': 14, + '4': 1, + '5': 5, + '10': 'hardwareConcurrency' + }, + const { + '1': 'maxTouchPoints', + '3': 15, + '4': 1, + '5': 5, + '10': 'maxTouchPoints' + }, ], }; /// Descriptor for `WebBrowserInfo`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List webBrowserInfoDescriptor = $convert.base64Decode('Cg5XZWJCcm93c2VySW5mbxI5Cgticm93c2VyTmFtZRgBIAEoDjIXLmdpdGpvdXJuYWwuQnJvd3Nlck5hbWVSC2Jyb3dzZXJOYW1lEiAKC2FwcENvZGVOYW1lGAIgASgJUgthcHBDb2RlTmFtZRIYCgdhcHBOYW1lGAMgASgJUgdhcHBOYW1lEh4KCmFwcFZlcnNpb24YBCABKAlSCmFwcFZlcnNpb24SIgoMZGV2aWNlTWVtb3J5GAUgASgFUgxkZXZpY2VNZW1vcnkSGgoIbGFuZ3VhZ2UYBiABKAlSCGxhbmd1YWdlEhwKCWxhbmd1YWdlcxgHIAMoCVIJbGFuZ3VhZ2VzEhoKCHBsYXRmb3JtGAggASgJUghwbGF0Zm9ybRIYCgdwcm9kdWN0GAkgASgJUgdwcm9kdWN0Eh4KCnByb2R1Y3RTdWIYCiABKAlSCnByb2R1Y3RTdWISHAoJdXNlckFnZW50GAsgASgJUgl1c2VyQWdlbnQSFgoGdmVuZG9yGAwgASgJUgZ2ZW5kb3ISHAoJdmVuZG9yU3ViGA0gASgJUgl2ZW5kb3JTdWISMAoTaGFyZHdhcmVDb25jdXJyZW5jeRgOIAEoBVITaGFyZHdhcmVDb25jdXJyZW5jeRImCg5tYXhUb3VjaFBvaW50cxgPIAEoBVIObWF4VG91Y2hQb2ludHM='); +final $typed_data.Uint8List webBrowserInfoDescriptor = $convert.base64Decode( + 'Cg5XZWJCcm93c2VySW5mbxI5Cgticm93c2VyTmFtZRgBIAEoDjIXLmdpdGpvdXJuYWwuQnJvd3Nlck5hbWVSC2Jyb3dzZXJOYW1lEiAKC2FwcENvZGVOYW1lGAIgASgJUgthcHBDb2RlTmFtZRIYCgdhcHBOYW1lGAMgASgJUgdhcHBOYW1lEh4KCmFwcFZlcnNpb24YBCABKAlSCmFwcFZlcnNpb24SIgoMZGV2aWNlTWVtb3J5GAUgASgFUgxkZXZpY2VNZW1vcnkSGgoIbGFuZ3VhZ2UYBiABKAlSCGxhbmd1YWdlEhwKCWxhbmd1YWdlcxgHIAMoCVIJbGFuZ3VhZ2VzEhoKCHBsYXRmb3JtGAggASgJUghwbGF0Zm9ybRIYCgdwcm9kdWN0GAkgASgJUgdwcm9kdWN0Eh4KCnByb2R1Y3RTdWIYCiABKAlSCnByb2R1Y3RTdWISHAoJdXNlckFnZW50GAsgASgJUgl1c2VyQWdlbnQSFgoGdmVuZG9yGAwgASgJUgZ2ZW5kb3ISHAoJdmVuZG9yU3ViGA0gASgJUgl2ZW5kb3JTdWISMAoTaGFyZHdhcmVDb25jdXJyZW5jeRgOIAEoBVITaGFyZHdhcmVDb25jdXJyZW5jeRImCg5tYXhUb3VjaFBvaW50cxgPIAEoBVIObWF4VG91Y2hQb2ludHM='); diff --git a/lib/core/notes_folder_fs.dart b/lib/core/notes_folder_fs.dart index c00c91f1..67539488 100644 --- a/lib/core/notes_folder_fs.dart +++ b/lib/core/notes_folder_fs.dart @@ -189,11 +189,7 @@ class NotesFolderFS with NotesFolderNotifier implements NotesFolder { await Future.wait(futures); } - Future load() async { - return _lock.synchronized(() async { - return _load(); - }); - } + Future load() => _lock.synchronized(_load); // FIXME: This should not reconstruct the Notes or NotesFolders once constructed. Future _load() async {