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

Fix IllegalStateException caused by making HTTPS request without a pinned cert

Browse Source
This commit is contained in:
Cameron Gutman 2018-12-27 23:55:52 -08:00
parent 57c645a291
commit cd80a94f28
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import com.limelight.nvstream.NvConnection;
import com.limelight.nvstream.http.ComputerDetails; import com.limelight.nvstream.http.ComputerDetails;
import com.limelight.nvstream.http.NvApp; import com.limelight.nvstream.http.NvApp;
import com.limelight.nvstream.http.NvHTTP; import com.limelight.nvstream.http.NvHTTP;
import com.limelight.nvstream.http.PairingManager;
import com.limelight.nvstream.mdns.MdnsComputer; import com.limelight.nvstream.mdns.MdnsComputer;
import com.limelight.nvstream.mdns.MdnsDiscoveryListener; import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
import com.limelight.utils.CacheHelper; import com.limelight.utils.CacheHelper;
@ -697,8 +698,9 @@ public class ComputerManagerService extends Service {
public void run() { public void run() {
int emptyAppListResponses = 0; int emptyAppListResponses = 0;
do { do {
// Can't poll if it's not online // Can't poll if it's not online or paired
if (computer.state != ComputerDetails.State.ONLINE) { if (computer.state != ComputerDetails.State.ONLINE ||
computer.pairState != PairingManager.PairState.PAIRED) {
if (listener != null) { if (listener != null) {
listener.notifyComputerUpdated(computer); listener.notifyComputerUpdated(computer);
} }
@ -738,7 +740,7 @@ public class ComputerManagerService extends Service {
// in a row, we'll go ahead and believe it. // in a row, we'll go ahead and believe it.
emptyAppListResponses++; emptyAppListResponses++;
} }
if (appList != null && !appList.isEmpty() && if (!appList.isEmpty() &&
(!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) { (!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
// Open the cache file // Open the cache file
OutputStream cacheOut = null; OutputStream cacheOut = null;
@ -770,7 +772,7 @@ public class ComputerManagerService extends Service {
listener.notifyComputerUpdated(computer); listener.notifyComputerUpdated(computer);
} }
} }
else if (appList == null || appList.isEmpty()) { else if (appList.isEmpty()) {
LimeLog.warning("Null app list received from "+computer.uuid); LimeLog.warning("Null app list received from "+computer.uuid);
} }
} catch (IOException e) { } catch (IOException e) {