diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 20dcbe4c3..a858c6659 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -81,7 +81,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 19 - versionCode 267 + versionCode 268 versionName "1.5.7" } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java index 21dff9963..5647e0d07 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java @@ -11,6 +11,7 @@ package org.telegram.ui; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; import android.text.Html; @@ -260,6 +261,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen MessagesController.getInstance().addUserToChat(chat_id, user, info); } + @Override + public void onActivityResultFragment(int requestCode, int resultCode, Intent data) { + avatarUpdater.onActivityResult(requestCode, resultCode, data); + } + @Override public void saveSelfArgs(Bundle args) { if (avatarUpdater != null && avatarUpdater.currentPicturePath != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 6568bad52..6a86bf074 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -245,7 +245,26 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); 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 public void onClick(DialogInterface dialog, int which) { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);