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
91f20737
Commit
91f20737
authored
Jun 23, 2014
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restored wrongly deleted code
parent
d728d9c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
2 deletions
+27
-2
build.gradle
TMessagesProj/build.gradle
+1
-1
ChatProfileActivity.java
...oj/src/main/java/org/telegram/ui/ChatProfileActivity.java
+6
-0
SettingsActivity.java
...sProj/src/main/java/org/telegram/ui/SettingsActivity.java
+20
-1
No files found.
TMessagesProj/build.gradle
View file @
91f20737
...
@@ -81,7 +81,7 @@ android {
...
@@ -81,7 +81,7 @@ android {
defaultConfig
{
defaultConfig
{
minSdkVersion
8
minSdkVersion
8
targetSdkVersion
19
targetSdkVersion
19
versionCode
26
7
versionCode
26
8
versionName
"1.5.7"
versionName
"1.5.7"
}
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @
91f20737
...
@@ -11,6 +11,7 @@ package org.telegram.ui;
...
@@ -11,6 +11,7 @@ package org.telegram.ui;
import
android.app.AlertDialog
;
import
android.app.AlertDialog
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.graphics.Typeface
;
import
android.graphics.Typeface
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.Html
;
import
android.text.Html
;
...
@@ -260,6 +261,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
...
@@ -260,6 +261,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
MessagesController
.
getInstance
().
addUserToChat
(
chat_id
,
user
,
info
);
MessagesController
.
getInstance
().
addUserToChat
(
chat_id
,
user
,
info
);
}
}
@Override
public
void
onActivityResultFragment
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
avatarUpdater
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
}
@Override
@Override
public
void
saveSelfArgs
(
Bundle
args
)
{
public
void
saveSelfArgs
(
Bundle
args
)
{
if
(
avatarUpdater
!=
null
&&
avatarUpdater
.
currentPicturePath
!=
null
)
{
if
(
avatarUpdater
!=
null
&&
avatarUpdater
.
currentPicturePath
!=
null
)
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @
91f20737
...
@@ -245,7 +245,26 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
...
@@ -245,7 +245,26 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
}
}
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
getParentActivity
());
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
getParentActivity
());
builder
.
setTitle
(
LocaleController
.
getString
(
"TextSize"
,
R
.
string
.
TextSize
));
builder
.
setTitle
(
LocaleController
.
getString
(
"TextSize"
,
R
.
string
.
TextSize
));
builder
.
setItems
(
new
CharSequence
[]{
String
.
format
(
"%d"
,
12
),
String
.
format
(
"%d"
,
13
),
String
.
format
(
"%d"
,
14
),
String
.
format
(
"%d"
,
15
),
String
.
format
(
"%d"
,
16
),
String
.
format
(
"%d"
,
17
),
String
.
format
(
"%d"
,
18
),
String
.
format
(
"%d"
,
19
),
String
.
format
(
"%d"
,
20
),
String
.
format
(
"%d"
,
21
),
String
.
format
(
"%d"
,
22
),
String
.
format
(
"%d"
,
23
),
String
.
format
(
"%d"
,
24
)},
new
DialogInterface
.
OnClickListener
()
{
builder
.
setItems
(
new
CharSequence
[]
{
String
.
format
(
"%d"
,
12
),
String
.
format
(
"%d"
,
13
),
String
.
format
(
"%d"
,
14
),
String
.
format
(
"%d"
,
15
),
String
.
format
(
"%d"
,
16
),
String
.
format
(
"%d"
,
17
),
String
.
format
(
"%d"
,
18
),
String
.
format
(
"%d"
,
19
),
String
.
format
(
"%d"
,
20
),
String
.
format
(
"%d"
,
21
),
String
.
format
(
"%d"
,
22
),
String
.
format
(
"%d"
,
23
),
String
.
format
(
"%d"
,
24
),
String
.
format
(
"%d"
,
25
),
String
.
format
(
"%d"
,
26
),
String
.
format
(
"%d"
,
27
),
String
.
format
(
"%d"
,
28
),
String
.
format
(
"%d"
,
29
),
String
.
format
(
"%d"
,
30
)},
new
DialogInterface
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
DialogInterface
dialog
,
int
which
)
{
public
void
onClick
(
DialogInterface
dialog
,
int
which
)
{
SharedPreferences
preferences
=
ApplicationLoader
.
applicationContext
.
getSharedPreferences
(
"mainconfig"
,
Activity
.
MODE_PRIVATE
);
SharedPreferences
preferences
=
ApplicationLoader
.
applicationContext
.
getSharedPreferences
(
"mainconfig"
,
Activity
.
MODE_PRIVATE
);
...
...
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