From b8b59649fbef5f33cdbd6aaa3ce6e36f3b7b5ce4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 19 Nov 2016 03:29:06 +0100 Subject: [PATCH] Clearer delete/block/profile approch: A long click goes to the profile where the less freqently used options can be found. --- .../org/telegram/ui/BlockedUsersActivity.java | 14 ++--------- .../org/telegram/ui/ContactsActivity.java | 17 ++++---------- .../java/org/telegram/ui/ProfileActivity.java | 23 +++++++++++-------- .../src/main/res/values-de/strings.xml | 1 + TMessagesProj/src/main/res/values/strings.xml | 1 + 5 files changed, 22 insertions(+), 34 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java index 2f4ffea2f..1a5ffa686 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java @@ -133,21 +133,11 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe selectedUserId = blockedUserIds[i]; AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); - CharSequence[] items = new CharSequence[]{ - LocaleController.getString("UnblockContact", R.string.UnblockContact), - LocaleController.getString("DeleteContact", R.string.DeleteContact) - }; + CharSequence[] items = new CharSequence[]{LocaleController.getString("UnblockContact", R.string.UnblockContact)}; builder.setItems(items, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - if (i == 0) { - MrMailbox.MrMailboxBlockContact(MrMailbox.hMailbox, selectedUserId, 0); - } - else if( i==1 ) { - if( MrMailbox.MrMailboxDeleteContact(MrMailbox.hMailbox, selectedUserId) == 0 ) { - Toast.makeText(getParentActivity(), LocaleController.getString("CannotDeleteContact", R.string.CannotDeleteContact), Toast.LENGTH_LONG).show(); - } - } + MrMailbox.MrMailboxBlockContact(MrMailbox.hMailbox, selectedUserId, 0); } }); showDialog(builder.create()); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java index 66d76f576..c043b8fa8 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java @@ -446,21 +446,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter if (item instanceof TLRPC.User) { final TLRPC.User user = (TLRPC.User) item; AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); - CharSequence[] items = new CharSequence[]{ - LocaleController.getString("BlockContact", R.string.BlockContact), - LocaleController.getString("DeleteContact", R.string.DeleteContact) - }; + CharSequence[] items = new CharSequence[]{LocaleController.getString("ViewProfile", R.string.ViewProfile)}; builder.setItems(items, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - if (i == 0) { - MrMailbox.MrMailboxBlockContact(MrMailbox.hMailbox, user.id, 1); - } - else if (i == 1) { - if( MrMailbox.MrMailboxDeleteContact(MrMailbox.hMailbox, user.id) == 0 ) { - Toast.makeText(getParentActivity(), LocaleController.getString("CannotDeleteContact", R.string.CannotDeleteContact), Toast.LENGTH_LONG).show(); - } - } + Bundle args = new Bundle(); + args.putInt("user_id", user.id); + ProfileActivity fragment = new ProfileActivity(args); + presentFragment(fragment); } }); showDialog(builder.create()); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index d7437f386..82d4f3b4e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -288,18 +288,17 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. showDialog(builder.create()); } } else if (id == delete_contact) { - final TLRPC.User user = MessagesController.getInstance().getUser(user_id); - if (user == null || getParentActivity() == null) { - return; - } AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setMessage(LocaleController.getString("AreYouSureDeleteContact", R.string.AreYouSureDeleteContact)); builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - ArrayList arrayList = new ArrayList<>(); - arrayList.add(user); - ContactsController.getInstance().deleteContact(arrayList); + if( MrMailbox.MrMailboxDeleteContact(MrMailbox.hMailbox, user_id)==0 ) { + Toast.makeText(getParentActivity(), LocaleController.getString("CannotDeleteContact", R.string.CannotDeleteContact), Toast.LENGTH_LONG).show(); + } + else { + finishFragment(); + } } }); builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); @@ -1278,13 +1277,17 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. animatingItem = null; ActionBarMenuItem item = menu.addItem(10, R.drawable.ic_ab_other); - if (user_id != 0) { - blockTextView = item.addSubItem(block_contact, "X", 0); - } if( chat_id!=0 || MrMailbox.MrMailboxGetChatIdByContactId(MrMailbox.hMailbox, user_id)!=0 ) { item.addSubItem(add_shortcut, LocaleController.getString("AddShortcut", R.string.AddShortcut), 0); } + + if (user_id != 0) { + blockTextView = item.addSubItem(block_contact, "X", 0); + item.addSubItem(delete_contact, LocaleController.getString("DeleteContact", R.string.DeleteContact), 0); + } + + } @Override diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index 501dcdca3..a840f3849 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -721,4 +721,5 @@ Ungültige E-Mail-Adresse. Benutzer gelöscht. Benutzer angelegt. + Profil anzeigen diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 32948a4c7..11d98bba9 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -721,4 +721,5 @@ Bad e-mail address. User deleted. User created. + View profile