update to 1.3.7

TMessagesProj/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.telegram.messenger"
-    android:versionCode="129"
-    android:versionName="1.3.6">
+    android:versionCode="131"
+    android:versionName="1.3.7">
     
     <supports-screens android:anyDensity="true"
     android:smallScreens="true"

TMessagesProj/src/main/java/org/telegram/TL/TLRPC.java

@@ -8961,7 +8961,7 @@ public class TLRPC {
         }
     }
 
-    public static class TL_encryptedChat_old extends EncryptedChat {
+    public static class TL_encryptedChat_old extends TL_encryptedChat {
         public static int constructor = 0x6601d14f;
 
 

TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java

@@ -659,6 +659,18 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
                     invoke.app_version = "App version unknown";
                     invoke.system_version = "SDK " + Build.VERSION.SDK_INT;
                 }
+                if (invoke.lang_code == null || invoke.lang_code.length() == 0) {
+                    invoke.lang_code = "en";
+                }
+                if (invoke.device_model == null || invoke.device_model.length() == 0) {
+                    invoke.device_model = "Android unknown";
+                }
+                if (invoke.app_version == null || invoke.app_version.length() == 0) {
+                    invoke.app_version = "App version unknown";
+                }
+                if (invoke.system_version == null || invoke.system_version.length() == 0) {
+                    invoke.system_version = "SDK Unknown";
+                }
                 object = invoke;
             }
             TLRPC.invokeWithLayer11 invoke = new TLRPC.invokeWithLayer11();

TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java

@@ -287,7 +287,7 @@ public class Emoji {
                     0x00000000D83DDD34L, 0x00000000D83DDD35L, 0x00000000D83DDD3BL, 0x00000000D83DDD36L, 0x00000000D83DDD37L, 0x00000000D83DDD38L, 0x00000000D83DDD39L}};
 	
 	static {
-		imgSize = Math.min(scale(30), ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density < 1.5f ? 28 : 56);
+		imgSize = Math.min(scale(30), Utilities.density < 1.5f ? 28 : 56);
 		drawImgSize = scale(20);
 		bigImgSize = scale(30);
 		if(Math.abs(imgSize - bigImgSize) < 5) {
@@ -317,7 +317,7 @@ public class Emoji {
 			opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
 
 			opts.inDither = false;
-			if (ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density < 1.5f) {
+			if (Utilities.density < 1.5f) {
 				opts.inSampleSize = 2;
             }
 
@@ -559,8 +559,8 @@ public class Emoji {
 
             int sz = super.getSize(paint, text, start, end, fm);
 
-            int offset = (int)(8 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density);
-            int w = (int)(20 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density / 2);
+            int offset = Utilities.dp(8);
+            int w = Utilities.dp(10);
             fm.top = -w - offset;
             fm.bottom = w - offset;
             fm.ascent = -w - offset;
@@ -586,7 +586,7 @@ public class Emoji {
 
             int sz = super.getSize(paint, text, start, end, fm);
 
-            int offset = (int)(6 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density);
+            int offset = Utilities.dp(6);
             int w = (fm.bottom - fm.top) / 2;
             fm.top = -w - offset;
             fm.bottom = w - offset;

TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java

@@ -205,8 +205,8 @@ public class FileLoadOperation {
                             float h_filter;
                             if (filter != null) {
                                 String args[] = filter.split("_");
-                                w_filter = Float.parseFloat(args[0]) * FileLoader.Instance.density;
-                                h_filter = Float.parseFloat(args[1]) * FileLoader.Instance.density;
+                                w_filter = Float.parseFloat(args[0]) * Utilities.density;
+                                h_filter = Float.parseFloat(args[1]) * Utilities.density;
 
                                 opts.inJustDecodeBounds = true;
                                 BitmapFactory.decodeFile(cacheFileFinal.getAbsolutePath(), opts);
@@ -399,8 +399,8 @@ public class FileLoadOperation {
                     float h_filter;
                     if (filter != null) {
                         String args[] = filter.split("_");
-                        w_filter = Float.parseFloat(args[0]) * FileLoader.Instance.density;
-                        h_filter = Float.parseFloat(args[1]) * FileLoader.Instance.density;
+                        w_filter = Float.parseFloat(args[0]) * Utilities.density;
+                        h_filter = Float.parseFloat(args[1]) * Utilities.density;
 
                         opts.inJustDecodeBounds = true;
                         BitmapFactory.decodeFile(cacheFileFinal.getAbsolutePath(), opts);

TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java

@@ -53,7 +53,6 @@ public class FileLoader {
     public static long lastCacheOutTime = 0;
     public ConcurrentHashMap<String, Float> fileProgresses = new ConcurrentHashMap<String, Float>();
     private long lastProgressUpdateTime = 0;
-    public float density = 1;
     private HashMap<String, Integer> BitmapUseCounts = new HashMap<String, Integer>();
 
     int lastImageNum;
@@ -254,7 +253,6 @@ public class FileLoader {
     public FileLoader() {
         int cacheSize = Math.min(15, ((ActivityManager) ApplicationLoader.applicationContext.getSystemService(Context.ACTIVITY_SERVICE)).getMemoryClass() / 7) * 1024 * 1024;
 
-        density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
         if (Build.VERSION.SDK_INT < 11) {
             runtimeHack = new VMRuntimeHack();
             cacheSize = 1024 * 1024 * 3;

TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java

@@ -3364,6 +3364,20 @@ public class MessagesController implements NotificationCenter.NotificationCenter
             req.system_version = "SDK " + Build.VERSION.SDK_INT;
             req.app_version = "App version unknown";
         }
+
+        if (req.lang_code == null || req.lang_code.length() == 0) {
+            req.lang_code = "en";
+        }
+        if (req.device_model == null || req.device_model.length() == 0) {
+            req.device_model = "Android unknown";
+        }
+        if (req.app_version == null || req.app_version.length() == 0) {
+            req.app_version = "App version unknown";
+        }
+        if (req.system_version == null || req.system_version.length() == 0) {
+            req.system_version = "SDK Unknown";
+        }
+
         if (req.app_version != null) {
             ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
                 @Override

TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java

@@ -48,6 +48,7 @@ public class MessagesStorage {
 
     public void openDatabase() {
         cacheFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache4.db");
+
         boolean createTable = false;
         //cacheFile.delete();
         if (!cacheFile.exists()) {

TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java

@@ -56,6 +56,7 @@ import javax.crypto.Cipher;
 public class Utilities {
     public static Handler applicationHandler;
     public static int statusBarHeight = 0;
+    public static float density = 1;
     private final static Integer lock = 1;
 
     public static ArrayList<String> goodPrimes = new ArrayList<String>();
@@ -74,6 +75,7 @@ public class Utilities {
     public native static byte[] aesIgeEncryption(byte[] _what, byte[] _key, byte[] _iv, boolean encrypt, boolean changeIv);
 
     static {
+        density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
         SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("primes", Context.MODE_PRIVATE);
         String primes = preferences.getString("primes", null);
         if (primes == null) {
@@ -121,6 +123,10 @@ public class Utilities {
         return new String(hexChars);
     }
 
+    public static int dp(int value) {
+        return (int)(density * value);
+    }
+
     public static boolean isGoodPrime(byte[] prime, int g) {
         if (!(g >= 2 && g <= 7)) {
             return false;

TMessagesProj/src/main/java/org/telegram/ui/ApplicationActivity.java

@@ -393,21 +393,20 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
                 public void onGlobalLayout() {
                     WindowManager manager = (WindowManager) getSystemService(WINDOW_SERVICE);
                     int rotation = manager.getDefaultDisplay().getRotation();
-                    float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
 
                     int height;
                     int currentActionBarHeight = getSupportActionBar().getHeight();
-                    if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) {
+                    if (currentActionBarHeight != Utilities.dp(48) && currentActionBarHeight != Utilities.dp(40)) {
                         height = currentActionBarHeight;
                     } else {
-                        height = (int) (48.0f * density);
+                        height = Utilities.dp(48);
                         if (rotation == Surface.ROTATION_270 || rotation == Surface.ROTATION_90) {
-                            height = (int) (40.0f * density);
+                            height = Utilities.dp(40);
                         }
                     }
 
                     if (notificationView != null) {
-                        notificationView.applyOrientationPaddings(rotation == Surface.ROTATION_270 || rotation == Surface.ROTATION_90, density, height);
+                        notificationView.applyOrientationPaddings(rotation == Surface.ROTATION_270 || rotation == Surface.ROTATION_90, height);
                     }
 
                     if (Build.VERSION.SDK_INT < 16) {
@@ -579,17 +578,16 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
                     actionBar.setCustomView(statusView);
                 }
 
-                float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
                 try {
                     if (statusView.getLayoutParams() instanceof android.support.v7.app.ActionBar.LayoutParams) {
                         android.support.v7.app.ActionBar.LayoutParams statusParams = (android.support.v7.app.ActionBar.LayoutParams)statusView.getLayoutParams();
                         statusText.measure(View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.AT_MOST), 100);
-                        statusParams.width = (int)(statusText.getMeasuredWidth() + 54 * density);
+                        statusParams.width = (int)(statusText.getMeasuredWidth() + Utilities.dp(54));
                         statusView.setLayoutParams(statusParams);
                     } else if (statusView.getLayoutParams() instanceof android.app.ActionBar.LayoutParams) {
                         android.app.ActionBar.LayoutParams statusParams = (android.app.ActionBar.LayoutParams)statusView.getLayoutParams();
                         statusText.measure(View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.AT_MOST), 100);
-                        statusParams.width = (int)(statusText.getMeasuredWidth() + 54 * density);
+                        statusParams.width = (int)(statusText.getMeasuredWidth() + Utilities.dp(54));
                         statusView.setLayoutParams(statusParams);
                     }
                 } catch (Exception e) {

TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java

@@ -502,8 +502,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                 if (s.length() != 0) {
                     searchWas = true;
                     if (listView != null) {
-                        float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
-                        listView.setPadding((int)(density * 16), listView.getPaddingTop(), (int)(density * 16), listView.getPaddingBottom());
+                        listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
                         listView.setAdapter(searchListViewAdapter);
                         if(android.os.Build.VERSION.SDK_INT >= 11) {
                             listView.setFastScrollAlwaysVisible(false);
@@ -538,11 +537,10 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                 searchWas = false;
                 ViewGroup group = (ViewGroup) listView.getParent();
                 listView.setAdapter(listViewAdapter);
-                float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
                 if (!isRTL) {
-                    listView.setPadding((int) (density * 16), listView.getPaddingTop(), (int) (density * 30), listView.getPaddingBottom());
+                    listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom());
                 } else {
-                    listView.setPadding((int) (density * 30), listView.getPaddingTop(), (int) (density * 16), listView.getPaddingBottom());
+                    listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
                 }
                 if (android.os.Build.VERSION.SDK_INT >= 11) {
                     listView.setFastScrollAlwaysVisible(true);

TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java

@@ -228,8 +228,7 @@ public class CountrySelectActivity extends ActionBarActivity {
                 if (s.length() != 0) {
                     searchWas = true;
                     if (listView != null) {
-                        float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
-                        listView.setPadding((int)(density * 16), listView.getPaddingTop(), (int)(density * 16), listView.getPaddingBottom());
+                        listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
                         listView.setAdapter(searchListViewAdapter);
                         if(android.os.Build.VERSION.SDK_INT >= 11) {
                             listView.setFastScrollAlwaysVisible(false);
@@ -261,11 +260,10 @@ public class CountrySelectActivity extends ActionBarActivity {
                 searchWas = false;
                 ViewGroup group = (ViewGroup) listView.getParent();
                 listView.setAdapter(listViewAdapter);
-                float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
                 if (!isRTL) {
-                    listView.setPadding((int) (density * 16), listView.getPaddingTop(), (int) (density * 30), listView.getPaddingBottom());
+                    listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom());
                 } else {
-                    listView.setPadding((int) (density * 30), listView.getPaddingTop(), (int) (density * 16), listView.getPaddingBottom());
+                    listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
                 }
                 if (android.os.Build.VERSION.SDK_INT >= 11) {
                     listView.setFastScrollAlwaysVisible(true);

TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java

@@ -182,9 +182,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
             }
         }
 
-        float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
-
-        mViewPager.setPageMargin((int)(20 * density));
+        mViewPager.setPageMargin(Utilities.dp(20));
         mViewPager.setOffscreenPageLimit(1);
         mViewPager.setAdapter(localPagerAdapter);
 
@@ -357,8 +355,8 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
                                 if (title != null) {
                                     fakeTitleView.setText(String.format("%d %s %d", pos, getString(R.string.Of), totalCount));
                                     fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), 40);
-                                    title.setWidth(fakeTitleView.getMeasuredWidth() + (int)(8 * getResources().getDisplayMetrics().density));
-                                    title.setMaxWidth(fakeTitleView.getMeasuredWidth() + (int)(8 * getResources().getDisplayMetrics().density));
+                                    title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
+                                    title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
                                 }
                             }
                         });
@@ -778,8 +776,8 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
                             if (title != null) {
                                 fakeTitleView.setText(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, getString(R.string.Of), totalCount));
                                 fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), 40);
-                                title.setWidth(fakeTitleView.getMeasuredWidth() + (int)(8 * getResources().getDisplayMetrics().density));
-                                title.setMaxWidth(fakeTitleView.getMeasuredWidth() + (int)(8 * getResources().getDisplayMetrics().density));
+                                title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
+                                title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
                             }
                         }
                     });
@@ -797,8 +795,8 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
                             if (title != null) {
                                 fakeTitleView.setText(String.format("%d %s %d", position + 1, getString(R.string.Of), imagesArrLocations.size()));
                                 fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), 40);
-                                title.setWidth(fakeTitleView.getMeasuredWidth() + (int)(8 * getResources().getDisplayMetrics().density));
-                                title.setMaxWidth(fakeTitleView.getMeasuredWidth() + (int)(8 * getResources().getDisplayMetrics().density));
+                                title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
+                                title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
                             }
                         }
                     });

TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java

@@ -25,6 +25,7 @@ import android.widget.TextView;
 import org.telegram.TL.TLRPC;
 import org.telegram.messenger.MessagesController;
 import org.telegram.messenger.R;
+import org.telegram.messenger.Utilities;
 import org.telegram.ui.Views.BaseFragment;
 import org.telegram.ui.Views.IdenticonView;
 
@@ -91,7 +92,7 @@ public class IdenticonActivity extends BaseFragment {
         }
         if (title != null) {
             title.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_white, 0, 0, 0);
-            title.setCompoundDrawablePadding((int)(4 * getResources().getDisplayMetrics().density));
+            title.setCompoundDrawablePadding(Utilities.dp(4));
         }
     }
 
@@ -125,7 +126,6 @@ public class IdenticonActivity extends BaseFragment {
                     LinearLayout layout = (LinearLayout)fragmentView;
                     WindowManager manager = (WindowManager)parentActivity.getSystemService(Context.WINDOW_SERVICE);
                     int rotation = manager.getDefaultDisplay().getRotation();
-                    float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
 
                     if (rotation == Surface.ROTATION_270 || rotation == Surface.ROTATION_90) {
                         layout.setOrientation(LinearLayout.HORIZONTAL);
@@ -143,7 +143,7 @@ public class IdenticonActivity extends BaseFragment {
                     }
                     if (title != null) {
                         title.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_white, 0, 0, 0);
-                        title.setCompoundDrawablePadding((int)(4 * density));
+                        title.setCompoundDrawablePadding(Utilities.dp(4));
                     }
 
                     return false;

TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java

@@ -30,10 +30,8 @@ public class IntroActivity extends ActionBarActivity {
     private ViewPager viewPager;
     private ImageView topImage1;
     private ImageView topImage2;
-    private TextView startMessagingButton;
     private ViewGroup bottomPages;
     private int lastPage = 0;
-    private float density = 1;
     private boolean isRTL = false;
     private boolean justCreated = false;
     private boolean startPressed = false;
@@ -107,9 +105,8 @@ public class IntroActivity extends ActionBarActivity {
                     R.string.Page7Message
             };
         }
-        density = getResources().getDisplayMetrics().density;
         viewPager = (ViewPager)findViewById(R.id.intro_view_pager);
-        startMessagingButton = (TextView)findViewById(R.id.start_messaging_button);
+        TextView startMessagingButton = (TextView) findViewById(R.id.start_messaging_button);
         topImage1 = (ImageView)findViewById(R.id.icon_image1);
         topImage2 = (ImageView)findViewById(R.id.icon_image2);
         bottomPages = (ViewGroup)findViewById(R.id.bottom_pages);

TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java

@@ -8,10 +8,7 @@
 
 package org.telegram.ui;
 
-import android.app.Activity;
 import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
@@ -32,7 +29,6 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import org.telegram.TL.TLRPC;
-import org.telegram.messenger.FileLog;
 import org.telegram.objects.MessageObject;
 import org.telegram.messenger.MessagesController;
 import org.telegram.messenger.NotificationCenter;
@@ -41,10 +37,9 @@ import org.telegram.messenger.Utilities;
 import org.telegram.ui.Views.BackupImageView;
 import org.telegram.ui.Views.BaseFragment;
 
-public class LocationActivity extends BaseFragment implements LocationListener, NotificationCenter.NotificationCenterDelegate {
+public class LocationActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
     private GoogleMap googleMap;
     private TextView distanceTextView;
-    private Marker myLocationMarker;
     private Marker userMarker;
     private Location myLocation;
     private Location userLocation;
@@ -60,16 +55,22 @@ public class LocationActivity extends BaseFragment implements LocationListener,
         @Override
         public void onActivityCreated(Bundle savedInstanceState) {
             super.onActivityCreated(savedInstanceState);
-            setupLocationListener();
             googleMap = getMap();
             if (googleMap == null) {
                 return;
             }
 
-            googleMap.setMyLocationEnabled(false);
+            googleMap.setMyLocationEnabled(true);
             googleMap.getUiSettings().setMyLocationButtonEnabled(false);
             googleMap.getUiSettings().setZoomControlsEnabled(false);
             googleMap.getUiSettings().setCompassEnabled(false);
+            googleMap.setOnMyLocationChangeListener(new GoogleMap.OnMyLocationChangeListener() {
+                @Override
+                public void onMyLocationChange(Location location) {
+                    positionMarker(location);
+                }
+            });
+            myLocation = googleMap.getMyLocation();
 
             if (sendButton != null) {
                 userLocation = new Location("network");
@@ -160,8 +161,6 @@ public class LocationActivity extends BaseFragment implements LocationListener,
     @Override
     public void onFragmentDestroy() {
         super.onFragmentDestroy();
-        LocationManager locationManager = (LocationManager)parentActivity.getSystemService(Activity.LOCATION_SERVICE);
-        locationManager.removeUpdates(this);
         NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces);
         NotificationCenter.Instance.removeObserver(this, MessagesController.closeChats);
     }
@@ -295,47 +294,11 @@ public class LocationActivity extends BaseFragment implements LocationListener,
         return true;
     }
 
-    private void setupLocationListener() {
-        try {
-            LocationManager locationManager = (LocationManager)parentActivity.getSystemService(Activity.LOCATION_SERVICE);
-            boolean isGPSEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-            boolean isNetworkEnabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-
-            Location location = null;
-
-            if (isGPSEnabled || isNetworkEnabled) {
-                if (isGPSEnabled) {
-                    locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000 * 3 * 1, 1, this);
-                    if (locationManager != null) {
-                        location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-                    }
-                }
-                if (location == null && isNetworkEnabled) {
-                    locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000 * 3 * 1, 1, this);
-                    if (locationManager != null) {
-                        location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-                    }
-                }
-            }
-            positionMarker(location);
-        } catch (Exception e) {
-            FileLog.e("tmessages", e);
-        }
-    }
-
     private void positionMarker(Location location) {
         if (location == null) {
             return;
         }
         myLocation = location;
-        if (myLocationMarker == null) {
-            if (googleMap != null) {
-                myLocationMarker = googleMap.addMarker(new MarkerOptions().position(new LatLng(location.getLatitude(), location.getLongitude())).
-                        icon(BitmapDescriptorFactory.fromResource(R.drawable.map_dot)).anchor(0.5f, 0.5f));
-            }
-        } else {
-            myLocationMarker.setPosition(new LatLng(location.getLatitude(), location.getLongitude()));
-        }
         if (messageObject != null) {
             if (userLocation != null && distanceTextView != null) {
                 float distance = location.distanceTo(userLocation);
@@ -363,28 +326,6 @@ public class LocationActivity extends BaseFragment implements LocationListener,
 
     }
 
-    @Override
-    public void onLocationChanged(final Location location) {
-        Utilities.RunOnUIThread(new Runnable() {
-            @Override
-            public void run() {
-                positionMarker(location);
-            }
-        });
-    }
-
-    @Override
-    public void onProviderDisabled(String provider) {
-    }
-
-    @Override
-    public void onProviderEnabled(String provider) {
-    }
-
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-    }
-
     @Override
     public void didReceivedNotification(int id, Object... args) {
         if (id == MessagesController.updateInterfaces) {

TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java

@@ -82,13 +82,13 @@ public class LoginActivity extends ActionBarActivity implements SlideView.SlideV
 
         getSupportActionBar().setLogo(R.drawable.ab_icon_fixed2);
         getSupportActionBar().show();
-        float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
+
         ImageView view = (ImageView)findViewById(16908332);
         if (view == null) {
             view = (ImageView)findViewById(R.id.home);
         }
         if (view != null) {
-            view.setPadding((int)(density * 6), 0, (int)(density * 6), 0);
+            view.setPadding(Utilities.dp(6), 0, Utilities.dp(6), 0);
         }
 
         views[0] = (SlideView)findViewById(R.id.login_page1);

TMessagesProj/src/main/java/org/telegram/ui/LoginActivityPhoneView.java

@@ -306,6 +306,9 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI
         req.sms_type = 0;
         req.phone_number = phone;
         req.lang_code = Locale.getDefault().getCountry();
+        if (req.lang_code == null || req.lang_code.length() == 0) {
+            req.lang_code = "en";
+        }
 
         final Bundle params = new Bundle();
         params.putString("phone", "+" + codeField.getText() + phoneField.getText());

TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java

@@ -28,6 +28,7 @@ import android.widget.GridView;
 import android.widget.TextView;
 
 import org.telegram.TL.TLRPC;
+import org.telegram.messenger.Utilities;
 import org.telegram.objects.MessageObject;
 import org.telegram.messenger.MessagesController;
 import org.telegram.messenger.NotificationCenter;
@@ -289,20 +290,19 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No
                 public boolean onPreDraw() {
                     WindowManager manager = (WindowManager)parentActivity.getSystemService(Activity.WINDOW_SERVICE);
                     int rotation = manager.getDefaultDisplay().getRotation();
-                    float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
 
                     if (rotation == Surface.ROTATION_270 || rotation == Surface.ROTATION_90) {
                         orientation = 1;
                         listView.setNumColumns(6);
-                        itemWidth = getResources().getDisplayMetrics().widthPixels / 6 - (int)(2 * density) * 5;
+                        itemWidth = getResources().getDisplayMetrics().widthPixels / 6 - Utilities.dp(2) * 5;
                         listView.setColumnWidth(itemWidth);
                     } else {
                         orientation = 0;
                         listView.setNumColumns(4);
-                        itemWidth = getResources().getDisplayMetrics().widthPixels / 4 - (int)(2 * density) * 3;
+                        itemWidth = getResources().getDisplayMetrics().widthPixels / 4 - Utilities.dp(2) * 3;
                         listView.setColumnWidth(itemWidth);
                     }
-                    listView.setPadding(listView.getPaddingLeft(), (int)(4 * density), listView.getPaddingRight(), listView.getPaddingBottom());
+                    listView.setPadding(listView.getPaddingLeft(), Utilities.dp(4), listView.getPaddingRight(), listView.getPaddingBottom());
                     listAdapter.notifyDataSetChanged();
 
                     listView.getViewTreeObserver().removeOnPreDrawListener(this);

TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java

@@ -70,7 +70,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
     private static boolean dialogsLoaded = false;
     private boolean searching = false;
     private boolean searchWas = false;
-    private float density = 1;
     private boolean onlySelect = false;
     private int activityToken = (int)(MessagesController.random.nextDouble() * Integer.MAX_VALUE);
     private long selectedDialog;
@@ -88,7 +87,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
     @Override
     public boolean onFragmentCreate() {
         super.onFragmentCreate();
-        density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
         NotificationCenter.Instance.addObserver(this, MessagesController.dialogsNeedReload);
         NotificationCenter.Instance.addObserver(this, 999);
         NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces);
@@ -324,7 +322,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                 view = (ImageView)parentActivity.findViewById(R.id.home);
             }
             if (view != null) {
-                view.setPadding((int)(density * 6), 0, (int)(density * 6), 0);
+                view.setPadding(Utilities.dp(6), 0, Utilities.dp(6), 0);
             }
             actionBar.setHomeButtonEnabled(false);
             actionBar.setDisplayShowTitleEnabled(true);
@@ -752,7 +750,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                     }
                     View v = view.findViewById(R.id.settings_row_divider);
                     v.setVisibility(View.VISIBLE);
-                    view.setPadding((int)(11 * density), 0, (int)(11 * density), 0);
+                    view.setPadding(Utilities.dp(11), 0, Utilities.dp(11), 0);
                 }
                 MessagesListSearchRowHolder holder = (MessagesListSearchRowHolder)view.getTag();
                 if (holder == null) {
@@ -781,7 +779,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                     } else {
                         holder.nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_green, 0);
                     }
-                    holder.nameTextView.setCompoundDrawablePadding((int)(4 * density));
+                    holder.nameTextView.setCompoundDrawablePadding(Utilities.dp(4));
                 } else {
                     holder.nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
                     holder.nameTextView.setCompoundDrawablePadding(0);
@@ -972,7 +970,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                     } else {
                         nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_green, 0);
                     }
-                    nameTextView.setCompoundDrawablePadding((int)(4 * density));
+                    nameTextView.setCompoundDrawablePadding(Utilities.dp(4));
                 } else {
                     Log.e("test", "tda");
                 }

TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java

@@ -75,7 +75,7 @@ public class SettingsChangeNameActivity extends BaseFragment {
         doneButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (firstNameField.getText().length() != 0 && lastNameField.getText().length() != 0) {
+                if (firstNameField.getText().length() != 0) {
                     saveName();
                     finishFragment();
                 }

TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java

@@ -52,7 +52,6 @@ import java.util.HashMap;
 public class SettingsWallpapersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
     private HorizontalListView listView;
     private ListAdapter listAdapter;
-    private float density;
     private ImageView backgroundImage;
     private ProgressBar progressBar;
     private int selectedBackground;
@@ -95,7 +94,6 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
         if (fragmentView == null) {
             fragmentView = inflater.inflate(R.layout.settings_wallpapers_layout, container, false);
             listAdapter = new ListAdapter(parentActivity);
-            density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
 
             progressBar = (ProgressBar)fragmentView.findViewById(R.id.action_progress);
             backgroundImage = (ImageView)fragmentView.findViewById(R.id.background_image);
@@ -152,7 +150,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
                     boolean done;
                     TLRPC.WallPaper wallPaper = wallpappersByIds.get(selectedBackground);
                     if (wallPaper != null && wallPaper.id != 1000001 && wallPaper instanceof TLRPC.TL_wallPaper) {
-                        TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, (int) (320 * density), (int) (480 * density));
+                        TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, Utilities.dp(320), Utilities.dp(480));
                         String fileName = size.location.volume_id + "_" + size.location.local_id + ".jpg";
                         File f = new File(Utilities.getCacheDir(), fileName);
                         File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg");
@@ -195,7 +193,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
             if (requestCode == 0) {
                 Utilities.addMediaToGallery(currentPicturePath);
                 try {
-                    Bitmap bitmap = FileLoader.loadBitmap(currentPicturePath, (int)(320 * density), (int)(480 * density));
+                    Bitmap bitmap = FileLoader.loadBitmap(currentPicturePath, Utilities.dp(320), Utilities.dp(480));
                     File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg");
                     FileOutputStream stream = new FileOutputStream(toFile);
                     bitmap.compress(Bitmap.CompressFormat.JPEG, 87, stream);
@@ -220,7 +218,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
                     }
                     cursor.close();
 
-                    Bitmap bitmap = FileLoader.loadBitmap(imageFilePath, (int)(320 * density), (int)(480 * density));
+                    Bitmap bitmap = FileLoader.loadBitmap(imageFilePath, Utilities.dp(320), Utilities.dp(480));
                     File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg");
                     FileOutputStream stream = new FileOutputStream(toFile);
                     bitmap.compress(Bitmap.CompressFormat.JPEG, 87, stream);
@@ -237,7 +235,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
     private void processSelectedBackground() {
         TLRPC.WallPaper wallPaper = wallpappersByIds.get(selectedBackground);
         if (selectedBackground != -1 && selectedBackground != 1000001 && wallPaper != null && wallPaper instanceof TLRPC.TL_wallPaper) {
-            TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, (int)(320 * density), (int)(480 * density));
+            TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, Utilities.dp(320), Utilities.dp(480));
             String fileName = size.location.volume_id + "_" + size.location.local_id + ".jpg";
             File f = new File(Utilities.getCacheDir(), fileName);
             if (!f.exists()) {
@@ -509,7 +507,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
                 BackupImageView image = (BackupImageView)view.findViewById(R.id.image);
                 View selection = view.findViewById(R.id.selection);
                 TLRPC.WallPaper wallPaper = wallPapers.get(i - 1);
-                TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, (int)(100 * density), (int)(100 * density));
+                TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, Utilities.dp(100), Utilities.dp(100));
                 image.setImage(size.location, "100_100", 0);
                 if (wallPaper.id == selectedBackground) {
                     selection.setVisibility(View.VISIBLE);

TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java

@@ -345,7 +345,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
         if (title != null) {
             if (dialog_id != 0) {
                 title.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_white, 0, 0, 0);
-                title.setCompoundDrawablePadding((int)(4 * getResources().getDisplayMetrics().density));
+                title.setCompoundDrawablePadding(Utilities.dp(4));
             } else {
                 title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
                 title.setCompoundDrawablePadding(0);
@@ -392,7 +392,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
                         }
                         if (title != null) {
                             title.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_white, 0, 0, 0);
-                            title.setCompoundDrawablePadding((int)(4 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density));
+                            title.setCompoundDrawablePadding(Utilities.dp(4));
                         }
                     }
                     return false;

TMessagesProj/src/main/java/org/telegram/ui/Views/MessageActionLayout.java

@@ -11,10 +11,10 @@ package org.telegram.ui.Views;
 import android.widget.FrameLayout;
 
 import org.telegram.messenger.R;
+import org.telegram.messenger.Utilities;
 
 public class MessageActionLayout extends FrameLayout {
     public TightTextView messageTextView;
-    public float density = 1;
 
     public MessageActionLayout(android.content.Context context) {
         super(context);
@@ -31,7 +31,7 @@ public class MessageActionLayout extends FrameLayout {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(messageTextView.linesMaxWidth + (int)(14 * density), getMeasuredHeight());
+        setMeasuredDimension(messageTextView.linesMaxWidth + Utilities.dp(14), getMeasuredHeight());
     }
 
     @Override

TMessagesProj/src/main/java/org/telegram/ui/Views/MessageLayout.java

@@ -12,12 +12,12 @@ import android.view.View;
 import android.widget.TextView;
 
 import org.telegram.messenger.R;
+import org.telegram.messenger.Utilities;
 
 public class MessageLayout extends FrameLayoutFixed {
     public TextView timeTextView;
     public View timeLayout;
     public TightTextView messageTextView;
-    public float density = 1;
     public int maxWidth;
 
     public MessageLayout(android.content.Context context) {
@@ -38,18 +38,17 @@ public class MessageLayout extends FrameLayoutFixed {
         int timeWidth = timeLayout != null ? timeLayout.getMeasuredWidth() : timeTextView.getMeasuredWidth();
         int totalWidth = getMeasuredWidth();
 
-
         int maxChildWidth = getChildAt(0).getMeasuredWidth();
         int count = getChildCount();
         for (int a = 1; a < count - 1; a++) {
             maxChildWidth = Math.max(maxChildWidth, getChildAt(a).getMeasuredWidth());
         }
-        int timeMore = (int)(timeWidth + 6 * density);
+        int timeMore = timeWidth + Utilities.dp(6);
         int fields = totalWidth - Math.max(maxChildWidth, timeWidth);
         int height = getMeasuredHeight();
 
         if (maxWidth - messageTextView.lastLineWidth < timeMore) {
-            setMeasuredDimension(Math.max(maxChildWidth, messageTextView.lastLineWidth) + fields, (int)(height + 14 * density));
+            setMeasuredDimension(Math.max(maxChildWidth, messageTextView.lastLineWidth) + fields, height + Utilities.dp(14));
         } else {
             int diff = maxChildWidth - messageTextView.lastLineWidth;
             if (diff >= 0 && diff <= timeMore) {

TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java

@@ -289,7 +289,7 @@ public class NotificationView extends LinearLayout {
         }
     }
 
-    public void applyOrientationPaddings(boolean isLandscape, float density, int height) {
+    public void applyOrientationPaddings(boolean isLandscape, int height) {
         FrameLayout.LayoutParams params = (FrameLayout.LayoutParams)avatarImage.getLayoutParams();
         params.width = height;
         params.height = height;
@@ -298,22 +298,22 @@ public class NotificationView extends LinearLayout {
         if (isLandscape) {
             nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
             messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-            nameTextView.setPadding(0, (int)(2 * density), 0, 0);
-            messageTextView.setPadding(0, (int)(18 * density), 0, 0);
+            nameTextView.setPadding(0, Utilities.dp(2), 0, 0);
+            messageTextView.setPadding(0, Utilities.dp(18), 0, 0);
             if (isRTL) {
-                params1.setMargins((int)(40 * density), 0, (int)(height + 6 * density), 0);
+                params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(6), 0);
             } else {
-                params1.setMargins((int)(height + 6 * density), 0, (int)(40 * density), 0);
+                params1.setMargins(height + Utilities.dp(6), 0, Utilities.dp(40), 0);
             }
         } else {
             nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
             messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
-            nameTextView.setPadding(0, (int)(4 * density), 0, 0);
-            messageTextView.setPadding(0, (int) (24 * density), 0, 0);
+            nameTextView.setPadding(0, Utilities.dp(4), 0, 0);
+            messageTextView.setPadding(0, Utilities.dp(24), 0, 0);
             if (isRTL) {
-                params1.setMargins((int)(40 * density), 0, (int)(height + 8 * density), 0);
+                params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(8), 0);
             } else {
-                params1.setMargins((int)(height + 8 * density), 0, (int)(40 * density), 0);
+                params1.setMargins(height + Utilities.dp(8), 0, Utilities.dp(40), 0);
             }
         }
         textLayout.setLayoutParams(params1);