From f2349a9bdda88764c2015aae3ee6189af53924c8 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Mon, 20 Feb 2017 19:12:29 +0100
Subject: [PATCH] Accept vcards shared to us by external apps. Remove unused
 contact and location code.

---
 .../com/b44t/messenger/MessageObject.java     |  14 +-
 .../b44t/messenger/MusicBrowserService.java   |   2 +-
 .../b44t/messenger/NotificationCenter.java    |   2 -
 .../b44t/messenger/SendMessagesHelper.java    | 190 ++----------------
 .../main/java/com/b44t/messenger/TLRPC.java   |  38 ----
 .../java/com/b44t/ui/ActionBar/Theme.java     |   4 -
 .../com/b44t/ui/Cells/ChatMessageCell.java    |  48 +----
 .../main/java/com/b44t/ui/ChatActivity.java   |  10 +-
 .../main/java/com/b44t/ui/LaunchActivity.java | 105 ++--------
 .../java/com/b44t/ui/ProfileActivity.java     |  30 +--
 .../main/res/drawable-hdpi/contact_blue.png   | Bin 2296 -> 0 bytes
 .../main/res/drawable-hdpi/contact_green.png  | Bin 2339 -> 0 bytes
 .../main/res/drawable-mdpi/contact_blue.png   | Bin 1796 -> 0 bytes
 .../main/res/drawable-mdpi/contact_green.png  | Bin 1828 -> 0 bytes
 .../main/res/drawable-xhdpi/contact_blue.png  | Bin 2877 -> 0 bytes
 .../main/res/drawable-xhdpi/contact_green.png | Bin 2867 -> 0 bytes
 .../main/res/drawable-xxhdpi/contact_blue.png | Bin 3861 -> 0 bytes
 .../res/drawable-xxhdpi/contact_green.png     | Bin 3884 -> 0 bytes
 .../src/main/res/values-de/strings.xml        |   3 -
 .../src/main/res/values-es/strings.xml        |   3 -
 .../src/main/res/values-fr/strings.xml        |   3 -
 .../src/main/res/values-it/strings.xml        |   3 -
 .../src/main/res/values-nl/strings.xml        |   3 -
 .../src/main/res/values-pl/strings.xml        |   3 -
 .../src/main/res/values-pt/strings.xml        |   3 -
 MessengerProj/src/main/res/values/strings.xml |   3 -
 26 files changed, 50 insertions(+), 417 deletions(-)
 delete mode 100755 MessengerProj/src/main/res/drawable-hdpi/contact_blue.png
 delete mode 100755 MessengerProj/src/main/res/drawable-hdpi/contact_green.png
 delete mode 100755 MessengerProj/src/main/res/drawable-mdpi/contact_blue.png
 delete mode 100755 MessengerProj/src/main/res/drawable-mdpi/contact_green.png
 delete mode 100755 MessengerProj/src/main/res/drawable-xhdpi/contact_blue.png
 delete mode 100755 MessengerProj/src/main/res/drawable-xhdpi/contact_green.png
 delete mode 100755 MessengerProj/src/main/res/drawable-xxhdpi/contact_blue.png
 delete mode 100755 MessengerProj/src/main/res/drawable-xxhdpi/contact_green.png

diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
index 7fa6c526a..0288ecedf 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
@@ -50,7 +50,7 @@ public class MessageObject {
     public CharSequence caption;
     public final MessageObject replyMessageObject = null;
 
-    public int type = 1000; // 8: gif, 13: sticker
+    public int type = 1000; // 4: unused-geo, 8: gif, 12: unused-contact, 13: sticker
 
     public int contentType; // one of ChatActivity.ROWTYPE_MESSAGE_CELL, .ROWTYPE_ACTION_CELL or .ROWTYPE_UNREAD_CELL
     public float audioProgress;
@@ -175,16 +175,16 @@ public class MessageObject {
                 }
             } else if (messageOwner.media instanceof TLRPC.TL_messageMediaPhoto) {
                 type = 1;
-            } else if (messageOwner.media instanceof TLRPC.TL_messageMediaGeo || messageOwner.media instanceof TLRPC.TL_messageMediaVenue) {
-                type = 4;
+            /*} else if (messageOwner.media instanceof TLRPC.TL_messageMediaGeo || messageOwner.media instanceof TLRPC.TL_messageMediaVenue) {
+                type = 4;*/
             } else if (isVideo()) {
                 type = 3;
             } else if (isVoice()) {
                 type = 2;
             } else if (isMusic()) {
                 type = 14;
-            } else if (messageOwner.media instanceof TLRPC.TL_messageMediaContact) {
-                type = 12;
+            /*} else if (messageOwner.media instanceof TLRPC.TL_messageMediaContact) {
+                type = 12;*/
             /*} else if (messageOwner.media instanceof TLRPC.TL_messageMediaUnsupported) {
                 type = 0;*/
             } else if (messageOwner.media instanceof TLRPC.TL_messageMediaDocument) {
@@ -885,8 +885,8 @@ public class MessageObject {
             return height;
         } else if (type == 2) {
             return AndroidUtilities.dp(72);
-        } else if (type == 12) {
-            return AndroidUtilities.dp(71);
+        /*} else if (type == 12) -- was: contact {
+            return AndroidUtilities.dp(71);*/
         } else if (type == 9) {
             return AndroidUtilities.dp(100);
         } else if (type == 4) {
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java b/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java
index 0c867e642..16ef04b46 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java
@@ -318,7 +318,7 @@ public class MusicBrowserService extends MediaBrowserService implements Notifica
                     }
                 }
                 if (avatar == null || bitmap == null) {
-                    builder.setIconUri(Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/drawable/contact_blue"));
+                    builder.setIconUri(Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/drawable/audiosend_play"));
                 }
                 mediaItems.add(new MediaBrowser.MediaItem(builder.build(), MediaBrowser.MediaItem.FLAG_BROWSABLE));
             }
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java
index 3ed4d61eb..36a96b25d 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java
@@ -57,8 +57,6 @@ public class NotificationCenter {
     public static final int stickersDidLoaded = totalEvents++;
     public static final int didReplacedPhotoInMemCache = totalEvents++;
     public static final int musicDidLoaded = totalEvents++;
-    public static final int locationPermissionGranted = totalEvents++;
-    public static final int wasUnableToFindCurrentLocation = totalEvents++;
     public static final int reloadHints = totalEvents++;
 
     public static final int httpFileDidLoaded = totalEvents++;
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java
index 5f3a837ed..014e9d192 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java
@@ -44,155 +44,6 @@ import java.util.HashMap;
 
 public class SendMessagesHelper implements NotificationCenter.NotificationCenterDelegate {
 
-    //private TLRPC.ChatFull currentChatInfo = null;
-    //private HashMap<String, ArrayList<DelayedMessage>> delayedMessages = new HashMap<>();
-    //private HashMap<Integer, MessageObject> unsentMessages = new HashMap<>();
-    //private HashMap<Integer, TLRPC.Message> sendingMessages = new HashMap<>();
-    //private HashMap<String, MessageObject> waitingForLocation = new HashMap<>();
-    //private HashMap<String, MessageObject> waitingForCallback = new HashMap<>();
-
-    /*
-    private LocationProvider locationProvider = new LocationProvider(new LocationProvider.LocationProviderDelegate() {
-        @Override
-        public void onLocationAcquired(Location location) {
-            sendLocation(location);
-            waitingForLocation.clear();
-        }
-
-        @Override
-        public void onUnableLocationAcquire() {
-            HashMap<String, MessageObject> waitingForLocationCopy = new HashMap<>(waitingForLocation);
-            NotificationCenter.getInstance().postNotificationName(NotificationCenter.wasUnableToFindCurrentLocation, waitingForLocationCopy);
-            waitingForLocation.clear();
-        }
-    });
-
-    public static class LocationProvider {
-
-        public interface LocationProviderDelegate {
-            void onLocationAcquired(Location location);
-            void onUnableLocationAcquire();
-        }
-
-        private LocationProviderDelegate delegate;
-        private LocationManager locationManager;
-        private GpsLocationListener gpsLocationListener = new GpsLocationListener();
-        private GpsLocationListener networkLocationListener = new GpsLocationListener();
-        private Runnable locationQueryCancelRunnable;
-        private Location lastKnownLocation;
-
-        private class GpsLocationListener implements LocationListener {
-
-            @Override
-            public void onLocationChanged(Location location) {
-                if (location == null || locationQueryCancelRunnable == null) {
-                    return;
-                }
-                FileLog.e("messenger", "found location " + location);
-                lastKnownLocation = location;
-                if (location.getAccuracy() < 100) {
-                    if (delegate != null) {
-                        delegate.onLocationAcquired(location);
-                    }
-                    if (locationQueryCancelRunnable != null) {
-                        AndroidUtilities.cancelRunOnUIThread(locationQueryCancelRunnable);
-                    }
-                    cleanup();
-                }
-            }
-
-            @Override
-            public void onStatusChanged(String provider, int status, Bundle extras) {
-
-            }
-
-            @Override
-            public void onProviderEnabled(String provider) {
-
-            }
-
-            @Override
-            public void onProviderDisabled(String provider) {
-
-            }
-        }
-
-        public LocationProvider() {
-
-        }
-
-        public LocationProvider(LocationProviderDelegate locationProviderDelegate) {
-            delegate = locationProviderDelegate;
-        }
-
-        public void setDelegate(LocationProviderDelegate locationProviderDelegate) {
-            delegate = locationProviderDelegate;
-        }
-
-        private void cleanup() {
-            locationManager.removeUpdates(gpsLocationListener);
-            locationManager.removeUpdates(networkLocationListener);
-            lastKnownLocation = null;
-            locationQueryCancelRunnable = null;
-        }
-
-        public void start() {
-            if (locationManager == null) {
-                locationManager = (LocationManager) ApplicationLoader.applicationContext.getSystemService(Context.LOCATION_SERVICE);
-            }
-            try {
-                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1, 0, gpsLocationListener);
-            } catch (Exception e) {
-                FileLog.e("messenger", e);
-            }
-            try {
-                locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1, 0, networkLocationListener);
-            } catch (Exception e) {
-                FileLog.e("messenger", e);
-            }
-            try {
-                lastKnownLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-                if (lastKnownLocation == null) {
-                    lastKnownLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-                }
-            } catch (Exception e) {
-                FileLog.e("messenger", e);
-            }
-            if (locationQueryCancelRunnable != null) {
-                AndroidUtilities.cancelRunOnUIThread(locationQueryCancelRunnable);
-            }
-            locationQueryCancelRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    if (locationQueryCancelRunnable != this) {
-                        return;
-                    }
-                    if (delegate != null) {
-                        if (lastKnownLocation != null) {
-                            delegate.onLocationAcquired(lastKnownLocation);
-                        } else {
-                            delegate.onUnableLocationAcquire();
-                        }
-                    }
-                    cleanup();
-                }
-            };
-            AndroidUtilities.runOnUIThread(locationQueryCancelRunnable, 5000);
-        }
-
-        public void stop() {
-            if (locationManager == null) {
-                return;
-            }
-            if (locationQueryCancelRunnable != null) {
-                AndroidUtilities.cancelRunOnUIThread(locationQueryCancelRunnable);
-
-            }
-            cleanup();
-        }
-    }
-    */
-
     private static volatile SendMessagesHelper Instance = null;
 
     public static SendMessagesHelper getInstance() {
@@ -224,10 +75,8 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
         //delayedMessages.clear();
         //unsentMessages.clear();
         //sendingMessages.clear();
-        //waitingForLocation.clear();
         //waitingForCallback.clear();
         //currentChatInfo = null;
-        //locationProvider.stop();
     }
 
     /*
@@ -549,26 +398,33 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
         SendMessagesHelper.getInstance().sendMessageDocument((TLRPC.TL_document) document, null, null, peer, replyingMessageObject, null);
     }
 
-    public void sendMessageContact(TLRPC.User user, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
-        sendMessage__(null, null, null, user, null, peer, null, params);
+    public void sendMessageContact(int contact_id, int dialog_id) {
+        MrContact contact = MrMailbox.getContact(contact_id);
+        String msg = contact.getName();
+        if(msg.isEmpty()) {
+            msg = contact.getAddr();
+        }
+        else {
+            msg += ": " + contact.getAddr();
+        }
+        SendMessagesHelper.getInstance().sendMessageText(msg, dialog_id, null);
     }
 
     public void sendMessageDocument(TLRPC.TL_document document, VideoEditedInfo videoEditedInfo, String path, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
-        sendMessage__(null, null, videoEditedInfo, null, document, peer, path, params);
+        sendMessage__(null, null, videoEditedInfo, document, peer, path, params);
     }
 
     public void sendMessageText(String message, long peer, HashMap<String, String> params) {
-        sendMessage__(message, null, null, null, null, peer, null, params);
+        sendMessage__(message, null, null, null, peer, null, params);
     }
 
     public void sendMessagePhoto(TLRPC.TL_photo photo, String path, long peer, MessageObject reply_to_msg, HashMap<String, String> params) {
-        sendMessage__(null, photo, null, null, null, peer, path, params);
+        sendMessage__(null, photo, null, null, peer, path, params);
     }
 
     private void sendMessage__(String message,
                              TLRPC.TL_photo photo,
                              VideoEditedInfo videoEditedInfo,
-                             TLRPC.User user,
                              TLRPC.TL_document document,
                              long peer,
                              String path,
@@ -607,21 +463,6 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
                         TLRPC.FileLocation location1 = photo.sizes.get(photo.sizes.size() - 1).location;
                         newMsg.attachPath = FileLoader.getPathToAttach(location1, true).toString();
                     }
-                } else if (user != null) {
-                    newMsg = new TLRPC.TL_message();
-                    newMsg.media = new TLRPC.TL_messageMediaContact();
-                    newMsg.media.phone_number = user.phone;
-                    newMsg.media.first_name = user.first_name;
-                    newMsg.media.last_name = user.last_name;
-                    newMsg.media.user_id = user.id;
-                    if (newMsg.media.first_name == null) {
-                        user.first_name = newMsg.media.first_name = "";
-                    }
-                    if (newMsg.media.last_name == null) {
-                        user.last_name = newMsg.media.last_name = "";
-                    }
-                    newMsg.message = "";
-                    type = 6;
                 } else if (document != null) {
                     // AUDIO, VIDEO etc.
                     newMsg = new TLRPC.TL_message();
@@ -727,11 +568,6 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
                         media.id.access_hash = document.access_hash;
                         inputMedia = media;
                     }
-                } else if (type == 6) {
-                    inputMedia = new TLRPC.TL_inputMediaContact();
-                    inputMedia.phone_number = user.phone;
-                    inputMedia.first_name = user.first_name;
-                    inputMedia.last_name = user.last_name;
                 } else if (type == 7 ) {
                     if (document.access_hash == 0) {
                         if ( originalPath != null && originalPath.length() > 0 && originalPath.startsWith("http") && params != null) {
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
index 179086bb0..36e47b3cf 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
@@ -109,21 +109,12 @@ public class TLRPC {
 	public static class TL_messageMediaEmpty extends MessageMedia {
 	}
 
-	public static class TL_messageMediaVenue extends MessageMedia {
-	}
-
 	public static class TL_messageMediaDocument extends MessageMedia {
 	}
 
-	public static class TL_messageMediaContact extends MessageMedia {
-	}
-
 	public static class TL_messageMediaPhoto extends MessageMedia {
 	}
 
-	public static class TL_messageMediaGeo extends MessageMedia {
-	}
-
 	public static class PeerNotifySettings extends TLObject {
 		public int flags;
 		public boolean silent;
@@ -139,14 +130,6 @@ public class TLRPC {
 		public ArrayList<Document> documents = new ArrayList<>();
 	}
 
-	public static class InputGeoPoint extends TLObject {
-		public double lat;
-		public double _long;
-	}
-
-	public static class TL_inputGeoPoint extends InputGeoPoint {
-	}
-
 	public static class Audio extends TLObject {
 		public long id;
 		public int date;
@@ -206,9 +189,6 @@ public class TLRPC {
 		public boolean min;
     }
 
-	public static class TL_userContact_old2 extends User {
-	}
-
 	public static class Video extends TLObject {
 		public long id;
 		public int user_id;
@@ -259,21 +239,13 @@ public class TLRPC {
 		public String mime_type;
 		public ArrayList<DocumentAttribute> attributes = new ArrayList<>();
 		public String caption;
-		public InputGeoPoint geo_point;
 		public String title;
 		public String address;
 		public String provider;
-		public String venue_id;
-		public String phone_number;
-		public String first_name;
-		public String last_name;
 		public String url;
 		public String q;
 	}
 
-	public static class TL_inputMediaContact extends InputMedia {
-	}
-
 	public static class TL_inputMediaUploadedThumbDocument extends InputMedia {
 	}
 
@@ -284,15 +256,9 @@ public class TLRPC {
 	public static class TL_inputMediaGifExternal extends InputMedia {
 	}
 
-	public static class TL_inputMediaGeoPoint extends InputMedia {
-	}
-
 	public static class TL_inputMediaUploadedPhoto extends InputMedia {
 	}
 
-	public static class TL_inputMediaVenue extends InputMedia {
-	}
-
 	public static class TL_inputMediaUploadedDocument extends InputMedia {
 	}
 
@@ -432,12 +398,8 @@ public class TLRPC {
 		public String title;
 		public String address;
 		public String provider;
-		public String venue_id;
 		public Document document;
 		public String caption;
-		public String phone_number;
-		public String first_name;
-		public String last_name;
 		public int user_id;
 		public WebPage webpage;
 	}
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
index 8a1750336..7a7fe702c 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
@@ -185,7 +185,6 @@ public class Theme {
 
     public static Drawable shareIconDrawable;
 
-    public static Drawable[] contactDrawable = new Drawable[2];
     public static Drawable[][] fileStatesDrawable = new Drawable[10][2];
     public static Drawable[][] photoStatesDrawables = new Drawable[13][2];
     public static Drawable[] docMenuDrawable = new Drawable[4];
@@ -267,9 +266,6 @@ public class Theme {
             docMenuDrawable[2] = context.getResources().getDrawable(R.drawable.doc_actions_b_s);
             docMenuDrawable[3] = context.getResources().getDrawable(R.drawable.video_actions);
 
-            contactDrawable[0] = context.getResources().getDrawable(R.drawable.contact_blue);
-            contactDrawable[1] = context.getResources().getDrawable(R.drawable.contact_green);
-
             shareIconDrawable = context.getResources().getDrawable(R.drawable.ic_ab_reply);
 
             cornerOuter[0] = context.getResources().getDrawable(R.drawable.corner_out_tl);
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java
index 869744f2c..6230e0afc 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java
@@ -689,7 +689,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
     */
 
     private boolean checkOtherButtonMotionEvent(MotionEvent event) {
-        if (documentAttachType != DOCUMENT_ATTACH_TYPE_DOCUMENT && currentMessageObject.type != 12 && documentAttachType != DOCUMENT_ATTACH_TYPE_MUSIC && documentAttachType != DOCUMENT_ATTACH_TYPE_VIDEO && documentAttachType != DOCUMENT_ATTACH_TYPE_GIF && currentMessageObject.type != 8) {
+        if (documentAttachType != DOCUMENT_ATTACH_TYPE_DOCUMENT && documentAttachType != DOCUMENT_ATTACH_TYPE_MUSIC && documentAttachType != DOCUMENT_ATTACH_TYPE_VIDEO && documentAttachType != DOCUMENT_ATTACH_TYPE_GIF && currentMessageObject.type != 8) {
             return false;
         }
 
@@ -739,13 +739,13 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                         imagePressed = true;
                         result = true;
                     }
-                    if (currentMessageObject.type == 12) {
+                    /*if (currentMessageObject.type == 12) -- contact {
                         TLRPC.User user = MessagesController.getInstance().getUser(currentMessageObject.messageOwner.media.user_id);
                         if (user == null) {
                             imagePressed = false;
                             result = false;
                         }
-                    }
+                    }*/
                 }
             }
             if (imagePressed) {
@@ -2115,7 +2115,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                     photoImage.setImageBitmap((Drawable) null);
                     calcBackgroundWidth(maxWidth, timeMore, maxChildWidth);
                 }
-            } else if (messageObject.type == 12) {
+            /*} else if (messageObject.type == 12) -- was: contact {
                 drawName = false;
                 drawForwardedName = true;
                 drawPhotoImage = true;
@@ -2163,7 +2163,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                     if (timeLeft < timeWidth) {
                         totalHeight += AndroidUtilities.dp(8);
                     }
-                }
+                }*/
             } else if (messageObject.type == 2) {
                 drawForwardedName = true;
                 if (isTablet()) {
@@ -2237,44 +2237,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                             }
                         }
                     }
-                } else if (messageObject.type == 4) { //geo
-                    /*
-                    double lat = messageObject.messageOwner.media.geo.lat;
-                    double lon = messageObject.messageOwner.media.geo._long;
-
-                    if (messageObject.messageOwner.media.title != null && messageObject.messageOwner.media.title.length() > 0) {
-                        if (isTablet()) {
-                            backgroundWidth = Math.min(getMinTabletSide() - dp(isChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                        } else {
-                            backgroundWidth = Math.min(displaySize.x - dp(isChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                        }
-                        if (checkNeedDrawShareButton(messageObject)) {
-                            backgroundWidth -= dp(20);
-                        }
-                        int maxWidth = backgroundWidth - dp(86 + 37);
-
-                        docTitleLayout = StaticLayoutEx.createStaticLayout(messageObject.messageOwner.media.title, locationTitlePaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false, TextUtils.TruncateAt.END, maxWidth, 2);
-                        int lineCount = docTitleLayout.getLineCount();
-                        if (messageObject.messageOwner.media.address != null && messageObject.messageOwner.media.address.length() > 0) {
-                            infoLayout = StaticLayoutEx.createStaticLayout(messageObject.messageOwner.media.address, locationAddressPaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false, TextUtils.TruncateAt.END, maxWidth, Math.min(3, 3 - lineCount));
-                        } else {
-                            infoLayout = null;
-                        }
-
-                        mediaBackground = false;
-                        availableTimeWidth = maxWidth;
-                        photoWidth = dp(86);
-                        photoHeight = dp(86);
-                        currentUrl = String.format(Locale.US, "https://maps.googleapis.com/maps/api/staticmap?center=%f,%f&zoom=15&size=72x72&maptype=roadmap&scale=%d&markers=color:red|size:mid|%f,%f&sensor=false", lat, lon, Math.min(2, (int) Math.ceil(density)), lat, lon);
-                    } else {
-                        availableTimeWidth = dp(200 - 14);
-                        photoWidth = dp(200);
-                        photoHeight = dp(100);
-                        backgroundWidth = photoWidth + dp(12);
-                        currentUrl = String.format(Locale.US, "https://maps.googleapis.com/maps/api/staticmap?center=%f,%f&zoom=15&size=200x100&maptype=roadmap&scale=%d&markers=color:red|size:mid|%f,%f&sensor=false", lat, lon, Math.min(2, (int) Math.ceil(density)), lat, lon);
-                    }
-                    photoImage.setImage(currentUrl, null, messageObject.isOutOwner() ? Theme.geoOutDrawable : Theme.geoInDrawable, null, 0);
-                    */
                 } else if (messageObject.type == 13) { //webp
                     drawBackground = false;
                     for (int a = 0; a < messageObject.messageOwner.media.document.attributes.size(); a++) {
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
index d123387b7..71d7ec7a5 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
@@ -1327,15 +1327,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             fragment.setDelegate(new ContactsActivity.ContactsActivityDelegate() {
                 @Override
                 public void didSelectContact(final int selected_user_id) {
-                    MrContact contact = MrMailbox.getContact(selected_user_id);
-                    String msg = contact.getName();
-                    if(msg.isEmpty()) {
-                        msg = contact.getAddr();
-                    }
-                    else {
-                        msg += ": " + contact.getAddr();
-                    }
-                    SendMessagesHelper.getInstance().sendMessageText(msg, dialog_id, null);
+                    SendMessagesHelper.getInstance().sendMessageContact(selected_user_id, (int)dialog_id);
                 }
             });
             presentFragment(fragment);
diff --git a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java
index 630d90b48..a292f2224 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java
@@ -27,10 +27,10 @@ import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Application;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Point;
@@ -60,8 +60,6 @@ import android.widget.Toast;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ContactsController;
 import com.b44t.messenger.ImageLoader;
-import com.b44t.messenger.MessageObject;
-import com.b44t.messenger.MessagesController;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.SendMessagesHelper;
@@ -86,23 +84,19 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+
 
 public class LaunchActivity extends Activity implements ActionBarLayout.ActionBarLayoutDelegate, NotificationCenter.NotificationCenterDelegate, DialogsActivity.DialogsActivityDelegate {
 
     private boolean finished;
     private String videoPath;
     private String sendingText;
-    private TLRPC.TL_messageMediaGeo sendingLocation;
     private ArrayList<Uri> photoPathsArray;
     private ArrayList<String> documentsPathsArray;
     private ArrayList<Uri> documentsUrisArray;
     private String documentsMimeType;
     private ArrayList<String> documentsOriginalPathsArray;
-    private ArrayList<TLRPC.User> contactsToSend;
+    private ArrayList<Integer> contactsToSend;
     private int currentConnectionState;
     private static ArrayList<BaseFragment> mainFragmentsStack = new ArrayList<>();
     private static ArrayList<BaseFragment> layerFragmentsStack = new ArrayList<>();
@@ -374,7 +368,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.mainUserInfoChanged);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.closeOtherAppActivities);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.didUpdatedConnectionState);
-        NotificationCenter.getInstance().addObserver(this, NotificationCenter.wasUnableToFindCurrentLocation);
 
         if (actionBarLayout.fragmentsStack.isEmpty()) {
             if ( MrMailbox.isConfigured()==0 ) {
@@ -516,7 +509,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
 
     private class VcardData {
         String name;
-        ArrayList<String> phones = new ArrayList<>();
+        ArrayList<String> emails = new ArrayList<>();
     }
 
     private boolean handleIntent(Intent intent, boolean isNew, boolean restore, boolean fromPassword) {
@@ -530,9 +523,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
         } else {
             boolean pushOpened = false;
 
-            //Integer push_user_id = 0;
             Integer push_chat_id = 0;
-            //Integer push_enc_id = 0;
             Integer open_settings = 0;
             long dialogId = intent != null && intent.getExtras() != null ? intent.getExtras().getLong("dialogId", 0) : 0;
             boolean showDialogsList = false;
@@ -610,10 +601,10 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                                                     }
                                                 }
                                             }
-                                        } else if (args[0].startsWith("TEL")) {
-                                            String phone = "";//PhoneFormat.stripExceptNumbers(args[1], true);
-                                            if (phone.length() > 0) {
-                                                currentData.phones.add(phone);
+                                        } else if (args[0].startsWith("EMAIL")) {
+                                            String email = args[1];
+                                            if (email.length() > 0) {
+                                                currentData.emails.add(email);
                                             }
                                         }
                                     }
@@ -625,22 +616,20 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                                     }
                                     for (int a = 0; a < vcardDatas.size(); a++) {
                                         VcardData vcardData = vcardDatas.get(a);
-                                        if (vcardData.name != null && !vcardData.phones.isEmpty()) {
+                                        if (vcardData.name != null && !vcardData.emails.isEmpty()) {
                                             if (contactsToSend == null) {
                                                 contactsToSend = new ArrayList<>();
                                             }
 
-                                            for (int b = 0; b < vcardData.phones.size(); b++) {
-                                                String phone = vcardData.phones.get(b);
-                                                TLRPC.User user = new TLRPC.TL_userContact_old2();
-                                                user.phone = phone;
-                                                user.first_name = vcardData.name;
-                                                user.last_name = "";
-                                                user.id = 0;
-                                                contactsToSend.add(user);
+                                            for (int b = 0; b < vcardData.emails.size(); b++) {
+                                                int contact_to_send_id = MrMailbox.createContact(vcardData.name, vcardData.emails.get(b));
+                                                contactsToSend.add(contact_to_send_id);
                                             }
                                         }
                                     }
+                                    if( contactsToSend==null ) {
+                                        Toast.makeText(this, ApplicationLoader.applicationContext.getString(R.string.BadEmailAddress), Toast.LENGTH_SHORT).show();;
+                                    }
                                 } else {
                                     error = true;
                                 }
@@ -663,14 +652,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                             }
                             else {
                                 String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-                                Pattern r = Pattern.compile("geo: ?(-?\\d+\\.\\d+),(-?\\d+\\.\\d+)(,|\\?z=)(-?\\d+)");
-                                Matcher m = r.matcher(text);
-                                if (m.find()) {
-                                    sendingLocation = new TLRPC.TL_messageMediaGeo();
-                                    sendingLocation.geo = new TLRPC.TL_geoPoint();
-                                    sendingLocation.geo.lat = Double.parseDouble(m.group(1));
-                                    sendingLocation.geo._long = Double.parseDouble(m.group(2));
-                                } else if (text != null && text.length() != 0) {
+                                if (text != null && text.length() != 0) {
                                     if ((text.startsWith("http://") || text.startsWith("https://")) && subject != null && subject.length() != 0) {
                                         text = subject + "\n" + text;
                                     }
@@ -722,7 +704,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                                             }
                                         }
                                     }
-                                } else if (sendingText == null && sendingLocation == null) {
+                                } else if (sendingText == null) {
                                     error = true;
                                 }
                             }
@@ -996,18 +978,14 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                 }
                 actionBarLayout.presentFragment(new AudioPlayerActivity(), false, true, true);
                 pushOpened = true;
-            } else if (videoPath != null || photoPathsArray != null || sendingText != null || sendingLocation != null || documentsPathsArray != null || contactsToSend != null || documentsUrisArray != null) {
+            } else if (videoPath != null || photoPathsArray != null || sendingText != null || documentsPathsArray != null || contactsToSend != null || documentsUrisArray != null) {
                 if (!AndroidUtilities.isTablet()) {
                     NotificationCenter.getInstance().postNotificationName(NotificationCenter.closeChats);
                 }
                 if (dialogId == 0) {
                     Bundle args = new Bundle();
                     args.putBoolean("onlySelect", true);
-                    if (contactsToSend != null) {
-                        args.putString("selectAlertString", LocaleController.getString("SendMessagesTo", R.string.SendMessagesTo));
-                    } else {
-                        args.putString("selectAlertString", LocaleController.getString("SendMessagesTo", R.string.SendMessagesTo));
-                    }
+                    args.putString("selectAlertString", LocaleController.getString("SendMessagesTo", R.string.SendMessagesTo));
                     DialogsActivity fragment = new DialogsActivity(args);
                     fragment.setDelegate(this);
                     boolean removeLast;
@@ -1137,8 +1115,8 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                     SendMessagesHelper.prepareSendingDocuments(documentsPathsArray, documentsOriginalPathsArray, documentsUrisArray, documentsMimeType, dialog_id, null);
                 }
                 if (contactsToSend != null && !contactsToSend.isEmpty()) {
-                    for (TLRPC.User user : contactsToSend) {
-                        SendMessagesHelper.getInstance().sendMessageContact(user, dialog_id, null, null);
+                    for (int user_id : contactsToSend) {
+                        SendMessagesHelper.getInstance().sendMessageContact(user_id, (int)dialog_id);
                     }
                 }
             }
@@ -1146,7 +1124,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
             photoPathsArray = null;
             videoPath = null;
             sendingText = null;
-            sendingLocation = null;
             documentsPathsArray = null;
             documentsOriginalPathsArray = null;
             contactsToSend = null;
@@ -1165,7 +1142,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.mainUserInfoChanged);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.closeOtherAppActivities);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.didUpdatedConnectionState);
-        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.wasUnableToFindCurrentLocation);
     }
 
     public void presentFragment(BaseFragment fragment) {
@@ -1357,10 +1333,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
             builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
             builder.show();
             return;
-        } else if (requestCode == 2) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                NotificationCenter.getInstance().postNotificationName(NotificationCenter.locationPermissionGranted);
-            }
         }
         if (actionBarLayout.fragmentsStack.size() != 0) {
             BaseFragment fragment = actionBarLayout.fragmentsStack.get(actionBarLayout.fragmentsStack.size() - 1);
@@ -1484,41 +1456,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
             }
         } else if (id == NotificationCenter.mainUserInfoChanged) {
             drawerLayoutAdapter.notifyDataSetChanged();
-        } else if (id == NotificationCenter.wasUnableToFindCurrentLocation) {
-            final HashMap<String, MessageObject> waitingForLocation = (HashMap<String, MessageObject>) args[0];
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), null);
-            builder.setNegativeButton(LocaleController.getString("ShareYouLocationUnableManually", R.string.ShareYouLocationUnableManually), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialogInterface, int i) {
-                    /*Telegram FOSS: manual Location selection not available */
-                    Toast.makeText(getApplicationContext(),"Disabled for now.", Toast.LENGTH_LONG).show();
-                    /*
-                    if (mainFragmentsStack.isEmpty()) {
-                        return;
-                    }
-                    BaseFragment lastFragment = mainFragmentsStack.get(mainFragmentsStack.size() - 1);
-                    if (!AndroidUtilities.isGoogleMapsInstalled(lastFragment)) {
-                        return;
-                    }
-                    LocationActivity fragment = new LocationActivity();
-                    fragment.setDelegate(new LocationActivity.LocationActivityDelegate() {
-                        @Override
-                        public void didSelectLocation(TLRPC.MessageMedia location) {
-                            for (HashMap.Entry<String, MessageObject> entry : waitingForLocation.entrySet()) {
-                                MessageObject messageObject = entry.getValue();
-                                SendMessagesHelper.getInstance().sendMessage(location, messageObject.getDialogId(), messageObject, null, null);
-                            }
-                        }
-                    });
-                    presentFragment(fragment);
-                    */
-                }
-            });
-            builder.setMessage(LocaleController.getString("ShareYouLocationUnable", R.string.ShareYouLocationUnable));
-            if (!mainFragmentsStack.isEmpty()) {
-                mainFragmentsStack.get(mainFragmentsStack.size() - 1).showDialog(builder.create());
-            }
         }
     }
 
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
index 59139d8f1..f3520db96 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
@@ -38,7 +38,7 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Typeface;
+
 import android.os.Build;
 import android.os.Bundle;
 import android.view.Gravity;
@@ -59,7 +59,6 @@ import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrContact;
 import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.SendMessagesHelper;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.support.widget.LinearLayoutManager;
 import com.b44t.messenger.support.widget.RecyclerView;
@@ -92,7 +91,7 @@ import com.b44t.ui.ActionBar.Theme;
 import java.util.ArrayList;
 
 
-public class ProfileActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, DialogsActivity.DialogsActivityDelegate, PhotoViewer.PhotoViewerProvider {
+public class ProfileActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, PhotoViewer.PhotoViewerProvider {
 
     private int user_id;  // show the profile of a single user
     private int chat_id;  // show the profile of a group
@@ -1221,31 +1220,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         }
     }
 
-    @Override
-    public void didSelectDialog(DialogsActivity fragment, long dialog_id, boolean param) {
-        if (dialog_id != 0) {
-            Bundle args = new Bundle();
-            args.putBoolean("scrollToTopOnResume", true);
-            int lower_part = (int) dialog_id;
-            if (lower_part != 0) {
-                if (lower_part > 0) {
-                    args.putInt("user_id", lower_part);
-                } else if (lower_part < 0) {
-                    args.putInt("chat_id", -lower_part);
-                }
-            } else {
-                args.putInt("enc_id", (int) (dialog_id >> 32));
-            }
-
-            NotificationCenter.getInstance().removeObserver(this, NotificationCenter.closeChats);
-            NotificationCenter.getInstance().postNotificationName(NotificationCenter.closeChats);
-            presentFragment(new ChatActivity(args), true);
-            removeSelfFromStack();
-            TLRPC.User user = MessagesController.getInstance().getUser(user_id);
-            SendMessagesHelper.getInstance().sendMessageContact(user, dialog_id, null, null);
-        }
-    }
-
     private class ListAdapter extends RecyclerListView.Adapter {
         private Context mContext;
 
diff --git a/MessengerProj/src/main/res/drawable-hdpi/contact_blue.png b/MessengerProj/src/main/res/drawable-hdpi/contact_blue.png
deleted file mode 100755
index 0f52e87810487918267938c181dc23e4e0a2e6e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2296
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
E0VS5dr2qf`

diff --git a/MessengerProj/src/main/res/drawable-hdpi/contact_green.png b/MessengerProj/src/main/res/drawable-hdpi/contact_green.png
deleted file mode 100755
index 1b3c67d76edc0f7a53005dd3faed0747e059abc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2339
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

diff --git a/MessengerProj/src/main/res/drawable-mdpi/contact_blue.png b/MessengerProj/src/main/res/drawable-mdpi/contact_blue.png
deleted file mode 100755
index 1b2beced2f198bcc4e1123c3bcb94b28e0fae5c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1796
zcmaJ?Yfuws6b&E<alm#AC}>Iypim%T0|_J$O&|dxhF7SBmo<+CQb~46789bPg#uM<
zWf-iApx6R~r9ef7+Cr6w4-iBuh=M$&N>N7?5o8eTh646S>CWzck2&Yud%t^j_DFD`
zpDES~i@{(_dH$SGbac`^#zyG-ldmH6(7_Vn3K0Pmi>O6P5W|*2VvxX-i{ijgP$W%G
zYyrJ67z3g#Oo#~iI~fv4P7>)bB#j(K*%*x1b`30&>;(~m7>tuCn8fkgt3-lK$|QzU
z`7V6e2aK2bYn7lt8yF_h?v>D`#O>P%UK$1}AO{f<K_gF4s2Cb1aY2`X&UM>lB4Gi7
z>}3-FNlM5MCip-~kU%B5I!jytfIy>>05>X)1~?HYE&zq>g5ES|z>PtrF(~eY#fykW
zQ%YkQp&Z}ESm=sLj7JcdK_;u!YLeQO1S#Xl0G&?PX;3K6D8gBltUyE>XNAgUNr3~Z
zBuW{K$RGtlrzjFbNeGjOX8KPFa(G!*p;|m9^uWj(5ljY1F1nJIfPDV{L*?>iv<e9Y
zKjizL!m6-j7$k>+Dkw=QK^qrqqYDKye3YOFfs|nol(2M)!SN6Rsp27+;3J?B?89XW
zDWq08Ea3Tk22Y_vL<$MW<1mS+0!b#5GCb%W9IiXt#h1hJ1pqG9+uNP(;YO#i0lF{6
z-GjTt<v@}oIjBIExY7??U`4LZ3UU~Y%mJ0MeW27=3CRfyB{O6z=0fMLsJF<Ku9yqm
zcSSB4O@^#%?7telw1v7yH(j<Zx>z<os6gGWL~T8CvBw4dS~NTkJ51Btb~?%*7qa2z
z)fm5ieoUwSZEC>8dGA_b&RCi;TWV`q(%}=!X5+X4MZrPbslv@j+71UT)?jm0YnrGB
zZ_;RMgLSr}`ghjV%HKok?@F%6jMlt(H@v!5HI+XD?2l~+ciyzx&+~c2B0Vssu&_d7
zC-Kaxw<f=_JT-=A(^4RVdxj=Q1MN$3w++C;;9Rp@+ibI%ql13+OxVCHOe?<BIQW_u
z#d5VjvDs7bJ<CLciNsIO?)&sYLQap}^FkwB2;4Z~*TLL2mYAM(ZGOE|M7u>tMp;bB
zXO}m1r3tYqL^i%CsLZ?qbHZ(!ZZfu`xN&QJ1UBZ@9Pf^8ooW6L9ht?`?OWQ`&Us4n
zySy3H?3etH*f(y;4>fve&9h(S*x{p#8mZF0uo>*=VQOR)_4L=>TOvw5nx15Ae+}Ss
zQp=+43*K$&?iF)R9hoXW7bIIV-><*XBFbT7SB=@-qR!$sIKPIND~*5b$?Wc?6?5md
zJ~Oo*q2P0lmnFmvA4n8-<+j;o4OS)X%i4V~`BKF5t9k3z$;^T+N>0MxMnpTr2adn2
z{*jW-iyOAnR!_cdEgh^XxnrX>A&ZAK%t-C@!F;RUOqutD+t8f@$66=zQnA`Tc);tK
zRdM%OAku36i}?Y%3wNZGbQefvF)|H3Q+683o7Y_{zWn5YT;J|yhCp1+qGgR90o>*@
zwTFTP)0GZSE$=?Qp{jaWco`Q?#f=uXH@QA|YGH=6NXdFJQKZU^e!9P9)w#!x!VA^0
zb<{Q{ZtD%>s`q-e&KXrX<p|#AP5mjsH?Z}4_4vK6z5+|fs9jbSg1ie_{zHYuFUN72
zvt_;UrL#HdXAVE|^ltqr#HZhHpx~U*&jrT{)}xO2b-=QfOGzR5hi~e0-ex7N8LZuK
zqTK{<WKqFV!!ua-38emTl{F!16#86zQZGF~UtV-z1ZZGYnML>4up0BDhK}h;D_K)@
z<LpCgE(&nHrVVA;Ob<ar!fey|>?^B!4Cb+M55J5XoAX**VAC^_&BXn+S~-vyZBTZ-
z!A_Xm6rgF|)e@1|oY(#8iCOaQB>H5p73*zzh$)BMT3$HG#E)B7>R<O#>3?zG?Dn3u
z!V1o=7V|0o@6D8n=Z<k{=6@z9ZFG>`cc`$eO}?gI*&ygRKSiE#tjBzOrr&R9Qahyk
OFY&m6oC@zfsec2bFT*PU

diff --git a/MessengerProj/src/main/res/drawable-mdpi/contact_green.png b/MessengerProj/src/main/res/drawable-mdpi/contact_green.png
deleted file mode 100755
index 0cb733438d53111f8831b2974830db17acab84a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1828
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

diff --git a/MessengerProj/src/main/res/drawable-xhdpi/contact_blue.png b/MessengerProj/src/main/res/drawable-xhdpi/contact_blue.png
deleted file mode 100755
index 0691158e3e9059e9f498defa5c52a9aa2f4b7860..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2877
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
QUiqOV61?!0E+O&%0lF>MC;$Ke

diff --git a/MessengerProj/src/main/res/drawable-xhdpi/contact_green.png b/MessengerProj/src/main/res/drawable-xhdpi/contact_green.png
deleted file mode 100755
index d50586ac10b3f61fbef07f3748be76d2dce779c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2867
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
DYINqn

diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/contact_blue.png b/MessengerProj/src/main/res/drawable-xxhdpi/contact_blue.png
deleted file mode 100755
index aa2f30e3766fcf0b4220e678a24396e77d03593b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3861
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
QzWbwUk90xQ91CLnADvIPlK=n!

diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/contact_green.png b/MessengerProj/src/main/res/drawable-xxhdpi/contact_green.png
deleted file mode 100755
index 1fb42bf405171e9dab38cfbdf42a518e1cb8be2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3884
zcmaJ^X*`r|-?mJ$W{|CtF-5kRv5t{tGPam(W8Y`9n=vyCBAIMukIKjvLN^sk*`ko5
zNkR%Csu2yUk<!9D?&t1)-Vbl@^}DX?JkS5{IFA4N<vinf+*(X{k1!7pkC?3u(wV!a
zY=43R+`kj@bS-z0r&@YYU5ErKEs%`oLEwlOJjga8FbMCA55&bq4d9RP@bH5}&>mC|
zlsz0vjL-_)#%RSxkhp9fo+D<lq(E#Ko(jU?gF+%rz^fhIU{DCo1njPlf}lti_}~zm
zcrxB4{x}*NABHu;fz3=oM`Gbzfe1V`5EL5`9!Y`6nt=b-g>(1YW^FL&ZwNKa1pJ?%
zJW!4x3nCd0($~^GjD<j<AOiy}sGh!o0aO#D1A*#jL%6TOVW=Kl-vF*-2>Ry%bG?yq
z1h_NO>K|X+lL<JON+rRywP`e(7EM=+NDk758W|aFYv|}4<{}PL;v%Vmv4<lm2YxFc
z@f0jMghUM?MuN5#12M#CstK4I>3>p)ApI*FN%^Nt+=6Mx29mU)T9ECOegjdc{~sC=
z@h_S}b;kcU-v3jWf{r8MwVm-4Vl)}cZ5-jiwks0cf{YKO63J*HG5mKG9fOHfA|;qe
z0$I2ifK=T>B5_0-MeT1q3I(@~q)-DRv3Ogg37D&(6%vAj>*?wn!C(e3D<ski3boWX
zGPE?ZK<IKy4nsmMj_UsAB8k}O2z(^<Hy8I`uF)U4+oKRc;(A8n$ssX#oE4cE0s1>-
zc*vh)G5Dk2KV00OV=??ASDPD*_I6|cSEGNMxYM(}{da7+hkpkjAIY6|GIy*U%##&)
zctk2}kqC6`B->Yr<oaBG^Cl4pIvAL*oNO*r{m6M7Ts_+CQ5SX1E#iFs<b`9h@98Zb
zVb%iP1TTDpbi?SRv%*vqTZb-en;}fUR(QK186c)=3y^#?G_rN#>yhuVgcGaNKW0o8
zekpRq4#vGI`BA=F#wn+4ZgoS=UT!Mr>|SKfF?}BFV*yzpLJ~odAgr4&|1>MGEGP!z
zU4&v<5e{?sSx|yLN0pOEC>65u(mgRP?f-D^$VO`}lsUk>%5;Em&<n;<xnGX$JHhBE
zT7`Voy@Y~PUzcN+JSeH%-2d2KaCCJDUDD%I+2#Hq;nD{DW{Ia7owPrZ@j{n~8*(e1
zmx-;dnHnoRo&QFe#bFkJ1y4Ye<BT~nELE{dky%{MJU`RDs5>YU>$e*Ln7#d>$RB@F
zC2KT!`VrxzXOtnwlO@7*i3|^Kuq(fQqR5z`tt%U<DUg(KZsQ<DoYM07G!p2`Q+o0a
znR&9xO|*vZ@m%_O$bNEx_FEZ*CdRF9j(WsWyis!#%28zEnbpCvNF|OX%bzi-8V{wn
z`I+qIR5}5R_IEveb-$AV=rZk>VWrt@$mRq4kSsTr7s2eAd2Oq^iKZb#E8`t=85f~0
z)NZ|t<G}RKZ&3;=1T~LM{<w%!P#209XZIG?=RX%j1o&xUXVeq-j_7$0c3RL7=71Z}
z%xVV<fuD!Nlgy5eJKc?;d)SWO&w=Hv&m&l)?LvIkJ!TZ=fo9=PFWp5DuNJE5JKVGG
zIZRBa$B1AUp}3MYcaKx)#H!L?a$%G=<93Rv3SaBehh6EXo_?%eL-jQlZonphDgo&r
zH%Pe>t=|nPwGw118)}v^dFBr6-Lf#fN46-}@))pS>=DS$jux2ebs^0a$j`W>nw73a
zKgE-Tv4ZX3y<y<bUhx8HeWC3}2Kzzir#N85;T3B?$P`bqFrOMZtZ&@Qh+$VEiKG{+
zkMs?B@z&q-IRyB$9H1bLK;|Rd0?u8dn-jjA#&}0G6*ZK&OaYqQE)-4jcljq71Cr70
zd;7{J52QDYrRM>7tv^dNU4ecR_>yNbTL8+Vn|ZQ>MIp;(zy{DcMtxse|J?B<mG^DN
zhya%=b9T_aJjYHQN5sLp#GT2Ed%b0{86cTF*M92&73TrrxSw+E>T0)`xUe;c<F!2v
zO?s7Eu7!+Z#8n}+vQ<OcEyqNT8a$>ZZT*EpP1?9s!4r}!$BDIA28hz<jH-B5D2iN$
z(NwaZ>_b6I`@XE%+H)YaTcmb_Ah<$<@zE=;L}%=jr__^Vj54fcX1D;f0;Yt*efwM4
z3B_hLMUt2k?m=R7wMT<h&*Tq;Q1J50^(MiUsw?ZVDc$19%<wno$hG2^keQ#&rox~;
zbG{FihcTPoF6k&eC*Y`?YeUhiQqZwSlk<9^xT4-sWS#0zsioxv7A1u&>831d3s!+I
zzt#;XZWQ5g&Z?OVwCZ-H9yzwQXb)6f3Pj^CwjI#{=%T2p$TCybBxJHxw6{ptSPIaW
z7dSGaQ|>Mm!=F==T-6s{DugMsrDY_h$?bHuB0Z^WfYu0A7S(3M{1JVZ415Dd2in5K
zby2`N+2REa!K`am1N)8h;C{wO?{$sp`6KL=dJU>Nr=I2b7(-J<`!u;0WyCG4<PQm`
zAHoMaIXzb~*c5i>PLZnMH{b*i>Ay4|?i2KS%=uxMHTlXee@Xhij=chm7#gf+{L`d_
z6)zxJ)#uIG6s58`$*rcn7qxsp`%F2$wE!Ba%*fNdflptj42x#x@>n5&Z8b9rbZ@v8
z^<~W6b&+MX+ph})8rcY7AJAoWmxB)7o880ey+XacTrxnn$<}{%d2I){6ylt6Ho|%q
zGC}(Y-Vr3nZ{PjcSATV+ZC%CT2!Bo^f2j&Y2bnB)3MU9w7e2+VH$m!)DaOvrlTxNf
zZR=?IPD7>^RTHBr+LB5cg~4s!-*zV%HKq>!HS>92;G3}#sk9qIDvkV$d((&?Ln}27
zngh=~i+S<>eX0J|nj>k){A+Z7rUF2?37CSel>X^2!4$y=B==YfR{F9*AEl9*FA){P
zyy?voYaM-M76dN=d@Vly0)yZAyHmU~{K_Y?u94{mdBy7C1I}1{*ZJbujfvrLn;@?}
zbvYL=w=68ZuVRhnl$5nQ0mW2iCMrxl3ylK+*=)nCv>Nf1=ev|m`N69gn_0HT$uxz>
zQrU+VJuJjrOHbw=Z?+Ld?gco74NeCDTH_sg-vxmg{WFHg4)rTL51pFZKQzFYn|KU!
zbhq8QYGNLZQe<Fy2!it#*J@7}$*BkM+P5w3*)wUFut1fw%#+wv2K%A3Y})luD(UjZ
ztr1}a`orY+&g3>d!ypwg`)u~ctKqKGi{I%x&}Q?y&$};I47#|s7vJ);Lx2|eJg2cc
zbI7h8uN!CdRw&fEO~HuknpZC5xJ}!8iy`*m{lKUg&6^_vBTwGQw87_OlrvwCZN|;c
zMsu`xVHD?0YGk6`743;sOgb$y@uChDHT6w$&_=$Z6a)%<;Se7MjY2!O<~d8AYbl;Q
zCM@e1o+Wcb?}5O(IS+l`pHs`%N+H!Yj}Lm=M@b3DE)Jtbg&*D>nO<HWuXHQCK3u(g
z;sw)>HlvZ@8(K|j+NvN5cc~n>bg28DM#eAZ*XdW2)v!eVj&t(`uV#><0>%kDlKHQf
z9?Wn<>u!C}5Pa?0WH(kx|CKJ2gb2spJ{wUfc_Vg9;=>(wtaZ3lwD~uSkRUpb-|ins
z1;00o^VMHPwtzp)blkD$7jC=VxaOhlyC8aU`A6!OU^1kl`%HGFK<q;A`U-&eryF~>
z{>#2m%M%Xtx_}i4Z+UUHiOIs&lOaIVOp>33+?k743tU#N58=y$%7B;TMZ#TaOIK*h
z8M@5czQ}%z#?{`28R4FeeOG0t<j=JD{;DuWjK%0T2;S=daF$nuFP0wX6CNz8rK7mA
z!fztPcmGcAS%qxg9F-YCOW-{#RtLszIe9R|Y-!Qrt^^>a*-esB{yiMFAG`my1&{}$
zTqb=fR0R3_#)l_6`EBJq9yCZyh3+iOYA=uX+<6d)2#|00Vb?31ysx>soX(F@i$C+W
z#Nto|aAC=O(*j~dAVId2Z;xYKn^O2R<)!z&)&4Gd(<yu<R8yRFU(7%xTALGwp}d$s
z6X2eDxmuZs*+hr0!aM(}i59*C;$bI56q=I6@)Bt~QysI$b9#2zG0ZM@WxyKaV7W&{
zJsa!KJ)q%@_BeGu={zt0S;UmB8Sy##-14#w&qRze&Xo^rD8v`E{8h)$MltnykcYj&
z_@0)IZxYB)(&udINdfiK7}8OoUqa>veT`9NY9V9<<SZ3}NImP8o{2E}6Xw%`7OZ`{
zV2^QPz?Ue+0b?U}&zobSInoW{*1QjDpMU>Wu@*E8tKYXy)G;pkX*u^--I;qsVFT)h
zAVE=8d870Vd)P@&m|erTdN)SRmd}y+3-T?1qLzgi%CBq7yqU|u?U)jT?`&RO&`{KD
zxN+|+T7rPwnt9Y&;Hma2Nj?J_m$9MN@)Q_@Y*+uPSTy?Rm_TR-844;1fO8HpYi#s;
z#PE~(3hNdubo1@IRoC>u^Rj0L;J0TK7yDbUMs6u_t+i^o?E@sG@IWocuA>a^J@5Ku
zjo7YXD+4(EUIx1LZAtMSmMSzn%A0@sCqX<MmsoCu$lh0%cqI%zXZlX_INGH*=8l1$
zA3t_nV-|Dzv+jku+OX=!Q)08hmqHCC@sm`?$WDU8q}Br}OO$oA*&y=cU@<`U)~X-}
z)x4`>FuG)gDwVPtpO^`*xtpLL&vfqn99%O>H0w>1_^VavEAMKtd84o&wBifG@5o|q
zW@wv0eCG9C1eT7-c@OgQug=n+tO}6PTc1q3c3)3Dj4dRv9eWcpml9IyTs39|`qI3z
gzc)a?mGkiPpiZZC%+7gOZ{J^SEsrCw9}S@Y59Xb%+W-In

diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index a74885019..6aa6da172 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -47,7 +47,6 @@
     <string name="GalleryInfo">Bilder ohne Komprimierung senden</string>
     <!--chat view-->
     <string name="ChatGallery">Galerie</string>
-    <string name="ChatLocation">Standort</string>
     <string name="ChatVideo">Video</string>
     <string name="ChatDocument">Datei</string>
     <string name="ChatCamera">Kamera</string>
@@ -291,8 +290,6 @@
     <string name="ForwardMessagesTo">Ausgewählte Nachrichten an <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> weiterleiten?</string>
     <string name="SendMessagesTo">Nachricht an <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> senden?</string>
     <string name="AreYouSureDeleteThisChat">Chat löschen? Der Chat wird dann nicht mehr in der Chatliste angezeigt, die Nachrichten verbleiben auf dem Server.</string>
-    <string name="ShareYouLocationUnable">App kann deinen aktuellen Standort nicht bestimmen</string>
-    <string name="ShareYouLocationUnableManually">Selbst wählen</string>
     <string name="AreYouSureBlockContact">Diesen Kontakt wirklich blockieren?</string>
     <string name="AreYouSureDeleteContact">Diesen Kontakt wirklich löschen?</string>
     <string name="RaiseToSpeakAlert">Möchtest du \"Zum Sprechen ans Ohr\" für Sprachnachrichten aktivieren?</string>
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index 60ae7d239..a0fc989fb 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -44,7 +44,6 @@
     <string name="GalleryInfo">Para enviar imágenes sin compresión</string>
     <!--chat view-->
     <string name="ChatGallery">Galería</string>
-    <string name="ChatLocation">Ubicación</string>
     <string name="ChatVideo">Vídeo</string>
     <string name="ChatDocument">Archivo</string>
     <string name="ChatCamera">Cámara</string>
@@ -289,8 +288,6 @@
     <string name="ForwardMessagesTo">¿Reenviar mensajes a <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">¿Enviar mensajes a <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="AreYouSureDeleteThisChat">¿Quieres eliminar este chat?</string>
-    <string name="ShareYouLocationUnable">La aplicación no pudo determinar tu ubicación actual</string>
-    <string name="ShareYouLocationUnableManually">Elegir manualmente</string>
     <string name="AreYouSureBlockContact">¿Quieres bloquear este contacto?</string>
     <string name="AreYouSureDeleteContact">¿Quieres eliminar este contacto?</string>
     <string name="RaiseToSpeakAlert">¿Quieres habilitar “Elevar para hablar” para mensajes de voz?</string>
diff --git a/MessengerProj/src/main/res/values-fr/strings.xml b/MessengerProj/src/main/res/values-fr/strings.xml
index 9251c78e6..fd0932168 100644
--- a/MessengerProj/src/main/res/values-fr/strings.xml
+++ b/MessengerProj/src/main/res/values-fr/strings.xml
@@ -42,7 +42,6 @@
     <string name="GalleryInfo">Pour envoyer des images sans compression</string>
     <!--chat view-->
     <string name="ChatGallery">Gallerie</string>
-    <string name="ChatLocation">Localisation</string>
     <string name="ChatVideo">Vidéo</string>
     <string name="ChatDocument">Fichier</string>
     <string name="ChatCamera">Appareil photo</string>
@@ -286,8 +285,6 @@
     <string name="ForwardMessagesTo">Renvoyer les messages sélectionnés à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
     <string name="SendMessagesTo">Envoyer les messages à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
     <string name="AreYouSureDeleteThisChat">Êtes-vous sûr de vouloir supprimer cette conversation ? La conversation n\'apparaîtra plus dans la liste des conversations, mais les messages resteront sur le serveur.</string>
-    <string name="ShareYouLocationUnable">L\'application n\'a pas pu déterminer votre localisation actuelle</string>
-    <string name="ShareYouLocationUnableManually">Choisir manuellement</string>
     <string name="AreYouSureBlockContact">Êtes-vous sûr de vouloir bloquer cet utilisateur ?</string>
     <string name="AreYouSureDeleteContact">Êtes-vous sûr de vouloir supprimer cet utilisateur ?</string>
     <string name="RaiseToSpeakAlert">Voulez-vous activer le "Soulever pour parler" pour les messages vocaux ?</string>
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 898499c18..67ba74c16 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -44,7 +44,6 @@
     <string name="GalleryInfo">Per inviare immagini senza compressione</string>
     <!--chat view-->
     <string name="ChatGallery">Galleria</string>
-    <string name="ChatLocation">Posizione</string>
     <string name="ChatVideo">Video</string>
     <string name="ChatDocument">File</string>
     <string name="ChatCamera">Foto</string>
@@ -289,8 +288,6 @@
     <string name="ForwardMessagesTo">Vuoi inoltrare i messaggi a <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">Inviare i messaggi a <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="AreYouSureDeleteThisChat">Sei sicuro di voler eliminare questa chat?</string>
-    <string name="ShareYouLocationUnable">L\'app non è riuscita a determinare la tua posizione corrente</string>
-    <string name="ShareYouLocationUnableManually">Scegli manualmente</string>
     <string name="AreYouSureBlockContact">Vuoi bloccare questo contatto?</string>
     <string name="AreYouSureDeleteContact">Sei sicuro di voler eliminare questo contatto?</string>
     <string name="RaiseToSpeakAlert">Vuoi attivare \"Alza per parlare\" per i messaggi vocali?</string>
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index d0810e123..7a51cbd5b 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -44,7 +44,6 @@
     <string name="GalleryInfo">Om bestanden ongecomprimeerd te versturen</string>
     <!--chat view-->
     <string name="ChatGallery">Galerij</string>
-    <string name="ChatLocation">Locatie</string>
     <string name="ChatVideo">Video</string>
     <string name="ChatDocument">Bestand</string>
     <string name="ChatCamera">Camera</string>
@@ -289,8 +288,6 @@
     <string name="ForwardMessagesTo">Berichten doorsturen naar <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">Berichten naar <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> versturen?</string>
     <string name="AreYouSureDeleteThisChat">Chat echt verwijderen?</string>
-    <string name="ShareYouLocationUnable">Huidige locatie kon niet worden vastgesteld</string>
-    <string name="ShareYouLocationUnableManually">Handmatig kiezen</string>
     <string name="AreYouSureBlockContact">Weet je zeker dat je deze persoon wilt blokkeren?</string>
     <string name="AreYouSureDeleteContact">Contact echt verwijderen?</string>
     <string name="RaiseToSpeakAlert">Wil je \"Houd bij oor\" inschakelen voor spraakberichten?</string>
diff --git a/MessengerProj/src/main/res/values-pl/strings.xml b/MessengerProj/src/main/res/values-pl/strings.xml
index 1c3340674..51f19ba55 100644
--- a/MessengerProj/src/main/res/values-pl/strings.xml
+++ b/MessengerProj/src/main/res/values-pl/strings.xml
@@ -47,7 +47,6 @@
     <string name="GalleryInfo">Wyślij obrazki bez kompresji</string>
     <!--chat view-->
     <string name="ChatGallery">Galeria</string>
-    <string name="ChatLocation">Lokalizacja</string>
     <string name="ChatVideo">Wideo</string>
     <string name="ChatDocument">Plik</string>
     <string name="ChatCamera">Kamera</string>
@@ -291,8 +290,6 @@
     <string name="ForwardMessagesTo">Przekazać wybrane wiadomości do <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">Wysłać wiadomość do <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="AreYouSureDeleteThisChat">Usunąć ten czat? Czat nie będzie widoczny na liście czatów, wiadomości pozostaną na serwerze.</string>
-    <string name="ShareYouLocationUnable">Aplikacja nie była w stanie określić twojej aktualnej lokalizacji</string>
-    <string name="ShareYouLocationUnableManually">Wybierz ręcznie</string>
     <string name="AreYouSureBlockContact">Czy na pewno chcesz zablokować ten kontakt?</string>
     <string name="AreYouSureDeleteContact">Czy na pewno chcesz usunąć ten kontakt?</string>
     <string name="RaiseToSpeakAlert">Czy chcesz włączyć funkcję „Odbierz i mów / słuchaj” dla wiadomości głosowych?</string>
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index fdb166d2e..289c72eee 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -44,7 +44,6 @@
     <string name="GalleryInfo">Para enviar imagens sem compressão</string>
     <!--chat view-->
     <string name="ChatGallery">Galeria</string>
-    <string name="ChatLocation">Localização</string>
     <string name="ChatVideo">Vídeo</string>
     <string name="ChatDocument">Arquivo</string>
     <string name="ChatCamera">Câmera</string>
@@ -289,8 +288,6 @@
     <string name="ForwardMessagesTo">Encaminhar mensagem para <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">Enviar mensagens para <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="AreYouSureDeleteThisChat">Você tem certeza que deseja apagar esta conversa?</string>
-    <string name="ShareYouLocationUnable">O aplicativo foi impossibilitado de determinar sua localização atual.</string>
-    <string name="ShareYouLocationUnableManually">Escolher manualmente</string>
     <string name="AreYouSureBlockContact">Você tem certeza que deseja bloquear este contato?</string>
     <string name="AreYouSureDeleteContact">Você tem certeza que deseja apagar este contato?</string>
     <string name="RaiseToSpeakAlert">Gostaria de habilitar o \"Levantar para Falar\" para mensagens de voz?</string>
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index 2f7dc25ba..02a4acc7d 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -47,7 +47,6 @@
     <string name="GalleryInfo">To send images without compression</string>
     <!--chat view-->
     <string name="ChatGallery">Gallery</string>
-    <string name="ChatLocation">Location</string>
     <string name="ChatVideo">Video</string>
     <string name="ChatDocument">File</string>
     <string name="ChatCamera">Camera</string>
@@ -291,8 +290,6 @@
     <string name="ForwardMessagesTo">Forward selected messages to <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">Send messages to <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="AreYouSureDeleteThisChat">Delete this chat? The chat will no longer be shown in the chat list, the messages will stay on the server.</string>
-    <string name="ShareYouLocationUnable">App was unable to determine your current location</string>
-    <string name="ShareYouLocationUnableManually">Choose manually</string>
     <string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string>
     <string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string>
     <string name="RaiseToSpeakAlert">Would you like to enable "Raise to speak" for voice messages?</string>