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
85bc7046
Commit
85bc7046
authored
Feb 26, 2015
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Crash fixes
parent
f63c8b20
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
45 additions
and
20 deletions
+45
-20
build.gradle
TMessagesProj/build.gradle
+2
-2
SecretChatHelper.java
.../src/main/java/org/telegram/android/SecretChatHelper.java
+5
-1
ActionBarPopupWindow.java
.../java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
+5
-1
DialogCell.java
...sProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
+11
-6
ChatActivity.java
...sagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+5
-1
ChatActivityEnterView.java
...ava/org/telegram/ui/Components/ChatActivityEnterView.java
+5
-1
PhotoFilterView.java
...main/java/org/telegram/ui/Components/PhotoFilterView.java
+1
-1
PasscodeActivity.java
...sProj/src/main/java/org/telegram/ui/PasscodeActivity.java
+1
-1
SettingsActivity.java
...sProj/src/main/java/org/telegram/ui/SettingsActivity.java
+7
-5
WallpapersActivity.java
...roj/src/main/java/org/telegram/ui/WallpapersActivity.java
+3
-1
No files found.
TMessagesProj/build.gradle
View file @
85bc7046
...
...
@@ -82,7 +82,7 @@ android {
defaultConfig
{
minSdkVersion
8
targetSdkVersion
21
versionCode
45
3
versionName
"2.5.
0
"
versionCode
45
4
versionName
"2.5.
1
"
}
}
TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java
View file @
85bc7046
...
...
@@ -1777,6 +1777,10 @@ public class SecretChatHelper {
}
}
});
try
{
progressDialog
.
show
();
}
catch
(
Exception
e
)
{
//don't promt
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
View file @
85bc7046
...
...
@@ -200,7 +200,11 @@ public class ActionBarPopupWindow extends PopupWindow {
@Override
public
void
dismiss
()
{
setFocusable
(
false
);
try
{
super
.
dismiss
();
}
catch
(
Exception
e
)
{
//don't promt
}
unregisterListener
();
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View file @
85bc7046
...
...
@@ -603,16 +603,21 @@ public class DialogCell extends BaseCell {
public
void
checkCurrentDialogIndex
()
{
TLRPC
.
TL_dialog
dialog
=
null
;
if
(
isServerOnly
)
{
if
(
index
<
MessagesController
.
getInstance
().
dialogsServerOnly
.
size
())
{
dialog
=
MessagesController
.
getInstance
().
dialogsServerOnly
.
get
(
index
);
}
}
else
{
if
(
index
<
MessagesController
.
getInstance
().
dialogs
.
size
())
{
dialog
=
MessagesController
.
getInstance
().
dialogs
.
get
(
index
);
}
boolean
update
=
true
;
}
if
(
dialog
!=
null
)
{
if
(
currentDialogId
!=
dialog
.
id
||
message
!=
null
&&
message
.
messageOwner
.
id
!=
dialog
.
top_message
||
unreadCount
!=
dialog
.
unread_count
)
{
currentDialogId
=
dialog
.
id
;
update
(
0
);
}
}
}
public
void
update
(
int
mask
)
{
if
(
isDialogCell
)
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @
85bc7046
...
...
@@ -1307,7 +1307,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
progressView
.
setLayoutParams
(
layoutParams3
);
ProgressBar
progressBar
=
new
ProgressBar
(
getParentActivity
());
try
{
progressBar
.
setIndeterminateDrawable
(
getParentActivity
().
getResources
().
getDrawable
(
R
.
drawable
.
loading_animation
));
}
catch
(
Exception
e
)
{
//don't promt
}
progressBar
.
setIndeterminate
(
true
);
AndroidUtilities
.
setProgressBarAnimationDuration
(
progressBar
,
1500
);
progressView
.
addView
(
progressBar
);
...
...
TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
View file @
85bc7046
...
...
@@ -854,7 +854,11 @@ public class ChatActivityEnterView extends LinearLayout implements NotificationC
emojiButton
.
setImageResource
(
R
.
drawable
.
ic_msg_panel_smiles
);
}
if
(
emojiPopup
!=
null
)
{
try
{
emojiPopup
.
dismiss
();
}
catch
(
Exception
e
)
{
//don't promt
}
}
if
(
sizeNotifierRelativeLayout
!=
null
)
{
sizeNotifierRelativeLayout
.
post
(
new
Runnable
()
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoFilterView.java
View file @
85bc7046
...
...
@@ -1446,7 +1446,7 @@ public class PhotoFilterView extends FrameLayout {
}
public
Bitmap
getBitmap
()
{
return
eglThread
.
getTexture
()
;
return
eglThread
!=
null
?
eglThread
.
getTexture
()
:
null
;
}
private
void
fixLayout
(
int
viewWidth
,
int
viewHeight
)
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
View file @
85bc7046
...
...
@@ -488,7 +488,7 @@ public class PasscodeActivity extends BaseFragment implements NotificationCenter
filterArray
[
0
]
=
new
InputFilter
.
LengthFilter
(
4
);
passwordEditText
.
setFilters
(
filterArray
);
passwordEditText
.
setInputType
(
InputType
.
TYPE_CLASS_PHONE
);
passwordEditText
.
setKeyListener
(
DigitsKeyListener
.
getInstance
(
"123456789"
));
passwordEditText
.
setKeyListener
(
DigitsKeyListener
.
getInstance
(
"123456789
0
"
));
}
else
if
(
type
==
1
&&
currentPasswordType
==
1
||
type
==
2
&&
UserConfig
.
passcodeType
==
1
)
{
passwordEditText
.
setFilters
(
new
InputFilter
[
0
]);
passwordEditText
.
setKeyListener
(
null
);
...
...
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @
85bc7046
...
...
@@ -972,6 +972,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
}
AvatarDrawable
avatarDrawable
=
new
AvatarDrawable
(
user
,
true
);
avatarDrawable
.
setColor
(
0xff5c98cd
);
if
(
avatarImage
!=
null
)
{
avatarImage
.
setImage
(
photo
,
"50_50"
,
avatarDrawable
);
avatarImage
.
imageReceiver
.
setVisible
(!
PhotoViewer
.
getInstance
().
isShowingImage
(
photoBig
),
false
);
...
...
@@ -980,6 +981,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
avatarImage
.
imageReceiver
.
setVisible
(!
PhotoViewer
.
getInstance
().
isShowingImage
(
photoBig
),
false
);
}
}
private
void
sendLogs
()
{
try
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java
View file @
85bc7046
...
...
@@ -419,7 +419,9 @@ public class WallpapersActivity extends BaseFragment implements NotificationCent
wallPapers
.
add
((
TLRPC
.
WallPaper
)
obj
);
wallpappersByIds
.
put
(((
TLRPC
.
WallPaper
)
obj
).
id
,
(
TLRPC
.
WallPaper
)
obj
);
}
if
(
listAdapter
!=
null
)
{
listAdapter
.
notifyDataSetChanged
();
}
if
(
backgroundImage
!=
null
)
{
processSelectedBackground
();
}
...
...
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