fix request codes

Author: meness

app/src/main/java/com/github/developerpaul123/filepickerlibrary/app/MainActivity.java

@@ -29,18 +29,18 @@
 
 import com.devpaul.filepicker.R;
 import com.devpaul.materiallibrary.views.MaterialFlatButton;
-import com.github.developerpaul123.filepickerlibrary.FilePicker;
 import com.github.developerpaul123.filepickerlibrary.FilePickerActivity;
 import com.github.developerpaul123.filepickerlibrary.FilePickerBuilder;
+import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 import com.github.developerpaul123.filepickerlibrary.enums.Request;
 import com.github.developerpaul123.filepickerlibrary.enums.Scope;
-import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
 
 public class MainActivity extends AppCompatActivity {
 
-    private static int REQUEST_FILE = 10;
+    static int REQUEST_FILE = 10;
+    static int REQUEST_DIRECTORY = 11;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -84,11 +84,11 @@ public PlaceholderFragment() {
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
-            if (requestCode == FilePickerActivity.REQUEST_DIRECTORY && resultCode == RESULT_OK) {
+            if (requestCode == REQUEST_DIRECTORY && resultCode == RESULT_OK) {
                 Toast.makeText(getActivity(), "File Selected: " + data
                                 .getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
                         Toast.LENGTH_LONG).show();
-            } else if (requestCode == FilePickerActivity.REQUEST_FILE && resultCode == RESULT_OK) {
+            } else if (requestCode == REQUEST_FILE && resultCode == RESULT_OK) {
                 Toast.makeText(getActivity(), "File Selected: " + data
                                 .getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
                         Toast.LENGTH_LONG).show();
@@ -108,9 +108,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 public void onClick(View view) {
                     Intent filePickerActivity = new Intent(getActivity(), FilePickerActivity.class);
                     filePickerActivity.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
-                    filePickerActivity.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_DIRECTORY);
+                    filePickerActivity.putExtra(FilePickerActivity.REQUEST_CODE, Request.DIRECTORY);
                     filePickerActivity.putExtra(FilePickerActivity.INTENT_EXTRA_FAB_COLOR_ID, android.R.color.holo_green_dark);
-                    startActivityForResult(filePickerActivity, FilePickerActivity.REQUEST_DIRECTORY);
+                    startActivityForResult(filePickerActivity, REQUEST_DIRECTORY);
                 }
             });
 

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

@@ -206,7 +206,7 @@ public void onItemClicked(View item, int position) {
     /**
      * Request code for this activity
      */
-    private int requestCode;
+    private Request requestCode;
     /**
      * {@code Intent} used to send back the data to the calling activity
      */
@@ -285,7 +285,7 @@ public void onClick(View view) {
             //set default if it is null
             scopeType = Scope.ALL;
         }
-        requestCode = givenIntent.getIntExtra(REQUEST_CODE, Request.DIRECTORY.ordinal());
+        requestCode = (Request) givenIntent.getSerializableExtra(REQUEST_CODE);
 
         colorId = givenIntent.getIntExtra(INTENT_EXTRA_COLOR_ID, android.R.color.holo_blue_light);
         drawableId = givenIntent.getIntExtra(INTENT_EXTRA_DRAWABLE_ID, -1);
@@ -466,7 +466,7 @@ private void initializeViews() {
         selectButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (requestCode == Request.DIRECTORY.ordinal()) {
+                if (requestCode == Request.DIRECTORY) {
                     if (currentFile.isDirectory()) {
                         curDirectory = currentFile;
                         data = new Intent();

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

@@ -49,8 +49,9 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.devpaul.materiallibrary.views.MaterialFloatingActionButton;
 import com.github.developerpaul123.filepickerlibrary.adapter.FileListAdapter;
-import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
+import com.github.developerpaul123.filepickerlibrary.enums.Request;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
 import java.io.File;
@@ -62,11 +63,6 @@
  */
 public class FilePickerActivity extends ListActivity implements NameFileDialogInterface {
 
-    /**
-     * Request code for when you want the file path to a directory.
-     */
-    public static final int REQUEST_DIRECTORY = 101;
-
     /**
      * Request code for when you want the file path to a specific file.
      */
@@ -210,7 +206,7 @@ public class FilePickerActivity extends ListActivity implements NameFileDialogIn
     /**
      * Request code for this activity
      */
-    private int requestCode;
+    private Request requestCode;
     /**
      * {@code Intent} used to send back the data to the calling activity
      */
@@ -284,7 +280,7 @@ protected void onCreate(Bundle savedInstanceState) {
             //set default if it is null
             scopeType = Scope.ALL;
         }
-        requestCode = givenIntent.getIntExtra(REQUEST_CODE, REQUEST_DIRECTORY);
+        requestCode = (Request) givenIntent.getSerializableExtra(REQUEST_CODE);
 
         colorId = givenIntent.getIntExtra(INTENT_EXTRA_COLOR_ID, android.R.color.holo_blue_light);
         drawableId = givenIntent.getIntExtra(INTENT_EXTRA_DRAWABLE_ID, -1);
@@ -452,7 +448,7 @@ public void onClick(View v) {
         selectButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (requestCode == REQUEST_DIRECTORY) {
+                if (requestCode == Request.DIRECTORY) {
                     if (currentFile.isDirectory()) {
                         curDirectory = currentFile;
                         data = new Intent();