SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow the user to specify the protocol to use in the connection (TCP/HTTP). HTTP is always needed/used (for images and some requests where TCP can't be used because we want to be stateless), TCP is used by default and if available, but now the user can explicitly choose not to use TCP and always go through HTTP.

This commit is contained in:
Synced Synapse 2015-04-11 17:58:15 +01:00
parent 4a297c2e35
commit 30b4ac763a
7 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/xbmc/kore/host/HostInfo.java
View File

@ -114,7 +114,7 @@ public class HostInfo {
/**
* Auxiliary constructor for HTTP protocol.
* This constructoor should only be used to test connections. It doesn't represent an
* This constructor should only be used to test connections. It doesn't represent an
* instance of the host in the database.
*
* @param name Friendly name of the host
@ -123,8 +123,9 @@ public class HostInfo {
* @param username Username for basic auth
* @param password Password for basic auth
*/
public HostInfo(String name, String address, int httpPort, int tcpPort, String username, String password) {
this(-1, name, address, HostConnection.PROTOCOL_TCP, httpPort, tcpPort, username,
public HostInfo(String name, String address, int protocol, int httpPort,
int tcpPort, String username, String password) {
this(-1, name, address, protocol, httpPort, tcpPort, username,
password, null, DEFAULT_WOL_PORT);
}

2
app/src/main/java/org/xbmc/kore/ui/hosts/AddHostActivity.java
View File

@ -120,6 +120,8 @@ public class AddHostActivity extends BaseActivity
hostInfo.getUsername());
args.putString(HostFragmentManualConfiguration.HOST_PASSWORD,
hostInfo.getPassword());
args.putInt(HostFragmentManualConfiguration.HOST_PROTOCOL,
hostInfo.getProtocol());
// Ignore Mac Address and Wol Port
// Send this fragment straight to test

5
app/src/main/java/org/xbmc/kore/ui/hosts/AddHostFragmentZeroconf.java
View File

@ -37,6 +37,7 @@ import android.widget.Toast;
import org.xbmc.kore.R;
import org.xbmc.kore.host.HostInfo;
import org.xbmc.kore.jsonrpc.HostConnection;
import org.xbmc.kore.utils.LogUtils;
import org.xbmc.kore.utils.NetUtils;
@ -269,8 +270,8 @@ public class AddHostFragmentZeroconf extends Fragment {
String hostName = selectedServiceInfo.getName();
String hostAddress = addresses[0];
int hostHttpPort = selectedServiceInfo.getPort();
HostInfo selectedHostInfo = new HostInfo(hostName, hostAddress, hostHttpPort,
HostInfo.DEFAULT_TCP_PORT, null, null);
HostInfo selectedHostInfo = new HostInfo(hostName, hostAddress, HostConnection.PROTOCOL_TCP,
hostHttpPort, HostInfo.DEFAULT_TCP_PORT, null, null);
listener.onAddHostZeroconfFoundHost(selectedHostInfo);
}

2
app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java
View File

@ -70,6 +70,8 @@ public class EditHostActivity extends BaseActivity implements
selectedHostInfo.getUsername());
args.putString(HostFragmentManualConfiguration.HOST_PASSWORD,
selectedHostInfo.getPassword());
args.putInt(HostFragmentManualConfiguration.HOST_PROTOCOL,
selectedHostInfo.getProtocol());
args.putString(HostFragmentManualConfiguration.HOST_MAC_ADDRESS,
selectedHostInfo.getMacAddress());
args.putInt(HostFragmentManualConfiguration.HOST_WOL_PORT,

50
app/src/main/java/org/xbmc/kore/ui/hosts/HostFragmentManualConfiguration.java
View File

@ -26,6 +26,8 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.Toast;
@ -59,7 +61,8 @@ public class HostFragmentManualConfiguration extends Fragment {
HOST_USERNAME = PREFIX + ".host_username",
HOST_PASSWORD = PREFIX + ".host_password",
HOST_MAC_ADDRESS = PREFIX + ".host_mac_address",
HOST_WOL_PORT = PREFIX + ".host_wol_port";
HOST_WOL_PORT = PREFIX + ".host_wol_port",
HOST_PROTOCOL = PREFIX + ".host_protocol";
public static final String GO_STRAIGHT_TO_TEST = PREFIX + ".go_straight_to_test";
/**
@ -82,6 +85,7 @@ public class HostFragmentManualConfiguration extends Fragment {
@InjectView(R.id.xbmc_password) EditText xbmcPasswordEditText;
@InjectView(R.id.xbmc_mac_address) EditText xbmcMacAddressEditText;
@InjectView(R.id.xbmc_wol_port) EditText xbmcWolPortEditText;
@InjectView(R.id.xbmc_use_tcp) CheckBox xbmcUseTcpCheckbox;
// Handler for callbacks
final Handler handler = new Handler();
@ -91,6 +95,15 @@ public class HostFragmentManualConfiguration extends Fragment {
View root = inflater.inflate(R.layout.fragment_add_host_manual_configuration, container, false);
ButterKnife.inject(this, root);
// By default, use TCP
xbmcUseTcpCheckbox.setChecked(true);
xbmcUseTcpCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
xbmcTcpPortEditText.setEnabled(isChecked);
}
});
// Check if we were given a host info
String hostName = getArguments().getString(HOST_NAME);
String hostAddress = getArguments().getString(HOST_ADDRESS);
@ -98,6 +111,7 @@ public class HostFragmentManualConfiguration extends Fragment {
int hostTcpPort = getArguments().getInt(HOST_TCP_PORT, HostInfo.DEFAULT_TCP_PORT);
String hostUsername = getArguments().getString(HOST_USERNAME);
String hostPassword = getArguments().getString(HOST_PASSWORD);
int hostProtocol = getArguments().getInt(HOST_PROTOCOL, HostConnection.PROTOCOL_TCP);
String hostMacAddress = getArguments().getString(HOST_MAC_ADDRESS);
int hostWolPort = getArguments().getInt(HOST_WOL_PORT, HostInfo.DEFAULT_WOL_PORT);
@ -109,6 +123,10 @@ public class HostFragmentManualConfiguration extends Fragment {
xbmcUsernameEditText.setText(hostUsername);
if (!TextUtils.isEmpty(hostPassword))
xbmcPasswordEditText.setText(hostPassword);
xbmcUseTcpCheckbox.setChecked(!(hostProtocol == HostConnection.PROTOCOL_HTTP));
xbmcTcpPortEditText.setEnabled(xbmcUseTcpCheckbox.isChecked());
if (hostTcpPort != HostInfo.DEFAULT_TCP_PORT)
xbmcTcpPortEditText.setText(String.valueOf(hostTcpPort));
if (!TextUtils.isEmpty(hostMacAddress))
@ -200,6 +218,8 @@ public class HostFragmentManualConfiguration extends Fragment {
xbmcTcpPort = -1;
}
int xbmcProtocol = xbmcUseTcpCheckbox.isChecked()? HostConnection.PROTOCOL_TCP : HostConnection.PROTOCOL_HTTP;
String macAddress = xbmcMacAddressEditText.getText().toString();
aux = xbmcWolPortEditText.getText().toString();
int xbmcWolPort = TextUtils.isEmpty(aux) ? HostInfo.DEFAULT_WOL_PORT : Integer.valueOf(aux);
@ -230,9 +250,8 @@ public class HostFragmentManualConfiguration extends Fragment {
xbmcPassword = null;
// Ok, let's try to ping the host
final HostInfo checkedHostInfo = new HostInfo(xbmcName, xbmcAddress,
xbmcHttpPort, xbmcTcpPort,
xbmcUsername, xbmcPassword);
final HostInfo checkedHostInfo = new HostInfo(xbmcName, xbmcAddress, xbmcProtocol,
xbmcHttpPort, xbmcTcpPort, xbmcUsername, xbmcPassword);
checkedHostInfo.setMacAddress(macAddress);
checkedHostInfo.setWolPort(xbmcWolPort);
@ -259,8 +278,14 @@ public class HostFragmentManualConfiguration extends Fragment {
@Override
public void onSuccess(String result) {
LogUtils.LOGD(TAG, "Successfully connected to new host through HTTP.");
// Great, we managed to connect through HTTP, let's check it's version
chainCallCheckTcpConnection(hostConnection, hostInfo);
// Great, we managed to connect through HTTP, let's check through tcp
if (hostInfo.getProtocol() == HostConnection.PROTOCOL_TCP) {
chainCallCheckTcpConnection(hostConnection, hostInfo);
} else {
// We're done
hostConnection.disconnect();
hostConnectionChecked(hostInfo);
}
}
@Override
@ -279,19 +304,19 @@ public class HostFragmentManualConfiguration extends Fragment {
@Override
public void onSuccess(String result) {
// Great, we managed to connect through HTTP and TCP
hostConnection.disconnect();
LogUtils.LOGD(TAG, "Successfully connected to new host through TCP.");
hostConnection.disconnect();
// Notify connection checked through TCP
hostConnectionChecked(hostInfo, HostConnection.PROTOCOL_TCP);
hostConnectionChecked(hostInfo);
}
@Override
public void onError(int errorCode, String description) {
// We only managed to connect through HTTP, revert checkedHostInfo to use HTTP
hostConnection.disconnect();
LogUtils.LOGD(TAG, "Couldn't connect to host through TCP. Message: " + description);
// Notify connection checked through TCP
hostConnectionChecked(hostInfo, HostConnection.PROTOCOL_HTTP);
hostConnection.disconnect();
hostInfo.setProtocol(HostConnection.PROTOCOL_HTTP);
hostConnectionChecked(hostInfo);
}
}, handler);
}
@ -301,8 +326,7 @@ public class HostFragmentManualConfiguration extends Fragment {
* with it
* @param hostInfo {@link HostInfo} to add
*/
private void hostConnectionChecked(final HostInfo hostInfo, int protocol) {
hostInfo.setProtocol(protocol);
private void hostConnectionChecked(final HostInfo hostInfo) {
// Let's get the MAC Address, if we don't have one
if (TextUtils.isEmpty(hostInfo.getMacAddress())) {
new Thread(new Runnable() {

20
app/src/main/res/layout/fragment_add_host_manual_configuration.xml
View File

@ -115,29 +115,37 @@
android:layout_below="@+id/xbmc_password"
android:layout_marginTop="16dp"
android:text="@string/wizard_manual_configuration_message_advanced"/>
<EditText
android:id="@+id/xbmc_tcp_port"
style="@style/TextAppearance.EditText"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/text1"
android:layout_marginTop="8dp"
android:layout_alignLeft="@id/xbmc_name"
android:layout_alignRight="@id/xbmc_name"
android:inputType="number"
android:ems="4"
android:ems="7"
android:hint="@string/wizard_xbmc_tcp_port"/>
<CheckBox
android:id="@+id/xbmc_use_tcp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/xbmc_tcp_port"
android:layout_alignLeft="@id/xbmc_name"
android:layout_toLeftOf="@id/xbmc_tcp_port"
android:text="@string/wizard_xbmc_use_tcp"/>
<EditText
android:id="@+id/xbmc_wol_port"
style="@style/TextAppearance.EditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/xbmc_tcp_port"
android:layout_alignLeft="@id/xbmc_tcp_port"
android:layout_alignRight="@id/xbmc_tcp_port"
android:inputType="number"
android:ems="6"
android:hint="@string/wizard_xbmc_wol_port"/>
<EditText
@ -146,7 +154,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/xbmc_wol_port"
android:layout_alignLeft="@id/xbmc_tcp_port"
android:layout_alignLeft="@id/xbmc_name"
android:layout_toLeftOf="@id/xbmc_wol_port"
android:inputType="text"
android:hint="@string/wizard_xbmc_mac_address"/>

1
app/src/main/res/values/strings.xml
View File

@ -97,6 +97,7 @@
<string name="wizard_xbmc_tcp_port">TCP port (9090)</string>
<string name="wizard_xbmc_mac_address">MAC address</string>
<string name="wizard_xbmc_wol_port">WoL port (9)</string>
<string name="wizard_xbmc_use_tcp">Use TCP</string>
<string name="wizard_no_name_specified">Please specify a name for this media center, so you can identify it later.</string>
<string name="wizard_no_address_specified">Please specify the address of this media center, so I can locate it.</string>