diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-03 13:04:45 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-03 13:05:30 +0200 |
| commit | 657e4fbf8c9dfc0e507d77e2f8fef15dc8008ee6 (patch) | |
| tree | 2528de4daaac001037860d2f471649154645208b /android | |
| parent | cb6d2ed236bd8907d135ca6c292553fb4691f6d4 (diff) | |
Fix removal of stale servers in selector.
Change-Id: I95a378cade77a7e53ef6baa69a6e9223d13e1526
Diffstat (limited to 'android')
| -rw-r--r-- | android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java | 7 | ||||
| -rw-r--r-- | android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java index 5503408f935f..6c24ad7b73ae 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java @@ -220,8 +220,6 @@ public class SelectorActivity extends SherlockActivity { // Bluetooth -- Remove old for (Entry<Server, View> aEntry : mBluetoothServers.entrySet()) { if (!Arrays.asList(aServers).contains(aEntry.getKey())) { - System.out.println("Removing view " - + aEntry.getKey().getName()); mBluetoothServers.remove(aEntry.getKey()); mBluetoothList.removeView((View) aEntry.getValue() .getParent()); @@ -230,8 +228,7 @@ public class SelectorActivity extends SherlockActivity { // Network -- Remove old for (Entry<Server, View> aEntry : mNetworkServers.entrySet()) { if (!Arrays.asList(aServers).contains(aEntry.getKey())) { - System.out.println("Removing view"); - mNetworkServers.remove(aEntry.getKey().getName()); + mNetworkServers.remove(aEntry.getKey()); mNetworkList.removeView((View) aEntry.getValue() .getParent()); } @@ -262,8 +259,8 @@ public class SelectorActivity extends SherlockActivity { } } - // Hide as necessary + // Hide as necessary mBluetoothContainer .setVisibility((mBluetoothServers.size() != 0) ? View.VISIBLE : View.GONE); diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java index 406383c3d71d..d9022ecb0738 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java @@ -24,7 +24,7 @@ public class ServerFinder { private static final String CHARSET = "UTF-8"; - private static final long SEARCH_INTERVAL = 1000 * 20; + private static final long SEARCH_INTERVAL = 1000 * 15; private DatagramSocket mSocket = null; |