lynx/NekoX
1
0
Fork 0
mirror of https://github.com/NekoX-Dev/NekoX.git synced 2025-01-05 18:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Separate stickers and gifs permissions

Browse Source
This commit is contained in:
Alisson Lauffer 2020-03-22 11:29:28 -03:00 committed by NekoInverter
parent 6b09188daf
commit 9f38ff49d3
No known key found for this signature in database
GPG Key ID: 280D6CCCF95715F9
3 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
View File

@ -115,6 +115,7 @@ public class ChatRightsEditActivity extends BaseFragment {
private int sendMessagesRow;
private int sendMediaRow;
private int sendStickersRow;
private int sendGifsRow;
private int sendPollsRow;
private int embedLinksRow;
private int untilSectionRow;
@ -527,7 +528,9 @@ public class ChatRightsEditActivity extends BaseFragment {
} else if (position == sendMediaRow) {
bannedRights.send_media = !bannedRights.send_media;
} else if (position == sendStickersRow) {
bannedRights.send_stickers = bannedRights.send_games = bannedRights.send_gifs = bannedRights.send_inline = !bannedRights.send_stickers;
bannedRights.send_stickers = bannedRights.send_games = bannedRights.send_inline = !bannedRights.send_stickers;
} else if (position == sendGifsRow) {
bannedRights.send_gifs = !bannedRights.send_gifs;
} else if (position == embedLinksRow) {
bannedRights.embed_links = !bannedRights.embed_links;
} else if (position == sendPollsRow) {
@ -556,12 +559,19 @@ public class ChatRightsEditActivity extends BaseFragment {
}
}
if ((bannedRights.view_messages || bannedRights.send_messages) && !bannedRights.send_stickers) {
bannedRights.send_stickers = bannedRights.send_games = bannedRights.send_gifs = bannedRights.send_inline = true;
bannedRights.send_stickers = bannedRights.send_games = bannedRights.send_inline = true;
RecyclerListView.ViewHolder holder = listView.findViewHolderForAdapterPosition(sendStickersRow);
if (holder != null) {
((TextCheckCell2) holder.itemView).setChecked(false);
}
}
if ((bannedRights.view_messages || bannedRights.send_messages) && !bannedRights.send_gifs) {
bannedRights.send_gifs = true;
RecyclerListView.ViewHolder holder = listView.findViewHolderForAdapterPosition(sendGifsRow);
if (holder != null) {
((TextCheckCell2) holder.itemView).setChecked(false);
}
}
if ((bannedRights.view_messages || bannedRights.send_messages) && !bannedRights.embed_links) {
bannedRights.embed_links = true;
RecyclerListView.ViewHolder holder = listView.findViewHolderForAdapterPosition(embedLinksRow);
@ -791,6 +801,7 @@ public class ChatRightsEditActivity extends BaseFragment {
sendMessagesRow = -1;
sendMediaRow = -1;
sendStickersRow = -1;
sendGifsRow = -1;
sendPollsRow = -1;
embedLinksRow = -1;
untilSectionRow = -1;
@ -817,6 +828,7 @@ public class ChatRightsEditActivity extends BaseFragment {
sendMessagesRow = rowCount++;
sendMediaRow = rowCount++;
sendStickersRow = rowCount++;
sendGifsRow = rowCount++;
sendPollsRow = rowCount++;
embedLinksRow = rowCount++;
addUsersRow = rowCount++;
@ -1199,8 +1211,11 @@ public class ChatRightsEditActivity extends BaseFragment {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendMedia", R.string.UserRestrictionsSendMedia), !bannedRights.send_media && !defaultBannedRights.send_media, true);
checkCell.setIcon(defaultBannedRights.send_media ? R.drawable.permission_locked : 0);
} else if (position == sendStickersRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendStickers", R.string.UserRestrictionsSendStickers), !bannedRights.send_stickers && !defaultBannedRights.send_stickers, true);
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendStickers2", R.string.UserRestrictionsSendStickers2), !bannedRights.send_stickers && !defaultBannedRights.send_stickers, true);
checkCell.setIcon(defaultBannedRights.send_stickers ? R.drawable.permission_locked : 0);
} else if (position == sendGifsRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendGifs", R.string.UserRestrictionsSendGifs), !bannedRights.send_gifs && !defaultBannedRights.send_gifs, true);
checkCell.setIcon(defaultBannedRights.send_gifs ? R.drawable.permission_locked : 0);
} else if (position == embedLinksRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsEmbedLinks", R.string.UserRestrictionsEmbedLinks), !bannedRights.embed_links && !defaultBannedRights.embed_links, true);
checkCell.setIcon(defaultBannedRights.embed_links ? R.drawable.permission_locked : 0);
@ -1209,7 +1224,7 @@ public class ChatRightsEditActivity extends BaseFragment {
checkCell.setIcon(defaultBannedRights.send_polls ? R.drawable.permission_locked : 0);
}
if (position == sendMediaRow || position == sendStickersRow || position == embedLinksRow || position == sendPollsRow) {
if (position == sendMediaRow || position == sendStickersRow || position == sendGifsRow || position == embedLinksRow || position == sendPollsRow) {
checkCell.setEnabled(!bannedRights.send_messages && !bannedRights.view_messages && !defaultBannedRights.send_messages && !defaultBannedRights.view_messages);
} else if (position == sendMessagesRow) {
checkCell.setEnabled(!bannedRights.view_messages && !defaultBannedRights.view_messages);
@ -1281,8 +1296,8 @@ public class ChatRightsEditActivity extends BaseFragment {
return 3;
} else if (position == changeInfoRow || position == postMessagesRow || position == editMesagesRow || position == deleteMessagesRow ||
position == addAdminsRow || position == banUsersRow || position == addUsersRow || position == pinMessagesRow ||
position == sendMessagesRow || position == sendMediaRow || position == sendStickersRow || position == embedLinksRow ||
position == sendPollsRow) {
position == sendMessagesRow || position == sendMediaRow || position == sendStickersRow || position == sendGifsRow ||
position == embedLinksRow || position == sendPollsRow) {
return 4;
} else if (position == cantEditInfoRow || position == rankInfoRow) {
return 1;

25
TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
View File

@ -106,6 +106,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
private int sendMessagesRow;
private int sendMediaRow;
private int sendStickersRow;
private int sendGifsRow;
private int sendPollsRow;
private int embedLinksRow;
private int changeInfoRow;
@ -381,6 +382,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
sendMessagesRow = -1;
sendMediaRow = -1;
sendStickersRow = -1;
sendGifsRow = -1;
sendPollsRow = -1;
embedLinksRow = -1;
addUsersRow = -1;
@ -404,6 +406,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
sendMessagesRow = rowCount++;
sendMediaRow = rowCount++;
sendStickersRow = rowCount++;
sendGifsRow = rowCount++;
sendPollsRow = rowCount++;
embedLinksRow = rowCount++;
addUsersRow = rowCount++;
@ -739,7 +742,9 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
} else if (position == sendMediaRow) {
defaultBannedRights.send_media = !defaultBannedRights.send_media;
} else if (position == sendStickersRow) {
defaultBannedRights.send_stickers = defaultBannedRights.send_games = defaultBannedRights.send_gifs = defaultBannedRights.send_inline = !defaultBannedRights.send_stickers;
defaultBannedRights.send_stickers = defaultBannedRights.send_games = defaultBannedRights.send_inline = !defaultBannedRights.send_stickers;
} else if (position == sendGifsRow) {
defaultBannedRights.send_gifs = !defaultBannedRights.send_gifs;
} else if (position == embedLinksRow) {
defaultBannedRights.embed_links = !defaultBannedRights.embed_links;
} else if (position == sendPollsRow) {
@ -768,12 +773,19 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
}
}
if ((defaultBannedRights.view_messages || defaultBannedRights.send_messages) && !defaultBannedRights.send_stickers) {
defaultBannedRights.send_stickers = defaultBannedRights.send_games = defaultBannedRights.send_gifs = defaultBannedRights.send_inline = true;
defaultBannedRights.send_stickers = defaultBannedRights.send_games = defaultBannedRights.send_inline = true;
RecyclerListView.ViewHolder holder = listView.findViewHolderForAdapterPosition(sendStickersRow);
if (holder != null) {
((TextCheckCell2) holder.itemView).setChecked(false);
}
}
if ((defaultBannedRights.view_messages || defaultBannedRights.send_messages) && !defaultBannedRights.send_gifs) {
defaultBannedRights.send_gifs = true;
RecyclerListView.ViewHolder holder = listView.findViewHolderForAdapterPosition(sendGifsRow);
if (holder != null) {
((TextCheckCell2) holder.itemView).setChecked(false);
}
}
if ((defaultBannedRights.view_messages || defaultBannedRights.send_messages) && !defaultBannedRights.embed_links) {
defaultBannedRights.embed_links = true;
RecyclerListView.ViewHolder holder = listView.findViewHolderForAdapterPosition(embedLinksRow);
@ -2731,14 +2743,16 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
} else if (position == sendMediaRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendMedia", R.string.UserRestrictionsSendMedia), !defaultBannedRights.send_media, true);
} else if (position == sendStickersRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendStickers", R.string.UserRestrictionsSendStickers), !defaultBannedRights.send_stickers, true);
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendStickers2", R.string.UserRestrictionsSendStickers2), !defaultBannedRights.send_stickers, true);
} else if (position == sendGifsRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendGifs", R.string.UserRestrictionsSendGifs), !defaultBannedRights.send_gifs, true);
} else if (position == embedLinksRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsEmbedLinks", R.string.UserRestrictionsEmbedLinks), !defaultBannedRights.embed_links, true);
} else if (position == sendPollsRow) {
checkCell.setTextAndCheck(LocaleController.getString("UserRestrictionsSendPolls", R.string.UserRestrictionsSendPolls), !defaultBannedRights.send_polls, true);
}
if (position == sendMediaRow || position == sendStickersRow || position == embedLinksRow || position == sendPollsRow) {
if (position == sendMediaRow || position == sendStickersRow || position == sendGifsRow || position == embedLinksRow || position == sendPollsRow) {
checkCell.setEnabled(!defaultBannedRights.send_messages && !defaultBannedRights.view_messages);
} else if (position == sendMessagesRow) {
checkCell.setEnabled(!defaultBannedRights.view_messages);
@ -2803,7 +2817,8 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
} else if (position == removedUsersRow) {
return 6;
} else if (position == changeInfoRow || position == addUsersRow || position == pinMessagesRow || position == sendMessagesRow ||
position == sendMediaRow || position == sendStickersRow || position == embedLinksRow || position == sendPollsRow) {
position == sendMediaRow || position == sendStickersRow || position == sendGifsRow || position == embedLinksRow ||
position == sendPollsRow) {
return 7;
} else if (position == membersHeaderRow || position == contactsHeaderRow || position == botHeaderRow) {
return 8;

2
TMessagesProj/src/main/res/values/strings_neko.xml
View File

@ -91,4 +91,6 @@
<string name="TapOnActionBar">Tap on the title bar</string>
<string name="TapOnFab">Tap on the pencil button</string>
<string name="HideKeyboardOnChatScroll">Hide keyboard on chat scroll</string>
<string name="UserRestrictionsSendStickers2">Send Stickers</string>
<string name="UserRestrictionsSendGifs">Send GIFs</string>
</resources>