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 mFolder reference is valid (fixes #271).

Browse source
This commit is contained in:
Lode Hoste 2015-03-21 22:55:19 +01:00
parent fa39e17d51
commit 02043095a6
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,7 @@ public class DeviceSettingsFragment extends PreferenceFragment implements
return; return;
} }
mDevice = device; mDevice = device;
mDeviceId.setOnPreferenceClickListener(this); // TODO is this needed? mDeviceId.setOnPreferenceClickListener(this);
} }
mSyncthingService.getApi().getConnections(DeviceSettingsFragment.this); mSyncthingService.getApi().getConnections(DeviceSettingsFragment.this);

15
src/main/java/com/nutomic/syncthingandroid/fragments/FolderSettingsFragment.java
View file

@ -10,6 +10,7 @@ import android.preference.EditTextPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
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;
@ -43,6 +44,8 @@ public class FolderSettingsFragment extends PreferenceFragment
*/ */
public static final String EXTRA_REPO_ID = "folder_id"; public static final String EXTRA_REPO_ID = "folder_id";
private static final String TAG = "FolderSettingsFragment";
private static final String KEY_NODE_SHARED = "device_shared"; private static final String KEY_NODE_SHARED = "device_shared";
private SyncthingService mSyncthingService; private SyncthingService mSyncthingService;
@ -98,7 +101,8 @@ public class FolderSettingsFragment extends PreferenceFragment
if (mIsCreate) { if (mIsCreate) {
if (savedInstanceState != null) { if (savedInstanceState != null) {
mFolder = (RestApi.Folder) savedInstanceState.getSerializable("folder"); mFolder = (RestApi.Folder) savedInstanceState.getSerializable("folder");
} else { }
if (mFolder == null) {
mFolder = new RestApi.Folder(); mFolder = new RestApi.Folder();
mFolder.ID = ""; mFolder.ID = "";
mFolder.Path = ""; mFolder.Path = "";
@ -131,15 +135,22 @@ public class FolderSettingsFragment extends PreferenceFragment
if (mIsCreate) { if (mIsCreate) {
getActivity().setTitle(R.string.create_folder); getActivity().setTitle(R.string.create_folder);
} else { } else {
RestApi.Folder folder = null;
getActivity().setTitle(R.string.edit_folder); getActivity().setTitle(R.string.edit_folder);
List<RestApi.Folder> folders = mSyncthingService.getApi().getFolders(); List<RestApi.Folder> folders = mSyncthingService.getApi().getFolders();
for (int i = 0; i < folders.size(); i++) { for (int i = 0; i < folders.size(); i++) {
if (folders.get(i).ID.equals( if (folders.get(i).ID.equals(
getActivity().getIntent().getStringExtra(EXTRA_REPO_ID))) { getActivity().getIntent().getStringExtra(EXTRA_REPO_ID))) {
mFolder = folders.get(i); folder = folders.get(i);
break; break;
} }
} }
if (folder == null) {
Log.w(TAG, "Folder not found in API update");
getActivity().finish();
return;
}
mFolder = folder;
} }
mFolderId.setText(mFolder.ID); mFolderId.setText(mFolder.ID);