Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/lint-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.10.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.10.0)" variant="all" version="8.10.0">
<issues format="6" by="lint 8.12.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.12.0)" variant="all" version="8.12.0">

<!--TODO(#855) see if this is no longer needed-->
<issue
id="InvalidPackage"
message="Invalid package reference in library; not included in Android: `javax.xml.stream`. Referenced from `org.apache.tika.utils.XMLReaderUtils`.">
<location
file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.apache.tika/tika-core/3.2.0/9232bb3c71f231e8228f570071c0e1ea29d40115/tika-core-3.2.0.jar"/>
file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.apache.tika/tika-core/3.2.3/4b1b82f8cce72c9bd3676532c8b613e24041d96c/tika-core-3.2.3.jar"/>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ignored issue in `android/app/lint-baseline.xml` regarding the
Apache Tika library still occurs with this newer version. Tika
library was updated in the newer version:
  https://github.com/miguelpruivo/flutter_file_picker/commit/66fedc4f6
and because of that Android lint was complaining about this error again
but didn't ignore it because the error's version didn't match the
baseline file. So, this commit also updates the `lint-baseline.xml`
by running `./gradlew updateLintBaseline` in the android directory.

Annoying. Thanks for taking care of this.

</issue>

</issues>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
// Autogenerated from Pigeon (v26.1.7), do not edit directly.
// See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

Expand Down Expand Up @@ -199,5 +199,9 @@ abstract class AndroidIntentEventsStreamHandler : AndroidIntentsPigeonEventChann
EventChannel(messenger, channelName, AndroidIntentsPigeonMethodCodec).setStreamHandler(internalStreamHandler)
}
}
// Implement methods from AndroidIntentsPigeonEventChannelWrapper
override fun onListen(p0: Any?, sink: PigeonEventSink<AndroidIntentEvent>) {}

override fun onCancel(p0: Any?) {}
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
// Autogenerated from Pigeon (v26.1.7), do not edit directly.
// See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
// Autogenerated from Pigeon (v26.1.7), do not edit directly.
// See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

Expand Down Expand Up @@ -344,5 +344,9 @@ abstract class NotificationTapEventsStreamHandler : NotificationsPigeonEventChan
EventChannel(messenger, channelName, NotificationsPigeonMethodCodec).setStreamHandler(internalStreamHandler)
}
}
// Implement methods from NotificationsPigeonEventChannelWrapper
override fun onListen(p0: Any?, sink: PigeonEventSink<NotificationTapEvent>) {}

override fun onCancel(p0: Any?) {}
}

89 changes: 41 additions & 48 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- app_settings (5.1.1):
- app_settings (6.1.2):
- Flutter
- device_info_plus (0.0.1):
- Flutter
Expand Down Expand Up @@ -37,32 +37,32 @@ PODS:
- file_picker (0.0.1):
- DKImagePickerController/PhotoGallery
- Flutter
- Firebase/CoreOnly (12.4.0):
- FirebaseCore (~> 12.4.0)
- Firebase/Messaging (12.4.0):
- Firebase/CoreOnly (12.8.0):
- FirebaseCore (~> 12.8.0)
- Firebase/Messaging (12.8.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 12.4.0)
- firebase_core (4.2.1):
- Firebase/CoreOnly (= 12.4.0)
- FirebaseMessaging (~> 12.8.0)
- firebase_core (4.4.0):
- Firebase/CoreOnly (= 12.8.0)
- Flutter
- firebase_messaging (16.0.4):
- Firebase/Messaging (= 12.4.0)
- firebase_messaging (16.1.1):
- Firebase/Messaging (= 12.8.0)
- firebase_core
- Flutter
- FirebaseCore (12.4.0):
- FirebaseCoreInternal (~> 12.4.0)
- FirebaseCore (12.8.0):
- FirebaseCoreInternal (~> 12.8.0)
- GoogleUtilities/Environment (~> 8.1)
- GoogleUtilities/Logger (~> 8.1)
- FirebaseCoreInternal (12.4.0):
- FirebaseCoreInternal (12.8.0):
- "GoogleUtilities/NSData+zlib (~> 8.1)"
- FirebaseInstallations (12.4.0):
- FirebaseCore (~> 12.4.0)
- FirebaseInstallations (12.8.0):
- FirebaseCore (~> 12.8.0)
- GoogleUtilities/Environment (~> 8.1)
- GoogleUtilities/UserDefaults (~> 8.1)
- PromisesObjC (~> 2.4)
- FirebaseMessaging (12.4.0):
- FirebaseCore (~> 12.4.0)
- FirebaseInstallations (~> 12.4.0)
- FirebaseMessaging (12.8.0):
- FirebaseCore (~> 12.8.0)
- FirebaseInstallations (~> 12.8.0)
- GoogleDataTransport (~> 10.1)
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/Environment (~> 8.1)
Expand Down Expand Up @@ -108,34 +108,31 @@ PODS:
- nanopb/encode (3.30910.0)
- package_info_plus (0.4.5):
- Flutter
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- PromisesObjC (2.4.0)
- SDWebImage (5.21.5):
- SDWebImage/Core (= 5.21.5)
- SDWebImage/Core (5.21.5)
- SDWebImage (5.21.6):
- SDWebImage/Core (= 5.21.6)
- SDWebImage/Core (5.21.6)
- share_plus (0.0.1):
- Flutter
- sqlite3 (3.50.4):
- sqlite3/common (= 3.50.4)
- sqlite3/common (3.50.4)
- sqlite3/dbstatvtab (3.50.4):
- sqlite3 (3.51.1):
- sqlite3/common (= 3.51.1)
- sqlite3/common (3.51.1)
- sqlite3/dbstatvtab (3.51.1):
- sqlite3/common
- sqlite3/fts5 (3.50.4):
- sqlite3/fts5 (3.51.1):
- sqlite3/common
- sqlite3/math (3.50.4):
- sqlite3/math (3.51.1):
- sqlite3/common
- sqlite3/perf-threadsafe (3.50.4):
- sqlite3/perf-threadsafe (3.51.1):
- sqlite3/common
- sqlite3/rtree (3.50.4):
- sqlite3/rtree (3.51.1):
- sqlite3/common
- sqlite3/session (3.50.4):
- sqlite3/session (3.51.1):
- sqlite3/common
- sqlite3_flutter_libs (0.0.1):
- Flutter
- FlutterMacOS
- sqlite3 (~> 3.50.4)
- sqlite3 (~> 3.51.1)
- sqlite3/dbstatvtab
- sqlite3/fts5
- sqlite3/math
Expand All @@ -161,7 +158,6 @@ DEPENDENCIES:
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
Expand Down Expand Up @@ -204,8 +200,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/integration_test/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
sqlite3_flutter_libs:
Expand All @@ -218,31 +212,30 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/wakelock_plus/ios"

SPEC CHECKSUMS:
app_settings: 5127ae0678de1dcc19f2293271c51d37c89428b2
app_settings: 0341ec6daa4f0c50f5a421bf0ad7c36084db6e90
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
firebase_messaging: c17a29984eafce4b2997fe078bb0a9e0b06f5dde
FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
FirebaseMessaging: d33971b7bb252745ea6cd31ab190d1a1df4b8ed5
Firebase: 9a58fdbc9d8655ed7b79a19cf9690bb007d3d46d
firebase_core: ee30637e6744af8e0c12a6a1e8a9718506ec2398
firebase_messaging: 343de01a8d3e18b60df0c6d37f7174c44ae38e02
FirebaseCore: 0dbad74bda10b8fb9ca34ad8f375fb9dd3ebef7c
FirebaseCoreInternal: fe5fa466aeb314787093a7dce9f0beeaad5a2a21
FirebaseInstallations: 6a14ab3d694ebd9f839c48d330da5547e9ca9dc0
FirebaseMessaging: 7f42cfd10ec64181db4e01b305a613791c8e782c
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
SDWebImage: 1bb6a1b84b6fe87b972a102bdc77dd589df33477
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b
sqlite3_flutter_libs: d13b8b3003f18f596e542bcb9482d105577eff41
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Notifications.g.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
// Autogenerated from Pigeon (v26.1.7), do not edit directly.
// See also: https://pub.dev/packages/pigeon

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions lib/api/route/channels.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Future<void> subscribeToChannel(ApiConnection connection, {
}) {
return connection.post('subscribeToChannel', (_) {}, 'users/me/subscriptions', {
'subscriptions': subscriptions.map((name) => {'name': name}).toList(),
if (principals != null) 'principals': principals,
'principals': ?principals,
});
}

Expand All @@ -36,7 +36,7 @@ Future<void> unsubscribeFromChannel(ApiConnection connection, {
}) {
return connection.delete('unsubscribeFromChannel', (_) {}, 'users/me/subscriptions', {
'subscriptions': subscriptions,
if (principals != null) 'principals': principals,
'principals': ?principals,
});
}

Expand Down
4 changes: 2 additions & 2 deletions lib/api/route/events.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Future<GetEventsResult> getEvents(ApiConnection connection, {
}) {
return connection.get('getEvents', GetEventsResult.fromJson, 'events', {
'queue_id': RawParameter(queueId),
if (lastEventId != null) 'last_event_id': lastEventId,
if (dontBlock != null) 'dont_block': dontBlock,
'last_event_id': ?lastEventId,
'dont_block': ?dontBlock,
});
}

Expand Down
18 changes: 9 additions & 9 deletions lib/api/route/messages.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Future<GetMessageResult> getMessage(ApiConnection connection, {
}) {
assert(allowEmptyTopicName, '`allowEmptyTopicName` should only be true');
return connection.get('getMessage', GetMessageResult.fromJson, 'messages/$messageId', {
if (applyMarkdown != null) 'apply_markdown': applyMarkdown,
'apply_markdown': ?applyMarkdown,
'allow_empty_topic_name': allowEmptyTopicName,
});
}
Expand Down Expand Up @@ -51,11 +51,11 @@ Future<GetMessagesResult> getMessages(ApiConnection connection, {
return connection.get('getMessages', GetMessagesResult.fromJson, 'messages', {
'narrow': resolveApiNarrowForServer(narrow, connection.zulipFeatureLevel!),
'anchor': RawParameter(anchor.toJson()),
if (includeAnchor != null) 'include_anchor': includeAnchor,
'include_anchor': ?includeAnchor,
'num_before': numBefore,
'num_after': numAfter,
if (clientGravatar != null) 'client_gravatar': clientGravatar,
if (applyMarkdown != null) 'apply_markdown': applyMarkdown,
'client_gravatar': ?clientGravatar,
'apply_markdown': ?applyMarkdown,
'allow_empty_topic_name': allowEmptyTopicName,
});
}
Expand Down Expand Up @@ -149,7 +149,7 @@ Future<SendMessageResult> sendMessage(
'content': RawParameter(content),
if (queueId != null) 'queue_id': RawParameter(queueId),
if (localId != null) 'local_id': RawParameter(localId),
if (readBySender != null) 'read_by_sender': readBySender,
'read_by_sender': ?readBySender,
},
overrideUserAgent: switch ((supportsReadBySender, readBySender)) {
// Old servers use the user agent to decide if we're a UI client
Expand Down Expand Up @@ -227,11 +227,11 @@ Future<UpdateMessageResult> updateMessage(
return connection.patch('updateMessage', UpdateMessageResult.fromJson, 'messages/$messageId', {
if (topic != null) 'topic': RawParameter(topic.apiName),
if (propagateMode != null) 'propagate_mode': RawParameter(propagateMode.toJson()),
if (sendNotificationToOldThread != null) 'send_notification_to_old_thread': sendNotificationToOldThread,
if (sendNotificationToNewThread != null) 'send_notification_to_new_thread': sendNotificationToNewThread,
'send_notification_to_old_thread': ?sendNotificationToOldThread,
'send_notification_to_new_thread': ?sendNotificationToNewThread,
if (content != null) 'content': RawParameter(content),
if (prevContentSha256 != null) 'prev_content_sha256': RawParameter(prevContentSha256),
if (streamId != null) 'stream_id': streamId,
'stream_id': ?streamId,
});
}

Expand Down Expand Up @@ -381,7 +381,7 @@ Future<UpdateMessageFlagsForNarrowResult> updateMessageFlagsForNarrow(ApiConnect
}) {
return connection.post('updateMessageFlagsForNarrow', UpdateMessageFlagsForNarrowResult.fromJson, 'messages/flags/narrow', {
'anchor': RawParameter(anchor.toJson()),
if (includeAnchor != null) 'include_anchor': includeAnchor,
'include_anchor': ?includeAnchor,
'num_before': numBefore,
'num_after': numAfter,
'narrow': resolveApiNarrowForServer(narrow, connection.zulipFeatureLevel!),
Expand Down
8 changes: 4 additions & 4 deletions lib/api/route/users.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ Future<UpdatePresenceResult> updatePresence(ApiConnection connection, {
required PresenceStatus status,
}) {
return connection.post('updatePresence', UpdatePresenceResult.fromJson, 'users/me/presence', {
if (lastUpdateId != null) 'last_update_id': lastUpdateId,
if (historyLimitDays != null) 'history_limit_days': historyLimitDays,
if (newUserInput != null) 'new_user_input': newUserInput,
if (pingOnly != null) 'ping_only': pingOnly,
'last_update_id': ?lastUpdateId,
'history_limit_days': ?historyLimitDays,
'new_user_input': ?newUserInput,
'ping_only': ?pingOnly,
'status': RawParameter(status.toJson()),
'slim_presence': true,
});
Expand Down
4 changes: 2 additions & 2 deletions lib/host/android_intents.g.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
// Autogenerated from Pigeon (v26.1.7), do not edit directly.
// See also: https://pub.dev/packages/pigeon
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers

import 'dart:async';
import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
Expand Down
Loading