diff options
author | Aidan Follestad <drummer.aidan@gmail.com> | 2016-01-21 15:34:01 -0600 |
---|---|---|
committer | Aidan Follestad <drummer.aidan@gmail.com> | 2016-01-21 15:34:01 -0600 |
commit | 7d747d69ab32def7a91f92975ecebd905db6fc7b (patch) | |
tree | 0cc1f1684fec463f692608d37da2ee33ec4044fe | |
parent | 68c68969f2bfc926cc08ce64f2fe647e83563462 (diff) | |
parent | d80268d0164072c5b19c2f1b6459fc92cd37bfc8 (diff) | |
download | afollestad-7d747d69ab32def7a91f92975ecebd905db6fc7b.tar.gz |
Merge pull request #918 from DVDAndroid/patch-1
File chooser not shown after first permission request
-rw-r--r-- | sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java b/sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java index cb875ee..002f1bf 100644 --- a/sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java +++ b/sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java @@ -9,14 +9,12 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.os.Handler; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; import android.support.annotation.StringRes; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; -import android.support.v4.os.EnvironmentCompat; import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.InputType; @@ -70,6 +68,8 @@ public class MainActivity extends AppCompatActivity implements private final static int STORAGE_PERMISSION_RC = 69; private Handler mHandler; + private int chooserDialog; + private void showToast(String message) { if (mToast != null) { mToast.cancel(); @@ -585,6 +585,7 @@ public class MainActivity extends AppCompatActivity implements @TargetApi(Build.VERSION_CODES.JELLY_BEAN) @OnClick(R.id.file_chooser) public void showFileChooser() { + chooserDialog = R.id.file_chooser; if (ActivityCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, STORAGE_PERMISSION_RC); @@ -602,6 +603,7 @@ public class MainActivity extends AppCompatActivity implements @TargetApi(Build.VERSION_CODES.JELLY_BEAN) @OnClick(R.id.folder_chooser) public void showFolderChooser() { + chooserDialog = R.id.folder_chooser; if (ActivityCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, STORAGE_PERMISSION_RC); @@ -755,11 +757,11 @@ public class MainActivity extends AppCompatActivity implements mHandler.postDelayed(new Runnable() { @Override public void run() { - findViewById(R.id.folder_chooser).performClick(); + findViewById(chooserDialog).performClick(); } }, 1000); } else { - Toast.makeText(this, "The folder chooser will not work without permission to read external storage.", Toast.LENGTH_LONG).show(); + Toast.makeText(this, "The folder or file chooser will not work without permission to read external storage.", Toast.LENGTH_LONG).show(); } } } |