mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:06:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

moved requestCode to Fragment

Browse source
This commit is contained in:
Andy Scherzinger 2016-03-03 21:44:28 +01:00
parent 8d038e89a9
commit f34a9ddf5b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -141,7 +141,6 @@ public class FileDisplayActivity extends HookActivity
private boolean mSyncInProgress = false; private boolean mSyncInProgress = false;
private static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT"; private static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
public static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
private static String DIALOG_UPLOAD_SOURCE = "DIALOG_UPLOAD_SOURCE"; private static String DIALOG_UPLOAD_SOURCE = "DIALOG_UPLOAD_SOURCE";
private static String DIALOG_CERT_NOT_SAVED = "DIALOG_CERT_NOT_SAVED"; private static String DIALOG_CERT_NOT_SAVED = "DIALOG_CERT_NOT_SAVED";

4
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -90,6 +90,8 @@ public class OCFileListFragment extends ExtendedListFragment
private static final String GRID_IS_PREFERED_PREFERENCE = "gridIsPrefered"; private static final String GRID_IS_PREFERED_PREFERENCE = "gridIsPrefered";
private static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
private FileFragment.ContainerActivity mContainerActivity; private FileFragment.ContainerActivity mContainerActivity;
private OCFile mFile = null; private OCFile mFile = null;
@ -252,7 +254,7 @@ public class OCFileListFragment extends ExtendedListFragment
public void onClick(View v) { public void onClick(View v) {
CreateFolderDialogFragment dialog = CreateFolderDialogFragment dialog =
CreateFolderDialogFragment.newInstance(mFile); CreateFolderDialogFragment.newInstance(mFile);
dialog.show(getActivity().getSupportFragmentManager(), FileDisplayActivity.DIALOG_CREATE_FOLDER); dialog.show(getActivity().getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
getFabMain().collapse(); getFabMain().collapse();
recordMiniFabClick(); recordMiniFabClick();
} }