Skip to content

Commit 22d7e1f

Browse files
committed
Integrate Latest @ 198648856
Changes to analytics/testapp ... - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" Changes to auth/testapp ... - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" Changes to database/testapp ... - Fix some crashes in Database C# -> C++ - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" Changes to dynamic_links/testapp ... - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" Changes to invites/testapp ... - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" - Add documentation that invites requires having an App Store ID set. Changes to messaging/testapp ... - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" Changes to remote_config/testapp ... - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" Changes to storage/testapp ... - * Update Storage Unity testapp from using StorageMetadata.DownloadUrl and StorageMetadata.DownloadUrls* Change obsolete message to be in one line to properly display in Unity. - Modify all readme.md in testapp to clarify that google-service.json or GoogleService-Info.plist should be placed under Assets folder instead of "anywhere in the project" CL: 198648856
1 parent 11e4c4e commit 22d7e1f

File tree

9 files changed

+34
-39
lines changed

9 files changed

+34
-39
lines changed

analytics/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ with the
5656
- Navigate to the `Assets\TestApp` folder in the `Project` window.
5757
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
5858
into the folder.
59-
60-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
59+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
60+
`Assets` folder.
6161
- Optional: Update the Project Bundle Identifier
6262
- If you did not use `com.google.firebase.unity.analytics.testapp`
6363
as the project package name you will need to update the sample's Bundle
@@ -128,8 +128,8 @@ with the
128128
- Navigate to the `Assets\TestApp` folder in the `Project` window.
129129
- Drag the `google-services.json` downloaded from the Firebase console
130130
into the folder.
131-
132-
NOTE: `google-services.json` can be placed anywhere in the project.
131+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
132+
folder.
133133
- Optional: Update the Project Bundle Identifier
134134
- If you did not use `com.google.firebase.unity.analytics.testapp`
135135
as the project package name you will need to update the sample's Bundle

auth/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ with the
6262
- Navigate to the `Assets\TestApp` folder in the `Project` window.
6363
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
6464
into the folder.
65-
66-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
65+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
66+
`Assets` folder.
6767
- Optional: Update the Project Bundle Identifier
6868
- If you did not use `com.google.FirebaseUnityAuthTestApp.dev`
6969
as the project package name you will need to update the sample's Bundle
@@ -139,8 +139,8 @@ with the
139139
- Navigate to the `Assets\TestApp` folder in the `Project` window.
140140
- Drag the `google-services.json` downloaded from the Firebase console
141141
into the folder.
142-
143-
NOTE: `google-services.json` can be placed anywhere in the project.
142+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
143+
folder.
144144
- Optional: Update the Project Bundle Identifier
145145
- If you did not use `com.google.FirebaseUnityAuthTestApp.dev`
146146
as the project package name you will need to update the sample's Bundle

database/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ documentation.
7575
- Navigate to the `Assets\TestApp` folder in the `Project` window.
7676
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
7777
into the folder.
78-
79-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
78+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
79+
`Assets` folder.
8080
- Optional: Update the Project Bundle Identifier
8181
- If you did not use `com.google.firebase.unity.database.testapp`
8282
as the project package name you will need to update the sample's Bundle
@@ -128,8 +128,8 @@ documentation.
128128
- Navigate to the `Assets\TestApp` folder in the `Project` window.
129129
- Drag the `google-services.json` downloaded from the Firebase console
130130
into the folder.
131-
132-
NOTE: `google-services.json` can be placed anywhere in the project.
131+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
132+
folder.
133133
- Optional: Update the Project Bundle Identifier
134134
- If you did not use `com.google.firebase.unity.database.testapp`
135135
as the project package name you will need to update the sample's Bundle

dynamic_links/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ using the
5757
- Navigate to the `Assets\TestApp` folder in the `Project` window.
5858
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
5959
into the folder.
60-
61-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
60+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
61+
`Assets` folder.
6262
- Optional: Update the Project Bundle Identifier
6363
- If you did not use `com.google.FirebaseUnityDynamicLinksTestApp.dev`
6464
as the project package name you will need to update the sample's Bundle
@@ -144,8 +144,8 @@ using the
144144
- Navigate to the `Assets\TestApp` folder in the `Project` window.
145145
- Drag the `google-services.json` downloaded from the Firebase console
146146
into the folder.
147-
148-
NOTE: `google-services.json` can be placed anywhere in the project.
147+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
148+
folder.
149149
- Optional: Update the Project Bundle Identifier
150150
- If you did not use `com.google.FirebaseUnityDynamicLinksTestApp.dev`
151151
as the project package name you will need to update the sample's Bundle

invites/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ using the
5959
- Navigate to the `Assets\TestApp` folder in the `Project` window.
6060
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
6161
into the folder.
62-
63-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
62+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
63+
`Assets` folder.
6464
- Optional: Update the Project Bundle Identifier
6565
- If you did not use `com.google.FirebaseUnityInvitesTestApp.dev`
6666
as the project package name you will need to update the sample's Bundle
@@ -142,8 +142,8 @@ using the
142142
- Navigate to the `Assets\TestApp` folder in the `Project` window.
143143
- Drag the `google-services.json` downloaded from the Firebase console
144144
into the folder.
145-
146-
NOTE: `google-services.json` can be placed anywhere in the project.
145+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
146+
folder.
147147
- Optional: Update the Project Bundle Identifier
148148
- If you did not use `com.google.FirebaseUnityInvitesTestApp.dev`
149149
as the project package name you will need to update the sample's Bundle

messaging/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ using the
6666
- Navigate to the `Assets\TestApp` folder in the `Project` window.
6767
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
6868
into the folder.
69-
70-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
69+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
70+
`Assets` folder.
7171
- Optional: Update the Project Bundle Identifier
7272
- If you did not use `com.google.FirebaseUnityMessagingTestApp.dev`
7373
as the project package name you will need to update the sample's Bundle
@@ -154,8 +154,8 @@ using the
154154
- Navigate to the `Assets\TestApp` folder in the `Project` window.
155155
- Drag the `google-services.json` downloaded from the Firebase console
156156
into the folder.
157-
158-
NOTE: `google-services.json` can be placed anywhere in the project.
157+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
158+
folder.
159159
- Optional: Update the Project Bundle Identifier
160160
- If you did not use `com.google.FirebaseUnityMessagingTestApp.dev`
161161
as the project package name you will need to update the sample's Bundle

remote_config/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ using the
5757
- Navigate to the `Assets\TestApp` folder in the `Project` window.
5858
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
5959
into the folder.
60-
61-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
60+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
61+
`Assets` folder.
6262
- Optional: Update the Project Bundle Identifier
6363
- If you did not use `com.google.firebase.unity.remoteconfig.testapp`
6464
as the project package name you will need to update the sample's Bundle
@@ -128,8 +128,8 @@ using the
128128
- Navigate to the `Assets\TestApp` folder in the `Project` window.
129129
- Drag the `google-services.json` downloaded from the Firebase console
130130
into the folder.
131-
132-
NOTE: `google-services.json` can be placed anywhere in the project.
131+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
132+
folder.
133133
- Optional: Update the Project Bundle Identifier
134134
- If you did not use `com.google.firebase.unity.remoteconfig.testapp`
135135
as the project package name you will need to update the sample's Bundle

storage/testapp/Assets/TestApp/UIHandler.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,15 +444,10 @@ protected string MetadataToString(StorageMetadata metadata, bool onlyMutableFiel
444444
{"CreationTimeMillis", metadata.CreationTimeMillis},
445445
{"UpdatedTimeMillis", metadata.UpdatedTimeMillis},
446446
{"SizeBytes", metadata.SizeBytes},
447-
{"Md5Hash", metadata.Md5Hash},
448-
{"DownloadUrl", metadata.DownloadUrl}
447+
{"Md5Hash", metadata.Md5Hash}
449448
}) {
450449
fieldsAndValues[kv.Key] = kv.Value;
451450
}
452-
var urls = metadata.DownloadUrls;
453-
for (int i = 0; i < urls.Count; ++i) {
454-
fieldsAndValues[String.Format("DownloadUrls[{0}]", i)] = urls[i];
455-
}
456451
}
457452
foreach (var key in metadata.CustomMetadataKeys) {
458453
fieldsAndValues[key] = metadata.GetCustomMetadata(key);
@@ -476,7 +471,7 @@ int GUIDisplayIntegerField(int currentValue) {
476471
// Display a field that edits a timespan in milliseconds.
477472
TimeSpan GUIDisplayTimespanMsField(TimeSpan timeSpan) {
478473
return TimeSpan.FromMilliseconds(
479-
(double)GUIDisplayIntegerField((int)timeSpan.TotalMilliseconds));
474+
(double)GUIDisplayIntegerField((int)timeSpan.TotalMilliseconds));
480475
}
481476

482477
// Button that can be optionally disabled.

storage/testapp/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ download that same text.
5959
- Navigate to the `Assets\TestApp` folder in the `Project` window.
6060
- Drag the `GoogleService-Info.plist` downloaded from the Firebase console
6161
into the folder.
62-
63-
NOTE: `GoogleService-Info.plist` can be placed anywhere in the project.
62+
- NOTE: `GoogleService-Info.plist` can be placed anywhere under the
63+
`Assets` folder.
6464
- Optional: Update the Project Bundle Identifier
6565
- If you did not use `com.google.firebase.unity.storage.testapp`
6666
as the project package name you will need to update the sample's Bundle
@@ -112,8 +112,8 @@ download that same text.
112112
- Navigate to the `Assets\TestApp` folder in the `Project` window.
113113
- Drag the `google-services.json` downloaded from the Firebase console
114114
into the folder.
115-
116-
NOTE: `google-services.json` can be placed anywhere in the project.
115+
- NOTE: `google-services.json` can be placed anywhere under the `Assets`
116+
folder.
117117
- Optional: Update the Project Bundle Identifier
118118
- If you did not use `com.google.firebase.unity.storage.testapp`
119119
as the project package name you will need to update the sample's Bundle

0 commit comments

Comments
 (0)