baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Fix onActivityResult deprecation in DownloadDialog

Browse source
This commit is contained in:
TacoTheDank 2021-06-20 14:14:44 -04:00
parent e5a1438673
commit ae39b31c68
1 changed files with 77 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
View file

@ -20,6 +20,9 @@ import android.widget.RadioGroup;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.Toast; import android.widget.Toast;
import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -82,9 +85,6 @@ public class DownloadDialog extends DialogFragment
implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener { implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
private static final String TAG = "DialogFragment"; private static final String TAG = "DialogFragment";
private static final boolean DEBUG = MainActivity.DEBUG; private static final boolean DEBUG = MainActivity.DEBUG;
private static final int REQUEST_DOWNLOAD_SAVE_AS = 0x1230;
private static final int REQUEST_DOWNLOAD_PICK_VIDEO_FOLDER = 0x789E;
private static final int REQUEST_DOWNLOAD_PICK_AUDIO_FOLDER = 0x789F;
@State @State
StreamInfo currentInfo; StreamInfo currentInfo;
@ -122,6 +122,16 @@ public class DownloadDialog extends DialogFragment
private String filenameTmp; private String filenameTmp;
private String mimeTmp; private String mimeTmp;
private final ActivityResultLauncher<Intent> requestDownloadSaveAsLauncher =
registerForActivityResult(
new StartActivityForResult(), this::requestDownloadSaveAsResult);
private final ActivityResultLauncher<Intent> requestDownloadPickAudioFolderLauncher =
registerForActivityResult(
new StartActivityForResult(), this::requestDownloadPickAudioFolderResult);
private final ActivityResultLauncher<Intent> requestDownloadPickVideoFolderLauncher =
registerForActivityResult(
new StartActivityForResult(), this::requestDownloadPickVideoFolderResult);
public static DownloadDialog newInstance(final StreamInfo info) { public static DownloadDialog newInstance(final StreamInfo info) {
final DownloadDialog dialog = new DownloadDialog(); final DownloadDialog dialog = new DownloadDialog();
dialog.setInfo(info); dialog.setInfo(info);
@ -372,39 +382,58 @@ public class DownloadDialog extends DialogFragment
// Streams Spinner Listener // Streams Spinner Listener
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
@Override private void requestDownloadPickAudioFolderResult(final ActivityResult result) {
public void onActivityResult(final int requestCode, final int resultCode, final Intent data) { requestDownloadPickFolderResult(
super.onActivityResult(requestCode, resultCode, data); result, getString(R.string.download_path_audio_key), DownloadManager.TAG_AUDIO);
}
if (resultCode != Activity.RESULT_OK) { private void requestDownloadPickVideoFolderResult(final ActivityResult result) {
requestDownloadPickFolderResult(
result, getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
}
private void requestDownloadSaveAsResult(final ActivityResult result) {
if (result.getResultCode() != Activity.RESULT_OK) {
return; return;
} }
if (data.getData() == null) { if (result.getData() == null || result.getData().getData() == null) {
showFailedDialog(R.string.general_error); showFailedDialog(R.string.general_error);
return; return;
} }
if (requestCode == REQUEST_DOWNLOAD_SAVE_AS) { if (FilePickerActivityHelper.isOwnFileUri(context, result.getData().getData())) {
if (FilePickerActivityHelper.isOwnFileUri(context, data.getData())) { final File file = Utils.getFileForUri(result.getData().getData());
final File file = Utils.getFileForUri(data.getData());
checkSelectedDownload(null, Uri.fromFile(file), file.getName(), checkSelectedDownload(null, Uri.fromFile(file), file.getName(),
StoredFileHelper.DEFAULT_MIME); StoredFileHelper.DEFAULT_MIME);
return; return;
} }
final DocumentFile docFile = DocumentFile.fromSingleUri(context, data.getData()); final DocumentFile docFile
= DocumentFile.fromSingleUri(context, result.getData().getData());
if (docFile == null) { if (docFile == null) {
showFailedDialog(R.string.general_error); showFailedDialog(R.string.general_error);
return; return;
} }
// check if the selected file was previously used // check if the selected file was previously used
checkSelectedDownload(null, data.getData(), docFile.getName(), checkSelectedDownload(null, result.getData().getData(), docFile.getName(),
docFile.getType()); docFile.getType());
} else if (requestCode == REQUEST_DOWNLOAD_PICK_AUDIO_FOLDER }
|| requestCode == REQUEST_DOWNLOAD_PICK_VIDEO_FOLDER) {
Uri uri = data.getData(); private void requestDownloadPickFolderResult(final ActivityResult result,
final String key,
final String tag) {
if (result.getResultCode() != Activity.RESULT_OK) {
return;
}
if (result.getData() == null || result.getData().getData() == null) {
showFailedDialog(R.string.general_error);
return;
}
Uri uri = result.getData().getData();
if (FilePickerActivityHelper.isOwnFileUri(context, uri)) { if (FilePickerActivityHelper.isOwnFileUri(context, uri)) {
uri = Uri.fromFile(Utils.getFileForUri(uri)); uri = Uri.fromFile(Utils.getFileForUri(uri));
} else { } else {
@ -412,16 +441,6 @@ public class DownloadDialog extends DialogFragment
StoredDirectoryHelper.PERMISSION_FLAGS); StoredDirectoryHelper.PERMISSION_FLAGS);
} }
final String key;
final String tag;
if (requestCode == REQUEST_DOWNLOAD_PICK_AUDIO_FOLDER) {
key = getString(R.string.download_path_audio_key);
tag = DownloadManager.TAG_AUDIO;
} else {
key = getString(R.string.download_path_video_key);
tag = DownloadManager.TAG_VIDEO;
}
PreferenceManager.getDefaultSharedPreferences(context).edit() PreferenceManager.getDefaultSharedPreferences(context).edit()
.putString(key, uri.toString()).apply(); .putString(key, uri.toString()).apply();
@ -434,7 +453,6 @@ public class DownloadDialog extends DialogFragment
showFailedDialog(R.string.general_error); showFailedDialog(R.string.general_error);
} }
} }
}
private void initToolbar(final Toolbar toolbar) { private void initToolbar(final Toolbar toolbar) {
if (DEBUG) { if (DEBUG) {
@ -637,6 +655,10 @@ public class DownloadDialog extends DialogFragment
.show(); .show();
} }
private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
launcher.launch(StoredDirectoryHelper.getPicker(context));
}
private void prepareSelectedDownload() { private void prepareSelectedDownload() {
final StoredDirectoryHelper mainStorage; final StoredDirectoryHelper mainStorage;
final MediaFormat format; final MediaFormat format;
@ -691,11 +713,9 @@ public class DownloadDialog extends DialogFragment
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) { if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
startActivityForResult(StoredDirectoryHelper.getPicker(context), launchDirectoryPicker(requestDownloadPickAudioFolderLauncher);
REQUEST_DOWNLOAD_PICK_AUDIO_FOLDER);
} else { } else {
startActivityForResult(StoredDirectoryHelper.getPicker(context), launchDirectoryPicker(requestDownloadPickVideoFolderLauncher);
REQUEST_DOWNLOAD_PICK_VIDEO_FOLDER);
} }
return; return;
@ -715,8 +735,8 @@ public class DownloadDialog extends DialogFragment
initialPath = Uri.parse(initialSavePath.getAbsolutePath()); initialPath = Uri.parse(initialSavePath.getAbsolutePath());
} }
startActivityForResult(StoredFileHelper.getNewPicker(context, requestDownloadSaveAsLauncher.launch(StoredFileHelper.getNewPicker(context,
filenameTmp, mimeTmp, initialPath), REQUEST_DOWNLOAD_SAVE_AS); filenameTmp, mimeTmp, initialPath));
return; return;
} }