Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apk
Commits
cdb39ac3
Commit
cdb39ac3
authored
Jun 04, 2014
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ask confirmation when starting secret chat and sharing contact info
Thanks to
https://github.com/DrKLO/Telegram/pull/401
parent
63ba8a5a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
10 deletions
+31
-10
build.gradle
TMessagesProj/build.gradle
+1
-1
ChatActivity.java
...sagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+17
-6
UserProfileActivity.java
...oj/src/main/java/org/telegram/ui/UserProfileActivity.java
+12
-2
ActionBarActivity.java
...va/org/telegram/ui/Views/ActionBar/ActionBarActivity.java
+1
-1
No files found.
TMessagesProj/build.gradle
View file @
cdb39ac3
...
...
@@ -82,7 +82,7 @@ android {
defaultConfig
{
minSdkVersion
8
targetSdkVersion
19
versionCode
23
7
versionCode
23
8
versionName
"1.4.15"
}
}
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @
cdb39ac3
...
...
@@ -2566,15 +2566,26 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
topPanel
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
MessagesController
.
getInstance
().
hidenAddToContacts
.
put
(
currentUser
.
id
,
currentUser
);
topPanel
.
setVisibility
(
View
.
GONE
);
MessagesController
.
getInstance
().
sendMessage
(
UserConfig
.
currentUser
,
dialog_id
);
chatListView
.
post
(
new
Runnable
()
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
getParentActivity
()
);
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
run
()
{
chatListView
.
setSelectionFromTop
(
messages
.
size
()
-
1
,
-
100000
-
chatListView
.
getPaddingTop
());
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
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
);
}
});
}
...
...
TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java
View file @
cdb39ac3
...
...
@@ -211,8 +211,18 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
startSecretButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
view
)
{
creatingChat
=
true
;
MessagesController
.
getInstance
().
startSecretChat
(
getParentActivity
(),
MessagesController
.
getInstance
().
users
.
get
(
user_id
));
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
getParentActivity
());
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
)
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarActivity.java
View file @
cdb39ac3
...
...
@@ -326,7 +326,7 @@ public class ActionBarActivity extends Activity {
});
velocityTracker
.
recycle
();
velocityTracker
=
null
;
}
else
if
(
ev
==
null
)
{
}
else
if
(
ev
==
null
||
ev
!=
null
&&
(
ev
.
getAction
()
==
MotionEvent
.
ACTION_CANCEL
||
ev
.
getAction
()
==
MotionEvent
.
ACTION_UP
)
)
{
maybeStartTracking
=
false
;
startedTracking
=
false
;
if
(
velocityTracker
!=
null
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment