Commit cbed3f1a authored by Thomas's avatar Thomas
Browse files

Fix media cannot be downloaded or shared (Android 10)

parent 6595af84

app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload 
            int position = binding.mediaViewpager.getCurrentItem();

            Attachment attachment = attachments.get(position);

            if (Build.VERSION.SDK_INT >= 23) {

                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {

                    if (ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {

                        ActivityCompat.requestPermissions(MediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE);

                    } else {

app/src/main/java/app/fedilab/android/mastodon/imageeditor/EditImageActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ public class EditImageActivity extends BaseActivity implements OnPhotoEditorList 
                        .setClearViewsEnabled(true)

                        .setTransparencyEnabled(true)

                        .build();

                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {

                    if (ContextCompat.checkSelfPermission(EditImageActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) !=

                            PackageManager.PERMISSION_GRANTED) {

                        ActivityCompat.requestPermissions(EditImageActivity.this,

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
     * @param position - int position of the media in the message

     */

    private void pickupMedia(ComposeActivity.mediaType type, int position) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {

            if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) !=

                    PackageManager.PERMISSION_GRANTED) {

                ActivityCompat.requestPermissions((Activity) context,

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentSettingsCategories.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat { 
        Preference pref_export_settings = findPreference(getString(R.string.pref_export_settings));

        if (pref_export_settings != null) {

            pref_export_settings.setOnPreferenceClickListener(preference -> {

                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {

                    permissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE);

                } else {

                    try {

app/src/main/java/app/fedilab/android/peertube/helper/Helper.java

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ public class Helper { 


    public static void requestPermissionAndProceed(Activity activity, PermissionGranted permissionGranted) {

        if (Build.VERSION.SDK_INT >= 23) {

            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {

                if (ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {

                    ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, app.fedilab.android.mastodon.helper.Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE);

                } else {