Skip to content

Commit 3bf67e2

Browse files
MichaelVerdonMichaelVerdon
committed
chore: android override
1 parent a1e6bed commit 3bf67e2

File tree

10 files changed

+754
-56
lines changed

10 files changed

+754
-56
lines changed

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/FirebaseDatabaseHostApiImpl.kt‎

Lines changed: 694 additions & 0 deletions
Large diffs are not rendered by default.

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ class FirebaseDatabasePlugin :
7272

7373
methodChannel = MethodChannel(messenger, METHOD_CHANNEL_NAME)
7474
methodChannel.setMethodCallHandler(this)
75+
76+
// Set up Pigeon API
77+
val pigeonApi = FirebaseDatabaseHostApiImpl()
78+
FirebaseDatabaseHostApi.setUp(messenger, pigeonApi)
7579
}
7680

7781
private fun getDatabase(arguments: Map<String, Any>): FirebaseDatabase {

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/GeneratedAndroidFirebaseDatabase.g.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ data class DatabaseReference (
154154
}
155155

156156
/** Generated class from Pigeon that represents data sent in messages. */
157-
data class TransactionHandler (
157+
data class DatabaseTransactionHandler (
158158
val transactionKey: Long
159159
)
160160
{
161161
companion object {
162-
fun fromList(pigeonVar_list: List<Any?>): TransactionHandler {
162+
fun fromList(pigeonVar_list: List<Any?>): DatabaseTransactionHandler {
163163
val transactionKey = pigeonVar_list[0] as Long
164-
return TransactionHandler(transactionKey)
164+
return DatabaseTransactionHandler(transactionKey)
165165
}
166166
}
167167
fun toList(): List<Any?> {
@@ -170,7 +170,7 @@ data class TransactionHandler (
170170
)
171171
}
172172
override fun equals(other: Any?): Boolean {
173-
if (other !is TransactionHandler) {
173+
if (other !is DatabaseTransactionHandler) {
174174
return false
175175
}
176176
if (this === other) {
@@ -450,14 +450,14 @@ data class RemoveOptions (
450450
/** Generated class from Pigeon that represents data sent in messages. */
451451
data class TransactionOptions (
452452
val path: String,
453-
val transactionHandler: TransactionHandler,
453+
val transactionHandler: DatabaseTransactionHandler,
454454
val applyLocally: Boolean
455455
)
456456
{
457457
companion object {
458458
fun fromList(pigeonVar_list: List<Any?>): TransactionOptions {
459459
val path = pigeonVar_list[0] as String
460-
val transactionHandler = pigeonVar_list[1] as TransactionHandler
460+
val transactionHandler = pigeonVar_list[1] as DatabaseTransactionHandler
461461
val applyLocally = pigeonVar_list[2] as Boolean
462462
return TransactionOptions(path, transactionHandler, applyLocally)
463463
}
@@ -523,7 +523,7 @@ private open class GeneratedAndroidFirebaseDatabasePigeonCodec : StandardMessage
523523
}
524524
131.toByte() -> {
525525
return (readValue(buffer) as? List<Any?>)?.let {
526-
TransactionHandler.fromList(it)
526+
DatabaseTransactionHandler.fromList(it)
527527
}
528528
}
529529
132.toByte() -> {
@@ -589,7 +589,7 @@ private open class GeneratedAndroidFirebaseDatabasePigeonCodec : StandardMessage
589589
stream.write(130)
590590
writeValue(stream, value.toList())
591591
}
592-
is TransactionHandler -> {
592+
is DatabaseTransactionHandler -> {
593593
stream.write(131)
594594
writeValue(stream, value.toList())
595595
}

‎packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,15 @@ struct DatabaseReference: Hashable {
204204
}
205205

206206
/// Generated class from Pigeon that represents data sent in messages.
207-
struct TransactionHandler: Hashable {
207+
struct DatabaseTransactionHandler: Hashable {
208208
var transactionKey: Int64
209209

210210

211211
// swift-format-ignore: AlwaysUseLowerCamelCase
212-
static func fromList(_ pigeonVar_list: [Any?]) -> TransactionHandler? {
212+
static func fromList(_ pigeonVar_list: [Any?]) -> DatabaseTransactionHandler? {
213213
let transactionKey = pigeonVar_list[0] as! Int64
214214

215-
return TransactionHandler(
215+
return DatabaseTransactionHandler(
216216
transactionKey: transactionKey
217217
)
218218
}
@@ -221,7 +221,7 @@ struct TransactionHandler: Hashable {
221221
transactionKey
222222
]
223223
}
224-
static func == (lhs: TransactionHandler, rhs: TransactionHandler) -> Bool {
224+
static func == (lhs: DatabaseTransactionHandler, rhs: DatabaseTransactionHandler) -> Bool {
225225
return deepEqualsFirebaseDatabaseMessages(lhs.toList(), rhs.toList()) }
226226
func hash(into hasher: inout Hasher) {
227227
deepHashFirebaseDatabaseMessages(value: toList(), hasher: &hasher)
@@ -487,14 +487,14 @@ struct RemoveOptions: Hashable {
487487
/// Generated class from Pigeon that represents data sent in messages.
488488
struct TransactionOptions: Hashable {
489489
var path: String
490-
var transactionHandler: TransactionHandler
490+
var transactionHandler: DatabaseTransactionHandler
491491
var applyLocally: Bool
492492

493493

494494
// swift-format-ignore: AlwaysUseLowerCamelCase
495495
static func fromList(_ pigeonVar_list: [Any?]) -> TransactionOptions? {
496496
let path = pigeonVar_list[0] as! String
497-
let transactionHandler = pigeonVar_list[1] as! TransactionHandler
497+
let transactionHandler = pigeonVar_list[1] as! DatabaseTransactionHandler
498498
let applyLocally = pigeonVar_list[2] as! Bool
499499

500500
return TransactionOptions(
@@ -550,7 +550,7 @@ private class FirebaseDatabaseMessagesPigeonCodecReader: FlutterStandardReader {
550550
case 130:
551551
return DatabaseReference.fromList(self.readValue() as! [Any?])
552552
case 131:
553-
return TransactionHandler.fromList(self.readValue() as! [Any?])
553+
return DatabaseTransactionHandler.fromList(self.readValue() as! [Any?])
554554
case 132:
555555
return EventObserver.fromList(self.readValue() as! [Any?])
556556
case 133:
@@ -585,7 +585,7 @@ private class FirebaseDatabaseMessagesPigeonCodecWriter: FlutterStandardWriter {
585585
} else if let value = value as? DatabaseReference {
586586
super.writeByte(130)
587587
super.writeValue(value.toList())
588-
} else if let value = value as? TransactionHandler {
588+
} else if let value = value as? DatabaseTransactionHandler {
589589
super.writeByte(131)
590590
super.writeValue(value.toList())
591591
} else if let value = value as? EventObserver {

‎packages/firebase_database/firebase_database/windows/messages.g.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -207,29 +207,29 @@ DatabaseReference DatabaseReference::FromEncodableList(const EncodableList& list
207207
return decoded;
208208
}
209209

210-
// TransactionHandler
210+
// DatabaseTransactionHandler
211211

212-
TransactionHandler::TransactionHandler(int64_t transaction_key)
212+
DatabaseTransactionHandler::DatabaseTransactionHandler(int64_t transaction_key)
213213
: transaction_key_(transaction_key) {}
214214

215-
int64_t TransactionHandler::transaction_key() const {
215+
int64_t DatabaseTransactionHandler::transaction_key() const {
216216
return transaction_key_;
217217
}
218218

219-
void TransactionHandler::set_transaction_key(int64_t value_arg) {
219+
void DatabaseTransactionHandler::set_transaction_key(int64_t value_arg) {
220220
transaction_key_ = value_arg;
221221
}
222222

223223

224-
EncodableList TransactionHandler::ToEncodableList() const {
224+
EncodableList DatabaseTransactionHandler::ToEncodableList() const {
225225
EncodableList list;
226226
list.reserve(1);
227227
list.push_back(EncodableValue(transaction_key_));
228228
return list;
229229
}
230230

231-
TransactionHandler TransactionHandler::FromEncodableList(const EncodableList& list) {
232-
TransactionHandler decoded(
231+
DatabaseTransactionHandler DatabaseTransactionHandler::FromEncodableList(const EncodableList& list) {
232+
DatabaseTransactionHandler decoded(
233233
std::get<int64_t>(list[0]));
234234
return decoded;
235235
}
@@ -697,20 +697,20 @@ RemoveOptions RemoveOptions::FromEncodableList(const EncodableList& list) {
697697

698698
TransactionOptions::TransactionOptions(
699699
const std::string& path,
700-
const TransactionHandler& transaction_handler,
700+
const DatabaseTransactionHandler& transaction_handler,
701701
bool apply_locally)
702702
: path_(path),
703-
transaction_handler_(std::make_unique<TransactionHandler>(transaction_handler)),
703+
transaction_handler_(std::make_unique<DatabaseTransactionHandler>(transaction_handler)),
704704
apply_locally_(apply_locally) {}
705705

706706
TransactionOptions::TransactionOptions(const TransactionOptions& other)
707707
: path_(other.path_),
708-
transaction_handler_(std::make_unique<TransactionHandler>(*other.transaction_handler_)),
708+
transaction_handler_(std::make_unique<DatabaseTransactionHandler>(*other.transaction_handler_)),
709709
apply_locally_(other.apply_locally_) {}
710710

711711
TransactionOptions& TransactionOptions::operator=(const TransactionOptions& other) {
712712
path_ = other.path_;
713-
transaction_handler_ = std::make_unique<TransactionHandler>(*other.transaction_handler_);
713+
transaction_handler_ = std::make_unique<DatabaseTransactionHandler>(*other.transaction_handler_);
714714
apply_locally_ = other.apply_locally_;
715715
return *this;
716716
}
@@ -724,12 +724,12 @@ void TransactionOptions::set_path(std::string_view value_arg) {
724724
}
725725

726726

727-
const TransactionHandler& TransactionOptions::transaction_handler() const {
727+
const DatabaseTransactionHandler& TransactionOptions::transaction_handler() const {
728728
return *transaction_handler_;
729729
}
730730

731-
void TransactionOptions::set_transaction_handler(const TransactionHandler& value_arg) {
732-
transaction_handler_ = std::make_unique<TransactionHandler>(value_arg);
731+
void TransactionOptions::set_transaction_handler(const DatabaseTransactionHandler& value_arg) {
732+
transaction_handler_ = std::make_unique<DatabaseTransactionHandler>(value_arg);
733733
}
734734

735735

@@ -754,7 +754,7 @@ EncodableList TransactionOptions::ToEncodableList() const {
754754
TransactionOptions TransactionOptions::FromEncodableList(const EncodableList& list) {
755755
TransactionOptions decoded(
756756
std::get<std::string>(list[0]),
757-
std::any_cast<const TransactionHandler&>(std::get<CustomEncodableValue>(list[1])),
757+
std::any_cast<const DatabaseTransactionHandler&>(std::get<CustomEncodableValue>(list[1])),
758758
std::get<bool>(list[2]));
759759
return decoded;
760760
}
@@ -800,7 +800,7 @@ EncodableValue PigeonInternalCodecSerializer::ReadValueOfType(
800800
return CustomEncodableValue(DatabaseReference::FromEncodableList(std::get<EncodableList>(ReadValue(stream))));
801801
}
802802
case 131: {
803-
return CustomEncodableValue(TransactionHandler::FromEncodableList(std::get<EncodableList>(ReadValue(stream))));
803+
return CustomEncodableValue(DatabaseTransactionHandler::FromEncodableList(std::get<EncodableList>(ReadValue(stream))));
804804
}
805805
case 132: {
806806
return CustomEncodableValue(EventObserver::FromEncodableList(std::get<EncodableList>(ReadValue(stream))));
@@ -851,9 +851,9 @@ void PigeonInternalCodecSerializer::WriteValue(
851851
WriteValue(EncodableValue(std::any_cast<DatabaseReference>(*custom_value).ToEncodableList()), stream);
852852
return;
853853
}
854-
if (custom_value->type() == typeid(TransactionHandler)) {
854+
if (custom_value->type() == typeid(DatabaseTransactionHandler)) {
855855
stream->WriteByte(131);
856-
WriteValue(EncodableValue(std::any_cast<TransactionHandler>(*custom_value).ToEncodableList()), stream);
856+
WriteValue(EncodableValue(std::any_cast<DatabaseTransactionHandler>(*custom_value).ToEncodableList()), stream);
857857
return;
858858
}
859859
if (custom_value->type() == typeid(EventObserver)) {

‎packages/firebase_database/firebase_database/windows/messages.g.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,16 @@ class DatabaseReference {
135135

136136

137137
// Generated class from Pigeon that represents data sent in messages.
138-
class TransactionHandler {
138+
class DatabaseTransactionHandler {
139139
public:
140140
// Constructs an object setting all fields.
141-
explicit TransactionHandler(int64_t transaction_key);
141+
explicit DatabaseTransactionHandler(int64_t transaction_key);
142142

143143
int64_t transaction_key() const;
144144
void set_transaction_key(int64_t value_arg);
145145

146146
private:
147-
static TransactionHandler FromEncodableList(const flutter::EncodableList& list);
147+
static DatabaseTransactionHandler FromEncodableList(const flutter::EncodableList& list);
148148
flutter::EncodableList ToEncodableList() const;
149149
friend class TransactionOptions;
150150
friend class FirebaseDatabaseHostApi;
@@ -397,7 +397,7 @@ class TransactionOptions {
397397
// Constructs an object setting all fields.
398398
explicit TransactionOptions(
399399
const std::string& path,
400-
const TransactionHandler& transaction_handler,
400+
const DatabaseTransactionHandler& transaction_handler,
401401
bool apply_locally);
402402

403403
~TransactionOptions() = default;
@@ -408,8 +408,8 @@ class TransactionOptions {
408408
const std::string& path() const;
409409
void set_path(std::string_view value_arg);
410410

411-
const TransactionHandler& transaction_handler() const;
412-
void set_transaction_handler(const TransactionHandler& value_arg);
411+
const DatabaseTransactionHandler& transaction_handler() const;
412+
void set_transaction_handler(const DatabaseTransactionHandler& value_arg);
413413

414414
bool apply_locally() const;
415415
void set_apply_locally(bool value_arg);
@@ -420,7 +420,7 @@ class TransactionOptions {
420420
friend class FirebaseDatabaseHostApi;
421421
friend class PigeonInternalCodecSerializer;
422422
std::string path_;
423-
std::unique_ptr<TransactionHandler> transaction_handler_;
423+
std::unique_ptr<DatabaseTransactionHandler> transaction_handler_;
424424
bool apply_locally_;
425425
};
426426

‎packages/firebase_database/firebase_database_platform_interface/lib/src/method_channel/method_channel_database_reference.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
142142
try {
143143
await MethodChannelDatabase.pigeonChannel.runTransaction(pigeon.TransactionOptions(
144144
path: path,
145-
transactionHandler: pigeon.TransactionHandler(transactionKey: key),
145+
transactionHandler: pigeon.DatabaseTransactionHandler(transactionKey: key),
146146
applyLocally: applyLocally,
147147
));
148148

‎packages/firebase_database/firebase_database_platform_interface/lib/src/pigeon/messages.pigeon.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ class DatabaseReference {
152152
;
153153
}
154154

155-
class TransactionHandler {
156-
TransactionHandler({
155+
class DatabaseTransactionHandler {
156+
DatabaseTransactionHandler({
157157
required this.transactionKey,
158158
});
159159

@@ -168,17 +168,17 @@ class TransactionHandler {
168168
Object encode() {
169169
return _toList(); }
170170

171-
static TransactionHandler decode(Object result) {
171+
static DatabaseTransactionHandler decode(Object result) {
172172
result as List<Object?>;
173-
return TransactionHandler(
173+
return DatabaseTransactionHandler(
174174
transactionKey: result[0]! as int,
175175
);
176176
}
177177

178178
@override
179179
// ignore: avoid_equals_and_hash_code_on_mutable_classes
180180
bool operator ==(Object other) {
181-
if (other is! TransactionHandler || other.runtimeType != runtimeType) {
181+
if (other is! DatabaseTransactionHandler || other.runtimeType != runtimeType) {
182182
return false;
183183
}
184184
if (identical(this, other)) {
@@ -600,7 +600,7 @@ class TransactionOptions {
600600

601601
String path;
602602

603-
TransactionHandler transactionHandler;
603+
DatabaseTransactionHandler transactionHandler;
604604

605605
bool applyLocally;
606606

@@ -619,7 +619,7 @@ class TransactionOptions {
619619
result as List<Object?>;
620620
return TransactionOptions(
621621
path: result[0]! as String,
622-
transactionHandler: result[1]! as TransactionHandler,
622+
transactionHandler: result[1]! as DatabaseTransactionHandler,
623623
applyLocally: result[2]! as bool,
624624
);
625625
}
@@ -697,7 +697,7 @@ class _PigeonCodec extends StandardMessageCodec {
697697
} else if (value is DatabaseReference) {
698698
buffer.putUint8(130);
699699
writeValue(buffer, value.encode());
700-
} else if (value is TransactionHandler) {
700+
} else if (value is DatabaseTransactionHandler) {
701701
buffer.putUint8(131);
702702
writeValue(buffer, value.encode());
703703
} else if (value is EventObserver) {
@@ -743,7 +743,7 @@ class _PigeonCodec extends StandardMessageCodec {
743743
case 130:
744744
return DatabaseReference.decode(readValue(buffer)!);
745745
case 131:
746-
return TransactionHandler.decode(readValue(buffer)!);
746+
return DatabaseTransactionHandler.decode(readValue(buffer)!);
747747
case 132:
748748
return EventObserver.decode(readValue(buffer)!);
749749
case 133:

‎packages/firebase_database/firebase_database_platform_interface/pigeons/messages.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class DatabaseReference {
5151
final String path;
5252
}
5353

54-
class TransactionHandler {
55-
const TransactionHandler({
54+
class DatabaseTransactionHandler {
55+
const DatabaseTransactionHandler({
5656
required this.transactionKey,
5757
});
5858

@@ -159,7 +159,7 @@ class TransactionOptions {
159159
});
160160

161161
final String path;
162-
final TransactionHandler transactionHandler;
162+
final DatabaseTransactionHandler transactionHandler;
163163
final bool applyLocally;
164164
}
165165

0 commit comments

Comments
 (0)