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
2fcef37b
Commit
2fcef37b
authored
Jan 24, 2015
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fixes
parent
213c2269
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
build.gradle
TMessagesProj/build.gradle
+2
-2
SecretChatHelper.java
.../src/main/java/org/telegram/android/SecretChatHelper.java
+1
-1
StickerCell.java
...Proj/src/main/java/org/telegram/ui/Cells/StickerCell.java
+3
-0
LaunchActivity.java
...gesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+5
-1
No files found.
TMessagesProj/build.gradle
View file @
2fcef37b
...
@@ -82,7 +82,7 @@ android {
...
@@ -82,7 +82,7 @@ android {
defaultConfig
{
defaultConfig
{
minSdkVersion
8
minSdkVersion
8
targetSdkVersion
21
targetSdkVersion
21
versionCode
41
5
versionCode
41
6
versionName
"2.3.
2
"
versionName
"2.3.
3
"
}
}
}
}
TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java
View file @
2fcef37b
...
@@ -656,7 +656,7 @@ public class SecretChatHelper {
...
@@ -656,7 +656,7 @@ public class SecretChatHelper {
TLObject
toEncryptObject
=
null
;
TLObject
toEncryptObject
=
null
;
if
(
AndroidUtilities
.
getPeerLayerVersion
(
chat
.
layer
)
>=
17
)
{
if
(
AndroidUtilities
.
getPeerLayerVersion
(
chat
.
layer
)
>=
17
)
{
TLRPC
.
TL_decryptedMessageLayer
layer
=
new
TLRPC
.
TL_decryptedMessageLayer
();
TLRPC
.
TL_decryptedMessageLayer
layer
=
new
TLRPC
.
TL_decryptedMessageLayer
();
layer
.
layer
=
Math
.
min
(
AndroidUtilities
.
getMyLayerVersion
(
chat
.
layer
)
,
AndroidUtilities
.
getPeerLayerVersion
(
chat
.
layer
));
layer
.
layer
=
Math
.
min
(
17
,
AndroidUtilities
.
getPeerLayerVersion
(
chat
.
layer
));
layer
.
message
=
req
;
layer
.
message
=
req
;
layer
.
random_bytes
=
new
byte
[
Math
.
max
(
1
,
(
int
)
Math
.
ceil
(
Utilities
.
random
.
nextDouble
()
*
16
))];
layer
.
random_bytes
=
new
byte
[
Math
.
max
(
1
,
(
int
)
Math
.
ceil
(
Utilities
.
random
.
nextDouble
()
*
16
))];
Utilities
.
random
.
nextBytes
(
layer
.
random_bytes
);
Utilities
.
random
.
nextBytes
(
layer
.
random_bytes
);
...
...
TMessagesProj/src/main/java/org/telegram/ui/Cells/StickerCell.java
View file @
2fcef37b
...
@@ -70,5 +70,8 @@ public class StickerCell extends FrameLayoutFixed {
...
@@ -70,5 +70,8 @@ public class StickerCell extends FrameLayoutFixed {
setBackgroundResource
(
R
.
drawable
.
stickers_back_all
);
setBackgroundResource
(
R
.
drawable
.
stickers_back_all
);
setPadding
(
AndroidUtilities
.
dp
(
3
),
0
,
AndroidUtilities
.
dp
(
3
),
0
);
setPadding
(
AndroidUtilities
.
dp
(
3
),
0
,
AndroidUtilities
.
dp
(
3
),
0
);
}
}
if
(
getBackground
()
!=
null
)
{
getBackground
().
setAlpha
(
230
);
}
}
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @
2fcef37b
...
@@ -1293,6 +1293,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
...
@@ -1293,6 +1293,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
}
}
if
(
fragment
instanceof
ChatActivity
)
{
if
(
fragment
instanceof
ChatActivity
)
{
if
(!
tabletFullSize
&&
layout
==
rightActionBarLayout
||
tabletFullSize
&&
layout
==
actionBarLayout
)
{
if
(!
tabletFullSize
&&
layout
==
rightActionBarLayout
||
tabletFullSize
&&
layout
==
actionBarLayout
)
{
boolean
result
=
!(
tabletFullSize
&&
layout
==
actionBarLayout
&&
actionBarLayout
.
fragmentsStack
.
size
()
==
1
);
if
(!
layersActionBarLayout
.
fragmentsStack
.
isEmpty
())
{
if
(!
layersActionBarLayout
.
fragmentsStack
.
isEmpty
())
{
for
(
int
a
=
0
;
a
<
layersActionBarLayout
.
fragmentsStack
.
size
()
-
1
;
a
++)
{
for
(
int
a
=
0
;
a
<
layersActionBarLayout
.
fragmentsStack
.
size
()
-
1
;
a
++)
{
layersActionBarLayout
.
removeFragmentFromStack
(
layersActionBarLayout
.
fragmentsStack
.
get
(
0
));
layersActionBarLayout
.
removeFragmentFromStack
(
layersActionBarLayout
.
fragmentsStack
.
get
(
0
));
...
@@ -1300,7 +1301,10 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
...
@@ -1300,7 +1301,10 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
}
}
layersActionBarLayout
.
closeLastFragment
(!
forceWithoutAnimation
);
layersActionBarLayout
.
closeLastFragment
(!
forceWithoutAnimation
);
}
}
return
true
;
if
(!
result
)
{
actionBarLayout
.
presentFragment
(
fragment
,
false
,
forceWithoutAnimation
,
false
);
}
return
result
;
}
else
if
(!
tabletFullSize
&&
layout
!=
rightActionBarLayout
)
{
}
else
if
(!
tabletFullSize
&&
layout
!=
rightActionBarLayout
)
{
rightActionBarLayout
.
setVisibility
(
View
.
VISIBLE
);
rightActionBarLayout
.
setVisibility
(
View
.
VISIBLE
);
backgroundTablet
.
setVisibility
(
View
.
GONE
);
backgroundTablet
.
setVisibility
(
View
.
GONE
);
...
...
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