X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/00a8eb415aef8c79f6e657d88bbefe746a926086..a2de2f28ab6167e4003f0283b50b98dd0e73a598:/src/com/owncloud/android/ui/activity/FolderPickerActivity.java diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java index 556ca11e..cc5b0f15 100644 --- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java +++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java @@ -62,7 +62,7 @@ import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.ErrorMessageAdapter; import com.owncloud.android.lib.common.utils.Log_OC; -public class FolderPickerActivity extends HookActivity implements FileFragment.ContainerActivity, +public class FolderPickerActivity extends FileActivity implements FileFragment.ContainerActivity, OnClickListener, OnEnforceableRefreshListener { public static final String EXTRA_CURRENT_FOLDER = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CURRENT_FOLDER"; @@ -180,7 +180,7 @@ public class FolderPickerActivity extends HookActivity implements FileFragment.C } } - private OCFileListFragment getListOfFilesFragment() { + protected OCFileListFragment getListOfFilesFragment() { Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(FolderPickerActivity.TAG_LIST_OF_FOLDERS); if (listOfFiles != null) { return (OCFileListFragment)listOfFiles; @@ -267,6 +267,8 @@ public class FolderPickerActivity extends HookActivity implements FileFragment.C menu.findItem(R.id.action_upload).setVisible(false); menu.findItem(R.id.action_settings).setVisible(false); menu.findItem(R.id.action_sync_account).setVisible(false); + menu.findItem(R.id.action_logger).setVisible(false); + menu.findItem(R.id.action_sort).setVisible(false); return true; } @@ -341,7 +343,7 @@ public class FolderPickerActivity extends HookActivity implements FileFragment.C } } - private void updateNavigationElementsInActionBar() { + protected void updateNavigationElementsInActionBar() { ActionBar actionBar = getSupportActionBar(); OCFile currentDir = getCurrentFolder(); boolean atRoot = (currentDir == null || currentDir.getParentId() == 0);