-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Adding a new API that allows iOS users to log notification delivery signal that exports to BigQuery. #6181
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Adding a new API that allows iOS users to log notification delivery signal that exports to BigQuery. #6181
Changes from 37 commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
6210292
add nanopb files for messaging
charlotteliang f8a096a
fix nanopb data encode/decode
charlotteliang 10fde21
add extension to test app
charlotteliang 806e046
update proto files
charlotteliang e5f744b
add a gdt proto for comparison
charlotteliang a715889
proto3 to proto2
charlotteliang a183392
resolve conflicts
charlotteliang 1d33294
add test code for easy calling the problem function
charlotteliang 58bd024
use the same proto as gdt as a debug example
charlotteliang 8b3ca97
add nanopb files
charlotteliang e9e12f0
fix typo in podspec
charlotteliang 021d957
figure out issue on encoding revert back logging logic
charlotteliang a77c872
adding data message testing on test app
charlotteliang 7a72d75
define constant string for easy management;
charlotteliang a944ce3
add unit test
charlotteliang a35ca7d
merge conflict
charlotteliang ebc9ea1
update the nanopb version
charlotteliang d8fdaba
fix breakage
charlotteliang 53f4c25
remove trailing whitespace
charlotteliang 0dcafb0
fix copywrite
charlotteliang 637bd0a
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into fm…
charlotteliang 8328bb3
update google data transporter header
charlotteliang ea0e001
update proto header
charlotteliang 1c023f8
fix header source
charlotteliang e9f989f
fix test breakage
charlotteliang 2302200
fix the header for SPM
charlotteliang ac1e206
cleanup format
charlotteliang 682d90d
resolve conflicts from master
charlotteliang ceaac79
merge conflicts
charlotteliang 7b77b8c
merge conflict
charlotteliang f033ca1
resolve conflict
charlotteliang 5b07bc8
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into fm…
charlotteliang f4b5d9d
fix test header
charlotteliang f742507
clang format
charlotteliang 2e073ff
add missing dependency in SPM to fix breakage
charlotteliang de88f99
remove service extension target from regular sample app since advance…
charlotteliang 55ebe19
fix a breakage in watchos test
charlotteliang fe7da0c
merge with master
charlotteliang f656526
fm-firelog
charlotteliang 10753dd
merge conflicts
charlotteliang 641dd67
merge conflict
charlotteliang 8660466
update version number
charlotteliang adec968
remove unused header
charlotteliang 9b022b2
fix tvOS breakage
charlotteliang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Copyright 2020 Google | ||
charlotteliang marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| # Options for mee.protos | ||
| fm.MessagingClientEvent.message_id type:FT_POINTER | ||
| fm.MessagingClientEvent.instance_id type:FT_POINTER | ||
| fm.MessagingClientEvent.package_name type:FT_POINTER | ||
| fm.MessagingClientEvent.analytics_label type:FT_POINTER | ||
| fm.MessagingClientEvent.composer_label type:FT_POINTER | ||
| fm.MessagingClientEventExtension.messaging_client_event type:FT_POINTER | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // | ||
| // Copyright 2020 Google LLC. | ||
charlotteliang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| syntax = "proto3"; | ||
|
|
||
| package fm; | ||
|
|
||
| message MessagingClientEvent { | ||
|
|
||
| int64 project_number = 1; | ||
|
|
||
| string message_id = 2; | ||
|
|
||
| string instance_id = 3; | ||
|
|
||
| enum MessageType { | ||
| UNKNOWN = 0; | ||
| DATA_MESSAGE = 1; | ||
| TOPIC = 2; | ||
| DISPLAY_NOTIFICATION = 3; | ||
| } | ||
|
|
||
| MessageType message_type = 4; | ||
|
|
||
| enum SDKPlatform { | ||
| UNKNOWN_OS = 0; | ||
| ANDROID = 1; | ||
| IOS = 2; | ||
| WEB = 3; | ||
| } | ||
|
|
||
| SDKPlatform sdk_platform = 5; | ||
|
|
||
| string package_name = 6; | ||
|
|
||
| enum Event { | ||
| UNKNOWN_EVENT = 0; | ||
| MESSAGE_DELIVERED = 1; | ||
| MESSAGE_OPEN = 2; | ||
| } | ||
|
|
||
| Event event = 12; | ||
|
|
||
| string analytics_label = 13; | ||
|
|
||
| int64 campaign_id = 14; | ||
|
|
||
| string composer_label = 15; | ||
| } | ||
|
|
||
| message MessagingClientEventExtension { | ||
| MessagingClientEvent messaging_client_event = 1; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright 2020 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| # Example usage: | ||
| # ./generate_protos.sh <path to nanopb> | ||
|
|
||
| # Dependencies: git, protobuf, python-protobuf, pyinstaller | ||
|
|
||
| readonly DIR="$( git rev-parse --show-toplevel )" | ||
|
|
||
| # Current release of nanopb being used to build the CCT protos | ||
| readonly NANOPB_VERSION="0.3.9.5" | ||
charlotteliang marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| readonly NANOPB_TEMPDIR="${DIR}/FirebaseMessaging/nanopb_temp" | ||
|
|
||
| readonly LIBRARY_DIR="${DIR}/FirebaseMessaging/Sources/" | ||
| readonly PROTO_DIR="${DIR}/FirebaseMessaging/ProtoSupport/Protos/" | ||
| readonly PROTOGEN_DIR="${LIBRARY_DIR}/Protogen/" | ||
|
|
||
| rm -rf "${NANOPB_TEMPDIR}" | ||
|
|
||
| echo "Downloading nanopb..." | ||
| git clone --branch "${NANOPB_VERSION}" https://github.com/nanopb/nanopb.git "${NANOPB_TEMPDIR}" | ||
|
|
||
| echo "Building nanopb..." | ||
| pushd "${NANOPB_TEMPDIR}" | ||
| ./tools/make_mac_package.sh | ||
| GIT_DESCRIPTION=`git describe --always`-macosx-x86 | ||
| NANOPB_BIN_DIR="dist/${GIT_DESCRIPTION}" | ||
| popd | ||
|
|
||
| echo "Removing existing ME protos..." | ||
| rm -rf "${PROTOGEN_DIR}/*" | ||
|
|
||
| echo "Generating ME protos..." | ||
| python "${DIR}/FirebaseMessaging/ProtoSupport/proto_generator.py" \ | ||
| --nanopb \ | ||
| --protos_dir="${PROTO_DIR}" \ | ||
| --pythonpath="${NANOPB_TEMPDIR}/${NANOPB_BIN_DIR}/generator" \ | ||
| --output_dir="${PROTOGEN_DIR}" \ | ||
| --include="${PROTO_DIR}" | ||
|
|
||
| rm -rf "${NANOPB_TEMPDIR}" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.