Skip to content

Commit 80c99c2

Browse files
committed
🐛 Fixed BeginListeningServerEvents
1 parent eb755b9 commit 80c99c2

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

Assets/FirebaseREST/Database/DatabaseReference.cs

+17-12
Original file line numberDiff line numberDiff line change
@@ -58,29 +58,34 @@ void BeginListeningServerEvents()
5858
esGL = new FirebaseDatabase.FirebaseEventSourceWebGL(url, true, null,
5959
OnEventSourceMessageReceived, OnEventSourceError);
6060
});
61-
}
62-
else {
61+
} else {
6362
esGL = new FirebaseDatabase.FirebaseEventSourceWebGL(url, false, null,
6463
OnEventSourceMessageReceived, OnEventSourceError);
6564
}
6665

6766
#else
6867
if (webReq != null) return;
6968
string url = this.ReferenceUrl;
69+
70+
Action sendRequest = () => {
71+
webReq = new UnityWebRequest(url);
72+
webReq.SetRequestHeader("Accept", "text/event-stream");
73+
webReq.SetRequestHeader("Cache-Control", "no-cache");
74+
FirebaseServerEventsDownloadHandler downloadHandler = new FirebaseServerEventsDownloadHandler();
75+
downloadHandler.DataReceived += OnDataReceived;
76+
webReq.downloadHandler = downloadHandler;
77+
webReq.disposeDownloadHandlerOnDispose = true;
78+
UnityWebRequestAsyncOperation webReqAO = webReq.SendWebRequest();
79+
webReqAO.completed += ((ao) => OnStopListening(webReqAO));
80+
};
81+
7082
if (FirebaseAuth.Instance.IsSignedIn) {
7183
FirebaseAuth.Instance.GetAccessToken(accessToken => {
7284
url = url + "?auth=" + accessToken;
73-
webReq = new UnityWebRequest(url);
74-
webReq.SetRequestHeader("Accept", "text/event-stream");
75-
webReq.SetRequestHeader("Cache-Control", "no-cache");
76-
FirebaseServerEventsDownloadHandler downloadHandler = new FirebaseServerEventsDownloadHandler();
77-
downloadHandler.DataReceived += OnDataReceived;
78-
webReq.downloadHandler = downloadHandler;
79-
webReq.disposeDownloadHandlerOnDispose = true;
80-
UnityWebRequestAsyncOperation webReqAO = webReq.SendWebRequest();
81-
webReqAO.completed += ((ao) => OnStopListening(webReqAO));
85+
sendRequest();
8286
});
83-
}
87+
} else
88+
sendRequest();
8489
#endif
8590
}
8691

0 commit comments

Comments
 (0)