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

Ask confirmation when starting secret chat and sharing contact info 

Thanks to https://github.com/DrKLO/Telegram/pull/401
This commit is contained in:
DrKLO 2014-06-04 23:27:43 +04:00
parent 63ba8a5ac1
commit cdb39ac30f
4 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/build.gradle
View File

@ -82,7 +82,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 19 targetSdkVersion 19
versionCode 237 versionCode 238
versionName "1.4.15" versionName "1.4.15"
} }
} }

23
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View File

@ -2566,15 +2566,26 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
topPanel.setOnClickListener(new View.OnClickListener() { topPanel.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
MessagesController.getInstance().hidenAddToContacts.put(currentUser.id, currentUser); AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
topPanel.setVisibility(View.GONE); builder.setMessage(LocaleController.getString("AreYouSure", R.string.AreYouSure));
MessagesController.getInstance().sendMessage(UserConfig.currentUser, dialog_id); builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
chatListView.post(new Runnable() { builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
@Override @Override
public void run() { public void onClick(DialogInterface dialogInterface, int i) {
chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop()); MessagesController.getInstance().hidenAddToContacts.put(currentUser.id, currentUser);
topPanel.setVisibility(View.GONE);
MessagesController.getInstance().sendMessage(UserConfig.currentUser, dialog_id);
chatListView.post(new Runnable() {
@Override
public void run() {
chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop());
}
});
} }
}); });
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
visibleDialog = builder.show();
visibleDialog.setCanceledOnTouchOutside(true);
} }
}); });
} }

14
TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java
View File

@ -211,8 +211,18 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
startSecretButton.setOnClickListener(new View.OnClickListener() { startSecretButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
creatingChat = true; AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
MessagesController.getInstance().startSecretChat(getParentActivity(), MessagesController.getInstance().users.get(user_id)); builder.setMessage(LocaleController.getString("AreYouSure", R.string.AreYouSure));
builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
creatingChat = true;
MessagesController.getInstance().startSecretChat(getParentActivity(), MessagesController.getInstance().users.get(user_id));
}
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
builder.show().setCanceledOnTouchOutside(true);
} }
}); });
if (dialog_id == 0) { if (dialog_id == 0) {

2
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarActivity.java
View File

@ -326,7 +326,7 @@ public class ActionBarActivity extends Activity {
}); });
velocityTracker.recycle(); velocityTracker.recycle();
velocityTracker = null; velocityTracker = null;
} else if (ev == null) { } else if (ev == null || ev != null && (ev.getAction() == MotionEvent.ACTION_CANCEL || ev.getAction() == MotionEvent.ACTION_UP)) {
maybeStartTracking = false; maybeStartTracking = false;
startedTracking = false; startedTracking = false;
if (velocityTracker != null) { if (velocityTracker != null) {