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

Fix create/pick folder being shown when folder roots are shown (fixes #173).

Browse source
This commit is contained in:
Felix Ableitner 2014-10-28 13:32:05 +02:00
parent df48d75127
commit 8b563da25d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
View file

@ -91,6 +91,9 @@ public class FolderPickerActivity extends SyncthingActivity
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (mListView.getAdapter() == mRootsAdapter)
return true;
// Inflate the menu; this adds items to the action bar if it is present. // Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.folder_picker, menu); getMenuInflater().inflate(R.menu.folder_picker, menu);
return true; return true;
@ -169,6 +172,7 @@ public class FolderPickerActivity extends SyncthingActivity
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) { public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
ArrayAdapter<File> adapter = (ArrayAdapter<File>) mListView.getAdapter(); ArrayAdapter<File> adapter = (ArrayAdapter<File>) mListView.getAdapter();
displayFolder(adapter.getItem(i)); displayFolder(adapter.getItem(i));
invalidateOptionsMenu();
} }
private class FileAdapter extends ArrayAdapter<File> { private class FileAdapter extends ArrayAdapter<File> {
@ -240,6 +244,7 @@ public class FolderPickerActivity extends SyncthingActivity
mListView.setAdapter(mRootsAdapter); mListView.setAdapter(mRootsAdapter);
mLocation = null; mLocation = null;
} }
invalidateOptionsMenu();
} }
} }