stonewareslord/plus-messenger
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
DrKLO 2015-01-24 00:59:15 +03:00
parent 213c2269c0
commit 2fcef37b9e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TMessagesProj/build.gradle
View File

@ -82,7 +82,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 21 targetSdkVersion 21
versionCode 415 versionCode 416
versionName "2.3.2" versionName "2.3.3"
} }
} }

2
TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java
View File

@ -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);

3
TMessagesProj/src/main/java/org/telegram/ui/Cells/StickerCell.java
View File

@ -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);
}
} }
} }

6
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View File

@ -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
} }
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);