Browse Source

fix crash when sorting in folder picker

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 5 years ago
parent
commit
221d3cc327

+ 1 - 9
src/main/java/com/owncloud/android/ui/activity/FilePickerActivity.java

@@ -25,17 +25,14 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.owncloud.android.R;
-import com.owncloud.android.ui.dialog.SortingOrderDialogFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
-import com.owncloud.android.utils.FileSortOrder;
 
 import androidx.fragment.app.FragmentTransaction;
 
 /**
  * File picker of remote files
  */
-public class FilePickerActivity extends FolderPickerActivity implements
-    SortingOrderDialogFragment.OnSortingOrderListener {
+public class FilePickerActivity extends FolderPickerActivity {
 
     @Override
     public void onClick(View v) {
@@ -57,9 +54,4 @@ public class FilePickerActivity extends FolderPickerActivity implements
         transaction.add(R.id.fragment_container, listOfFiles, TAG_LIST_OF_FOLDERS);
         transaction.commit();
     }
-
-    @Override
-    public void onSortingOrderChosen(FileSortOrder selection) {
-        getListOfFilesFragment().sortFiles(selection);
-    }
 }

+ 10 - 1
src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -59,6 +59,7 @@ import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.utils.DataHolderUtil;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
+import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.File;
@@ -72,7 +73,10 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 public class FolderPickerActivity extends FileActivity implements FileFragment.ContainerActivity,
-    OnClickListener, OnEnforceableRefreshListener, Injectable {
+    OnClickListener,
+    OnEnforceableRefreshListener,
+    Injectable,
+    SortingOrderDialogFragment.OnSortingOrderListener {
 
     public static final String EXTRA_FOLDER = FolderPickerActivity.class.getCanonicalName() + ".EXTRA_FOLDER";
     public static final String EXTRA_FILES = FolderPickerActivity.class.getCanonicalName() + ".EXTRA_FILES";
@@ -601,4 +605,9 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
     public boolean isDoNotEnterEncryptedFolder() {
         return mDoNotEnterEncryptedFolder;
     }
+
+    @Override
+    public void onSortingOrderChosen(FileSortOrder selection) {
+        getListOfFilesFragment().sortFiles(selection);
+    }
 }