From 6e63dee546704a721f3ee106b53c25b48709a9e3 Mon Sep 17 00:00:00 2001
From: DrKLO <drklo.2kb@gmail.com>
Date: Tue, 4 Mar 2014 10:23:08 +0400
Subject: [PATCH] Fixed incorrect messages drawing

---
 TMessagesProj/src/main/AndroidManifest.xml          |  2 +-
 .../org/telegram/messenger/ContactsController.java  |  3 +--
 .../org/telegram/messenger/MessagesStorage.java     |  2 +-
 .../java/org/telegram/ui/Cells/ChatMessageCell.java |  4 ++--
 TMessagesProj/src/main/res/layout/intro_layout.xml  | 13 +++++++++----
 TMessagesProj/src/main/res/values-de/strings.xml    |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
index 6f8b3a91c..45b05bce3 100644
--- a/TMessagesProj/src/main/AndroidManifest.xml
+++ b/TMessagesProj/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.telegram.messenger"
-    android:versionCode="177"
+    android:versionCode="179"
     android:versionName="1.3.26">
 
     <supports-screens android:anyDensity="true"
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
index 3dec709ea..9e30a523a 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
@@ -369,7 +369,7 @@ public class ContactsController {
             @Override
             public void run() {
 
-                boolean disableDeletion = false;
+                boolean disableDeletion = true; //disable contacts deletion, because phone numbers can't be compared due to different numbers format
                 if (schedule) {
                     try {
                         AccountManager am = AccountManager.get(ApplicationLoader.applicationContext);
@@ -385,7 +385,6 @@ public class ContactsController {
                         }
                     } catch (Exception e) {
                         FileLog.e("tmessages", e);
-                        disableDeletion = true;
                     }
                 }
 
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
index 13ffbd2aa..d9a06655a 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
@@ -69,7 +69,7 @@ public class MessagesStorage {
         }
         try {
             database = new SQLiteDatabase(cacheFile.getPath());
-            database.execute("PRAGMA secure_delete = ON");
+            database.executeFast("PRAGMA secure_delete = ON").stepThis().dispose();
             if (createTable) {
                 database.executeFast("CREATE TABLE users(uid INTEGER PRIMARY KEY, name TEXT, status INTEGER, data BLOB)").stepThis().dispose();
                 database.executeFast("CREATE TABLE messages(mid INTEGER PRIMARY KEY, uid INTEGER, read_state INTEGER, send_state INTEGER, date INTEGER, data BLOB, out INTEGER, ttl INTEGER)").stepThis().dispose();
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
index 7e9e34901..1c69adf8d 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
@@ -187,11 +187,11 @@ public class ChatMessageCell extends ChatBaseCell {
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        if (currentMessageObject == null || currentMessageObject.textLayoutBlocks == null || currentMessageObject.textLayoutBlocks.isEmpty()) {
+        if (currentMessageObject == null || currentMessageObject.textLayoutBlocks == null || currentMessageObject.textLayoutBlocks.isEmpty() || firstVisibleBlockNum < 0) {
             return;
         }
 
-        for (int a = Math.max(0, (visibleY - textY) / currentMessageObject.blockHeight); a < currentMessageObject.textLayoutBlocks.size(); a++) {
+        for (int a = firstVisibleBlockNum; a <= lastVisibleBlockNum; a++) {
             MessageObject.TextLayoutBlock block = currentMessageObject.textLayoutBlocks.get(a);
             float y = textY + block.textYOffset;
             if (intersect(y, y + currentMessageObject.blockHeight, visibleY, visibleY + visibleHeight)) {
diff --git a/TMessagesProj/src/main/res/layout/intro_layout.xml b/TMessagesProj/src/main/res/layout/intro_layout.xml
index 7efe863b3..6140d63f8 100644
--- a/TMessagesProj/src/main/res/layout/intro_layout.xml
+++ b/TMessagesProj/src/main/res/layout/intro_layout.xml
@@ -35,8 +35,8 @@
             android:layout_height="fill_parent"
             android:id="@+id/intro_view_pager"/>
 
-        <TextView android:layout_width="192dp"
-            android:layout_height="44dp"
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginTop="336dp"
             android:background="@drawable/regbtn_states"
             android:text="@string/StartMessaging"
@@ -44,8 +44,13 @@
             android:textSize="18dp"
             android:textColor="#ffffff"
             android:gravity="center"
-            android:id="@+id/start_messaging_button"
-            android:paddingBottom="2dp"/>
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:id="@+id/start_messaging_button"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml
index a152988c4..1f82bfe3b 100644
--- a/TMessagesProj/src/main/res/values-de/strings.xml
+++ b/TMessagesProj/src/main/res/values-de/strings.xml
@@ -106,7 +106,7 @@
     <string name="YouLeft">Du hast die Gruppe verlassen</string>
     <string name="DeleteThisGroup">Diese Gruppe löschen</string>
     <string name="SlideToCancel">WISCHEN UM ABZUBRECHEN</string>
-    
+
     <!--notification-->
     <string name="EncryptedChatRequested">Geheimen Chat angefordert</string>
     <string name="EncryptedChatAccepted">Geheimen Chat angenommen</string>