Skip to content

Commit a91f3fc

Browse files
committed
callback() is deprecated in MaterialDialog
1 parent 82d6ce2 commit a91f3fc

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import android.os.Build;
3030
import android.os.Bundle;
3131
import android.os.Environment;
32+
import android.support.annotation.NonNull;
3233
import android.support.design.widget.Snackbar;
3334
import android.support.v4.app.ActivityCompat;
3435
import android.support.v4.content.ContextCompat;
@@ -44,6 +45,7 @@
4445
import android.widget.RelativeLayout;
4546
import android.widget.TextView;
4647

48+
import com.afollestad.materialdialogs.DialogAction;
4749
import com.afollestad.materialdialogs.MaterialDialog;
4850
import com.devpaul.materiallibrary.views.MaterialFloatingActionButton;
4951
import com.github.developerpaul123.filepickerlibrary.adapter.FileListAdapter;
@@ -338,17 +340,18 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
338340
.content(R.string.file_picker_permission_rationale_dialog_content)
339341
.positiveText(R.string.file_picker_ok)
340342
.negativeText(R.string.file_picker_cancel)
341-
.callback(new MaterialDialog.ButtonCallback() {
343+
.onPositive(new MaterialDialog.SingleButtonCallback() {
342344
@Override
343-
public void onPositive(MaterialDialog dialog) {
345+
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
344346
ActivityCompat.requestPermissions(FilePickerActivity.this,
345347
new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
346348
Manifest.permission.WRITE_EXTERNAL_STORAGE},
347349
REQUEST_FOR_READ_EXTERNAL_STORAGE);
348350
}
349-
351+
})
352+
.onNegative(new MaterialDialog.SingleButtonCallback() {
350353
@Override
351-
public void onNegative(MaterialDialog dialog) {
354+
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
352355
setResult(RESULT_CANCELED);
353356
finish();
354357
}
@@ -393,8 +396,8 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
393396

394397
switch (requestCode) {
395398
case REQUEST_FOR_READ_EXTERNAL_STORAGE:
396-
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED &&
397-
grantResults[1] == PackageManager.PERMISSION_GRANTED) {
399+
if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED) &&
400+
(grantResults[1] == PackageManager.PERMISSION_GRANTED)) {
398401
//permission granted.
399402
init();
400403
} else {
@@ -473,7 +476,7 @@ public void onClick(View view) {
473476
setResult(RESULT_OK, data);
474477
finish();
475478
} else {
476-
Snackbar.make(getWindow().getDecorView(), String.format(getString(R.string.file_picker_snackbar_select_file_ext_message),requiredExtension), Snackbar.LENGTH_SHORT).show();
479+
Snackbar.make(getWindow().getDecorView(), String.format(getString(R.string.file_picker_snackbar_select_file_ext_message), requiredExtension), Snackbar.LENGTH_SHORT).show();
477480
}
478481
} else {
479482
data = new Intent();

0 commit comments

Comments
 (0)