moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrectly persisting host with missing server cert

Browse Source
This commit is contained in:
Cameron Gutman 2019-01-04 18:18:32 -08:00
parent ff0f54d541
commit 1174e03885
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/limelight/computers/ComputerManagerService.java
View File

@ -365,8 +365,9 @@ public class ComputerManagerService extends Service {
// Block while we try to fill the details
try {
runPoll(fakeDetails, true, 0);
if (fakeDetails.state == ComputerDetails.State.ONLINE) {
// We cannot use runPoll() here because it will attempt to persist the state of the machine
// in the database, which would be bad because we don't have our pinned cert loaded yet.
if (pollComputer(fakeDetails)) {
// See if we have record of this PC to pull its pinned cert
synchronized (pollingTuples) {
for (PollingTuple tuple : pollingTuples) {
@ -377,10 +378,9 @@ public class ComputerManagerService extends Service {
}
}
if (fakeDetails.serverCert != null) {
// Poll again with the pinned cert to get accurate pairing information
runPoll(fakeDetails, true, 0);
}
// Poll again, possibly with the pinned cert, to get accurate pairing information.
// This will insert the host into the database too.
runPoll(fakeDetails, true, 0);
}
} catch (InterruptedException e) {
return false;