mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change search timeouts from milliseconds to seconds.

Browse Source 
Makes things readable and should prevent potential typing bugs.

Change-Id: Ifcb90568859e94896f5c2a313546fe1fdd6fa4bc
This commit is contained in:
Artur Dryomov
2013-08-01 19:44:47 +03:00
parent 9864a2d5d4
commit 7e07a45500
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
View File

@@ -12,6 +12,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
@@ -26,7 +27,7 @@ import org.libreoffice.impressremote.util.BluetoothOperator;
import org.libreoffice.impressremote.util.Intents;
class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder, Runnable {
private static final int SEARCH_DELAY_IN_MILLISECONDS = 1000 * 10;
private static final int SEARCH_DELAY_IN_SECONDS = 10;
private final Context mContext;
@@ -102,7 +103,7 @@ class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder,
}
Handler aHandler = new Handler();
aHandler.postDelayed(this, SEARCH_DELAY_IN_MILLISECONDS);
aHandler.postDelayed(this, TimeUnit.SECONDS.toMillis(SEARCH_DELAY_IN_SECONDS));
}
@Override

4
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java
View File

@@ -33,7 +33,7 @@ import org.libreoffice.impressremote.util.Intents;
class TcpServersFinder implements ServersFinder, Runnable {
private static final int SEARCH_DELAY_IN_SECONDS = 10;
private static final int BLOCKING_TIMEOUT_IN_MILLISECONDS = 1000 * 10;
private static final int BLOCKING_TIMEOUT_IN_SECONDS = 10;
private static final int SEARCH_RESULT_BUFFER_SIZE = 1024;
@@ -74,7 +74,7 @@ class TcpServersFinder implements ServersFinder, Runnable {
private void setUpSearchSocket() {
try {
mSearchSocket = new DatagramSocket();
mSearchSocket.setSoTimeout(BLOCKING_TIMEOUT_IN_MILLISECONDS);
mSearchSocket.setSoTimeout((int) TimeUnit.SECONDS.toMillis(BLOCKING_TIMEOUT_IN_SECONDS));
} catch (SocketException e) {
throw new RuntimeException("Unable to open search socket.");
}