[Libreoffice-commits] .: android/sdremote

[Libreoffice Gerrit user]

 android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java           |    7 ++-----
 android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java |    2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 657e4fbf8c9dfc0e507d77e2f8fef15dc8008ee6
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Mon Sep 3 13:04:45 2012 +0200

    Fix removal of stale servers in selector.
    
    Change-Id: I95a378cade77a7e53ef6baa69a6e9223d13e1526

diff --git a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 5503408..6c24ad7 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 406383c..d9022ec 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;