Commit 7f25fa81 authored by Drahomír Karchňák's avatar Drahomír Karchňák

Fix up

parent f2202eee
......@@ -478,10 +478,11 @@ public class InformationCollector
}
private static void addClientFeatures(JSONObject object, Context ctx) throws JSONException {
//TODO - Server selection is active on debug builds
object.put("user_server_selection", true);
Server server;
if((server = ConfigHelper.getUserSelectedServer(ctx)) != null) {
object.put("user_server_selection", true);
object.put("prefer_server", server.getUuid());
}
}
......
......@@ -15,6 +15,8 @@
******************************************************************************/
package at.alladin.rmbt.client.helper;
import android.util.Log;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
......@@ -84,9 +86,6 @@ public class ControlServerConnection
public List<TaskDesc> v2TaskDesc;
private long startTimeNs = 0;
/**
* @param args
*/
public ControlServerConnection()
{
......@@ -274,7 +273,11 @@ public class ControlServerConnection
testUuid = response.getString("test_uuid");
testTime = System.currentTimeMillis() + 1000 * response.getLong("test_wait");
if(response.optBoolean("user_server_selection", false)) {
System.out.println(getClass().getSimpleName() + ": User server selection is active. We received intended server.");
}
testHost = response.getString("test_server_address");
testPort = response.getInt("test_server_port");
testEncryption = response.getBoolean("test_server_encryption");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment