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
f83a1b56
Commit
f83a1b56
authored
Sep 28, 2014
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fixes
https://github.com/DrKLO/Telegram/pull/581
parent
dff98476
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
93 additions
and
66 deletions
+93
-66
build.gradle
TMessagesProj/build.gradle
+1
-1
ChatActivity.java
...sagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+1
-1
ChatProfileActivity.java
...oj/src/main/java/org/telegram/ui/ChatProfileActivity.java
+1
-1
LaunchActivity.java
...gesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+7
-6
VideoEditorActivity.java
...oj/src/main/java/org/telegram/ui/VideoEditorActivity.java
+82
-56
AvatarUpdater.java
...oj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java
+1
-1
No files found.
TMessagesProj/build.gradle
View file @
f83a1b56
...
...
@@ -80,7 +80,7 @@ android {
defaultConfig
{
minSdkVersion
8
targetSdkVersion
19
versionCode
33
1
versionCode
33
2
versionName
"1.9.0"
}
}
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @
f83a1b56
...
...
@@ -1364,7 +1364,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
args
.
putString
(
"videoPath"
,
videoPath
);
VideoEditorActivity
fragment
=
new
VideoEditorActivity
(
args
);
fragment
.
setDelegate
(
this
);
presentFragment
(
fragment
);
presentFragment
(
fragment
,
false
,
true
);
}
else
{
processSendingVideo
(
videoPath
,
0
,
0
,
0
,
0
,
null
);
}
...
...
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @
f83a1b56
...
...
@@ -629,7 +629,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
count
=
info
.
participants
.
size
();
}
if
(
count
!=
0
&&
onlineCount
>
0
)
{
if
(
count
!=
0
&&
onlineCount
>
1
)
{
onlineText
.
setText
(
Html
.
fromHtml
(
String
.
format
(
"%s, <font color='#357aa8'>%d %s</font>"
,
LocaleController
.
formatPluralString
(
"Members"
,
count
),
onlineCount
,
LocaleController
.
getString
(
"Online"
,
R
.
string
.
Online
))));
}
else
{
onlineText
.
setText
(
LocaleController
.
formatPluralString
(
"Members"
,
count
));
...
...
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @
f83a1b56
...
...
@@ -760,15 +760,16 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
public
void
fixLayout
()
{
if
(
AndroidUtilities
.
isTablet
())
{
final
ViewTreeObserver
obs
=
actionBarLayout
.
getViewTreeObserver
();
obs
.
addOnGlobalLayoutListener
(
new
ViewTreeObserver
.
OnGlobalLayoutListener
()
{
actionBarLayout
.
getViewTreeObserver
().
addOnGlobalLayoutListener
(
new
ViewTreeObserver
.
OnGlobalLayoutListener
()
{
@Override
public
void
onGlobalLayout
()
{
needLayout
();
if
(
Build
.
VERSION
.
SDK_INT
<
16
)
{
obs
.
removeGlobalOnLayoutListener
(
this
);
}
else
{
obs
.
removeOnGlobalLayoutListener
(
this
);
if
(
actionBarLayout
!=
null
)
{
if
(
Build
.
VERSION
.
SDK_INT
<
16
)
{
actionBarLayout
.
getViewTreeObserver
().
removeGlobalOnLayoutListener
(
this
);
}
else
{
actionBarLayout
.
getViewTreeObserver
().
removeOnGlobalLayoutListener
(
this
);
}
}
}
});
...
...
TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java
View file @
f83a1b56
This diff is collapsed.
Click to expand it.
TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java
View file @
f83a1b56
...
...
@@ -69,7 +69,7 @@ public class AvatarUpdater implements NotificationCenter.NotificationCenterDeleg
public
void
openGallery
()
{
try
{
Intent
photoPickerIntent
=
new
Intent
(
Intent
.
ACTION_
PICK
);
Intent
photoPickerIntent
=
new
Intent
(
Intent
.
ACTION_
GET_CONTENT
);
photoPickerIntent
.
setType
(
"image/*"
);
parentFragment
.
getParentActivity
().
startActivityForResult
(
photoPickerIntent
,
14
);
}
catch
(
Exception
e
)
{
...
...
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