1.移除READ_MEDIA_VIDEO 权限
2.移除READ_MEDIA_IMAGES 权限,选择照片改用谷歌官方Photo picker
This commit is contained in:
@@ -10,9 +10,9 @@
|
||||
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
|
||||
tools:ignore="ProtectedPermissions" />
|
||||
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
|
||||
<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
|
||||
<!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />-->
|
||||
<!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
|
||||
|
||||
|
||||
<application
|
||||
|
||||
@@ -240,8 +240,7 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
if (Setting.isShowCamera) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
return new String[]{Manifest.permission.CAMERA,
|
||||
Manifest.permission.READ_MEDIA_IMAGES,
|
||||
Manifest.permission.READ_MEDIA_AUDIO, Manifest.permission.READ_MEDIA_VIDEO};
|
||||
Manifest.permission.READ_MEDIA_IMAGES};
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
|
||||
return new String[]{Manifest.permission.CAMERA,
|
||||
@@ -252,8 +251,7 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
Manifest.permission.WRITE_EXTERNAL_STORAGE};
|
||||
} else {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
return new String[]{Manifest.permission.READ_MEDIA_IMAGES,
|
||||
Manifest.permission.READ_MEDIA_AUDIO, Manifest.permission.READ_MEDIA_VIDEO};
|
||||
return new String[]{Manifest.permission.READ_MEDIA_IMAGES};
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
|
||||
return new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
||||
@@ -340,7 +338,8 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
private void toAndroidCamera(int requestCode) {
|
||||
Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
|
||||
if (cameraIntent.resolveActivity(getPackageManager()) != null || this.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) {
|
||||
if (cameraIntent.resolveActivity(getPackageManager()) != null || this.getPackageManager()
|
||||
.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) {
|
||||
|
||||
if (isQ) {
|
||||
photoUri = createImageUri();
|
||||
@@ -363,11 +362,13 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
startActivityForResult(cameraIntent, requestCode);
|
||||
} else {
|
||||
Toast.makeText(getApplicationContext(),
|
||||
R.string.camera_temp_file_error_easy_photos, Toast.LENGTH_SHORT).show();
|
||||
R.string.camera_temp_file_error_easy_photos, Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
}
|
||||
} else {
|
||||
Toast.makeText(getApplicationContext(), R.string.msg_no_camera_easy_photos,
|
||||
Toast.LENGTH_SHORT).show();
|
||||
Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -716,12 +717,14 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
if (albumModel.getAlbumItems().isEmpty()) {
|
||||
if (Setting.isOnlyVideo()) {
|
||||
Toast.makeText(getApplicationContext(), R.string.no_videos_easy_photos,
|
||||
Toast.LENGTH_LONG).show();
|
||||
Toast.LENGTH_LONG)
|
||||
.show();
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
Toast.makeText(getApplicationContext(), R.string.no_photos_easy_photos,
|
||||
Toast.LENGTH_LONG).show();
|
||||
Toast.LENGTH_LONG)
|
||||
.show();
|
||||
if (Setting.isShowCamera)
|
||||
launchCamera(Code.REQUEST_CAMERA);
|
||||
else
|
||||
@@ -839,7 +842,8 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
} else if (R.id.tv_original == id) {
|
||||
if (!Setting.originalMenuUsable) {
|
||||
Toast.makeText(getApplicationContext(), Setting.originalMenuUnusableHint,
|
||||
Toast.LENGTH_SHORT).show();
|
||||
Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
return;
|
||||
}
|
||||
Setting.selectedOriginal = !Setting.selectedOriginal;
|
||||
@@ -1067,35 +1071,41 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
|
||||
if (result == null) {
|
||||
if (Setting.isOnlyVideo()) {
|
||||
Toast.makeText(getApplicationContext(),
|
||||
getString(R.string.selector_reach_max_video_hint_easy_photos,
|
||||
Setting.count), Toast.LENGTH_SHORT).show();
|
||||
getString(R.string.selector_reach_max_video_hint_easy_photos,
|
||||
Setting.count), Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
|
||||
} else if (Setting.showVideo) {
|
||||
Toast.makeText(getApplicationContext(),
|
||||
getString(R.string.selector_reach_max_hint_easy_photos),
|
||||
Toast.LENGTH_SHORT).show();
|
||||
getString(R.string.selector_reach_max_hint_easy_photos),
|
||||
Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
} else {
|
||||
Toast.makeText(getApplicationContext(),
|
||||
getString(R.string.selector_reach_max_image_hint_easy_photos,
|
||||
Setting.count), Toast.LENGTH_SHORT).show();
|
||||
getString(R.string.selector_reach_max_image_hint_easy_photos,
|
||||
Setting.count), Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
}
|
||||
return;
|
||||
}
|
||||
switch (result) {
|
||||
case Result.PICTURE_OUT:
|
||||
Toast.makeText(getApplicationContext(),
|
||||
getString(R.string.selector_reach_max_image_hint_easy_photos,
|
||||
Setting.complexPictureCount), Toast.LENGTH_SHORT).show();
|
||||
getString(R.string.selector_reach_max_image_hint_easy_photos,
|
||||
Setting.complexPictureCount), Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
break;
|
||||
case Result.VIDEO_OUT:
|
||||
Toast.makeText(getApplicationContext(),
|
||||
getString(R.string.selector_reach_max_video_hint_easy_photos,
|
||||
Setting.complexVideoCount), Toast.LENGTH_SHORT).show();
|
||||
getString(R.string.selector_reach_max_video_hint_easy_photos,
|
||||
Setting.complexVideoCount), Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
break;
|
||||
case Result.SINGLE_TYPE:
|
||||
Toast.makeText(getApplicationContext(),
|
||||
getString(R.string.selector_single_type_hint_easy_photos),
|
||||
Toast.LENGTH_SHORT).show();
|
||||
getString(R.string.selector_single_type_hint_easy_photos),
|
||||
Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user