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

Merge pull request #780 from Unrud/npe

Browse source 
Fix NPEs
This commit is contained in:
Felix Ableitner 2016-11-06 14:23:08 +09:00 committed by GitHub
commit 8d6ce42297
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java
View file

@ -38,7 +38,9 @@ public class DeviceListFragment extends ListFragment implements SyncthingService
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
mTimer.cancel(); if (mTimer != null) {
mTimer.cancel();
}
} }
@Override @Override

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

@ -138,7 +138,7 @@ public class FolderFragment extends Fragment
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(getActivity(), FolderPickerActivity.class); Intent intent = new Intent(getActivity(), FolderPickerActivity.class);
if (mFolder.path.length() > 0) { if (!TextUtils.isEmpty(mFolder.path)) {
intent.putExtra(FolderPickerActivity.EXTRA_INITIAL_DIRECTORY, mFolder.path); intent.putExtra(FolderPickerActivity.EXTRA_INITIAL_DIRECTORY, mFolder.path);
} }
startActivityForResult(intent, DIRECTORY_REQUEST_CODE); startActivityForResult(intent, DIRECTORY_REQUEST_CODE);

4
src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
View file

@ -46,7 +46,9 @@ public class FolderListFragment extends ListFragment implements SyncthingService
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
mTimer.cancel(); if (mTimer != null) {
mTimer.cancel();
}
} }
@Override @Override