fix crash in location activities

1 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java
index bb950a21e..f6c174a2f 100644
--- a/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java
@@ -155,15 +155,14 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback
             Geocoder geoCoder = new Geocoder(context, Locale.getDefault());
             try {
                 List<Address> addresses = geoCoder.getFromLocation(latitude, longitude, 1);
-                if (addresses != null) {
+                if (addresses != null && addresses.size() > 0) {
                     Address Address = addresses.get(0);
                     StringBuilder strAddress = new StringBuilder("");
-                    for (int i = 0; i < Address.getMaxAddressLineIndex(); i++) {
-                        strAddress.append(Address.getAddressLine(i)).append("\n");
-                    }
-                    address = strAddress.toString();
-                    address = address.substring(0, address.length() - 1); //trim last \n
 
+                    if (Address.getAddressLine(0).length() > 0) {
+                        strAddress.append(Address.getAddressLine(0));
+                    }
+                    address = strAddress.toString().replace(", ", "\n");
                 }
             } catch (Exception e) {
                 e.printStackTrace();