From: David A. Velasco Date: Thu, 6 Feb 2014 12:58:41 +0000 (+0100) Subject: Merge branch 'share_link__new_share' into setup_additions X-Git-Tag: oc-android-1.5.5~58^2~1^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4db5295f560dc2cc5deefcbd2b6c397738003f6b?ds=inline Merge branch 'share_link__new_share' into setup_additions --- 4db5295f560dc2cc5deefcbd2b6c397738003f6b diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java index ed3e1214,a56fe3d9..d4bba4ef --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@@ -103,8 -98,8 +98,8 @@@ import com.owncloud.android.utils.Log_O * @author David A. Velasco */ -public class FileDisplayActivity extends FileActivity implements +public class FileDisplayActivity extends HookActivity implements - OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener { + OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, EditNameDialogListener { private ArrayAdapter mDirectories;