lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add back asking for gallery permission

This commit is contained in:
luvletter2333 2022-02-03 20:44:42 +08:00
parent 2a19e63c62
commit 20f3658279
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoAttachPermissionCell.java
View File

@ -68,18 +68,19 @@ public class PhotoAttachPermissionCell extends FrameLayout {
imageView.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 5, 0, 0, 27)); imageView.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 5, 0, 0, 27));
imageView2.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 5, 0, 0, 27)); imageView2.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 5, 0, 0, 27));
} else { } else if (type == 1) {
imageView.setImageResource(R.drawable.permissions_gallery1); imageView.setImageResource(R.drawable.permissions_gallery1);
imageView2.setImageResource(R.drawable.permissions_gallery2); imageView2.setImageResource(R.drawable.permissions_gallery2);
textView.setText(LocaleController.getString("GalleryPermissionText", R.string.GalleryPermissionText)); textView.setText(LocaleController.getString("GalleryPermissionText", R.string.GalleryPermissionText));
if (NekoXConfig.forceSystemPicker) {
imageView.setImageResource(R.drawable.baseline_open_in_browser_24);
imageView2.setVisibility(GONE);
textView.setText(LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp));
}
imageView.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27)); imageView.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27));
imageView2.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27)); imageView2.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27));
} else {
imageView.setImageResource(R.drawable.baseline_open_in_browser_24);
imageView2.setVisibility(GONE);
textView.setText(LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp));
imageView.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27));
} }
} }

9
TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
View File

@ -628,8 +628,8 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou
return; return;
} else if (noGalleryPermissions && position != 0) { } else if (noGalleryPermissions && position != 0) {
try { try {
if (NekoXConfig.forceSystemPicker) { if (position == adapter.itemsCount - 2) {
menu.onItemClick(open_in); // Use system photo picker menu.onItemClick(open_in); // NekoX: Use system photo picker
} else { } else {
parentAlert.baseFragment.getParentActivity().requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4); parentAlert.baseFragment.getParentActivity().requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4);
} }
@ -3250,7 +3250,9 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou
case 3: { case 3: {
PhotoAttachPermissionCell cell = (PhotoAttachPermissionCell) holder.itemView; PhotoAttachPermissionCell cell = (PhotoAttachPermissionCell) holder.itemView;
cell.setItemSize(itemSize); cell.setItemSize(itemSize);
cell.setType(needCamera && noCameraPermissions && position == 0 ? 0 : 1); int type = needCamera && noCameraPermissions && position == 0 ? 0 : 1;
if (position == itemsCount - 2) type = 999;
cell.setType(type);
break; break;
} }
} }
@ -3322,6 +3324,7 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou
} }
if (noGalleryPermissions && this == adapter) { if (noGalleryPermissions && this == adapter) {
count++; count++;
count++; // NekoX: Additional Open In picker
} }
count += cameraPhotos.size(); count += cameraPhotos.size();
if (selectedAlbumEntry != null) { if (selectedAlbumEntry != null) {

1
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View File

@ -4246,7 +4246,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
showPermissionErrorAlert(LocaleController.getString("VoipNeedCameraPermission", R.string.VoipNeedCameraPermission)); showPermissionErrorAlert(LocaleController.getString("VoipNeedCameraPermission", R.string.VoipNeedCameraPermission));
} }
} else if (requestCode == 4) { } else if (requestCode == 4) {
NekoXConfig.checkForceSystemPicker();
if (!granted) { if (!granted) {
showPermissionErrorAlert(LocaleController.getString("PermissionStorage", R.string.PermissionStorage)); showPermissionErrorAlert(LocaleController.getString("PermissionStorage", R.string.PermissionStorage));
} else { } else {

14
TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoXConfig.java
View File

@ -50,25 +50,11 @@ public class NekoXConfig {
public static final int TITLE_TYPE_ICON = 1; public static final int TITLE_TYPE_ICON = 1;
public static final int TITLE_TYPE_MIX = 2; public static final int TITLE_TYPE_MIX = 2;
public static boolean forceSystemPicker = false; // SDK23+ and no storage permission
private static final String EMOJI_FONT_AOSP = "NotoColorEmoji.ttf"; private static final String EMOJI_FONT_AOSP = "NotoColorEmoji.ttf";
public static boolean loadSystemEmojiFailed = false; public static boolean loadSystemEmojiFailed = false;
private static Typeface systemEmojiTypeface; private static Typeface systemEmojiTypeface;
static {
checkForceSystemPicker();
}
public static void checkForceSystemPicker() {
// TODO show alert?
// TODO not working: send photo (upstream bug)
if (Build.VERSION.SDK_INT >= 23 && ApplicationLoader.applicationContext.checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
forceSystemPicker = true;
BuildVars.NO_SCOPED_STORAGE = false;
}
}
public static SharedPreferences preferences = NitritesKt.openMainSharedPreference("nekox_config"); public static SharedPreferences preferences = NitritesKt.openMainSharedPreference("nekox_config");