Skip to content

Commit fa65d5b

Browse files
committed
NONE enum is not necessary and fix problem with not setting mimetype to have all files selectable
1 parent 634f158 commit fa65d5b

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

library/src/main/java/com/github/developerpaul123/filepickerlibrary/FilePicker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.support.v7.widget.LinearLayoutManager;
2121
import android.support.v7.widget.RecyclerView;
2222
import android.support.v7.widget.Toolbar;
23+
import android.text.TextUtils;
2324
import android.view.MenuItem;
2425
import android.view.View;
2526
import android.view.ViewTreeObserver;
@@ -481,7 +482,7 @@ public void onClick(View view) {
481482
curDirectory = currentFile;
482483
new UpdateFilesTask(FilePicker.this).execute(curDirectory);
483484
} else {
484-
if (mimeType != null) {
485+
if (!TextUtils.isEmpty(mimeType)) {
485486
MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
486487
String requiredExtension = "." + mimeTypeMap.getExtensionFromMimeType(mimeType);
487488
if (requiredExtension.equalsIgnoreCase(fileExt(currentFile.toString()))) {

library/src/main/java/com/github/developerpaul123/filepickerlibrary/FilePickerActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import android.support.design.widget.Snackbar;
3434
import android.support.v4.app.ActivityCompat;
3535
import android.support.v4.content.ContextCompat;
36+
import android.text.TextUtils;
3637
import android.view.MenuItem;
3738
import android.view.View;
3839
import android.view.animation.Animation;
@@ -463,7 +464,7 @@ public void onClick(View view) {
463464
curDirectory = currentFile;
464465
new UpdateFilesTask(FilePickerActivity.this).execute(curDirectory);
465466
} else {
466-
if (mimeType != null && !mimeType.equalsIgnoreCase(MimeType.NONE.getMimeType())) {
467+
if (!TextUtils.isEmpty(mimeType)) {
467468
MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
468469
String requiredExtension = "." + mimeTypeMap.getExtensionFromMimeType(mimeType);
469470
if (requiredExtension.equalsIgnoreCase(fileExt(currentFile.toString()))) {

library/src/main/java/com/github/developerpaul123/filepickerlibrary/FilePickerBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class FilePickerBuilder {
1919
private Scope mScope = Scope.ALL;
2020
private Request requestCode = Request.FILE;
2121
private int color = android.R.color.holo_blue_bright;
22-
private MimeType mimeType = MimeType.NONE;
22+
private MimeType mimeType;
2323

2424
/**
2525
* Builder class to build a filepicker activity.

library/src/main/java/com/github/developerpaul123/filepickerlibrary/enums/MimeType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* Created by Paul Tsouchlos
2121
*/
2222
public enum MimeType {
23-
NONE(""), JPEG("image/jpeg"), PNG("image/png"), XML("application/xml"),
23+
JPEG("image/jpeg"), PNG("image/png"), XML("application/xml"),
2424
XLS("application/vnd.ms-excel"), XLSX("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"),
2525
DOC("application/msword"), DOCX("application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
2626
HTML("text/html"), TXT("text/plain"), PDF("application/pdf");

0 commit comments

Comments
 (0)