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

Fix infinite app list loading spinner if the app list is actually empty

Browse Source
This commit is contained in:
Cameron Gutman 2016-01-24 02:51:06 -05:00
parent 042a6b943e
commit ceef4510fb
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ public class ComputerManagerService extends Service {
private static final int MDNS_QUERY_PERIOD_MS = 1000; private static final int MDNS_QUERY_PERIOD_MS = 1000;
private static final int FAST_POLL_TIMEOUT = 500; private static final int FAST_POLL_TIMEOUT = 500;
private static final int OFFLINE_POLL_TRIES = 5; private static final int OFFLINE_POLL_TRIES = 5;
private static final int EMPTY_LIST_THRESHOLD = 3;
private final ComputerManagerBinder binder = new ComputerManagerBinder(); private final ComputerManagerBinder binder = new ComputerManagerBinder();
@ -661,6 +662,7 @@ public class ComputerManagerService extends Service {
thread = new Thread() { thread = new Thread() {
@Override @Override
public void run() { public void run() {
int emptyAppListResponses = 0;
do { do {
InetAddress selectedAddr; InetAddress selectedAddr;
@ -705,7 +707,15 @@ public class ComputerManagerService extends Service {
} }
List<NvApp> list = NvHTTP.getAppListByReader(new StringReader(appList)); List<NvApp> list = NvHTTP.getAppListByReader(new StringReader(appList));
if (appList != null && !appList.isEmpty() && !list.isEmpty()) { if (list.isEmpty()) {
LimeLog.warning("Empty app list received from "+computer.uuid);
// The app list might actually be empty, so if we get an empty response a few times
// in a row, we'll go ahead and believe it.
emptyAppListResponses++;
}
if (appList != null && !appList.isEmpty() &&
(!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
// Open the cache file // Open the cache file
OutputStream cacheOut = null; OutputStream cacheOut = null;
try { try {
@ -721,6 +731,11 @@ public class ComputerManagerService extends Service {
} catch (IOException ignored) {} } catch (IOException ignored) {}
} }
// Reset empty count if it wasn't empty this time
if (!list.isEmpty()) {
emptyAppListResponses = 0;
}
// Update the computer // Update the computer
computer.rawAppList = appList; computer.rawAppList = appList;
receivedAppList = true; receivedAppList = true;
@ -731,8 +746,8 @@ public class ComputerManagerService extends Service {
listener.notifyComputerUpdated(computer); listener.notifyComputerUpdated(computer);
} }
} }
else { else if (appList == null || appList.isEmpty()) {
LimeLog.warning("Empty app list received from "+computer.uuid); LimeLog.warning("Null app list received from "+computer.uuid);
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();