nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 12:51:16 +00:00
Code Releases Activity

Make sure the mDevice reference is valid (fixes #268 and #267).

Browse source
This commit is contained in:
Lode Hoste 2015-03-21 22:54:26 +01:00
parent 4233a15635
commit fa39e17d51
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/nutomic/syncthingandroid/fragments/DeviceSettingsFragment.java
View file

@ -11,6 +11,7 @@ import android.preference.EditTextPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.support.v4.preference.PreferenceFragment; import android.support.v4.preference.PreferenceFragment;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -36,6 +37,8 @@ public class DeviceSettingsFragment extends PreferenceFragment implements
public static final String EXTRA_NODE_ID = "device_id"; public static final String EXTRA_NODE_ID = "device_id";
private static final String TAG = "DeviceSettingsFragment";
private static final int SCAN_QR_REQUEST_CODE = 235; private static final int SCAN_QR_REQUEST_CODE = 235;
private SyncthingService mSyncthingService; private SyncthingService mSyncthingService;
@ -93,7 +96,8 @@ public class DeviceSettingsFragment extends PreferenceFragment implements
if (mIsCreate) { if (mIsCreate) {
if (savedInstanceState != null) { if (savedInstanceState != null) {
mDevice = (RestApi.Device) savedInstanceState.getSerializable("device"); mDevice = (RestApi.Device) savedInstanceState.getSerializable("device");
} else { }
if (mDevice == null) {
mDevice = new RestApi.Device(); mDevice = new RestApi.Device();
mDevice.Name = ""; mDevice.Name = "";
mDevice.DeviceID = ""; mDevice.DeviceID = "";
@ -131,17 +135,25 @@ public class DeviceSettingsFragment extends PreferenceFragment implements
if (mIsCreate) { if (mIsCreate) {
getActivity().setTitle(R.string.add_device); getActivity().setTitle(R.string.add_device);
} else { } else {
RestApi.Device device = null;
getActivity().setTitle(R.string.edit_device); getActivity().setTitle(R.string.edit_device);
List<RestApi.Device> devices = mSyncthingService.getApi().getDevices(false); List<RestApi.Device> devices = mSyncthingService.getApi().getDevices(false);
for (int i = 0; i < devices.size(); i++) { for (int i = 0; i < devices.size(); i++) {
if (devices.get(i).DeviceID.equals( if (devices.get(i).DeviceID.equals(
getActivity().getIntent().getStringExtra(EXTRA_NODE_ID))) { getActivity().getIntent().getStringExtra(EXTRA_NODE_ID))) {
mDevice = devices.get(i); device = devices.get(i);
break; break;
} }
} }
mDeviceId.setOnPreferenceClickListener(this); if (device == null) {
Log.w(TAG, "Device not found in API update");
getActivity().finish();
return;
} }
mDevice = device;
mDeviceId.setOnPreferenceClickListener(this); // TODO is this needed?
}
mSyncthingService.getApi().getConnections(DeviceSettingsFragment.this); mSyncthingService.getApi().getConnections(DeviceSettingsFragment.this);
mDeviceId.setSummary(mDevice.DeviceID); mDeviceId.setSummary(mDevice.DeviceID);