1 files changed, 99 insertions, 145 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java
index 27e48c0d3..67641238d 100644
--- a/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java
@@ -9,67 +9,33 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.Address;
 import android.location.Geocoder;
+import android.location.Location;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
+import android.webkit.WebView;
 import android.widget.Toast;
 
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapFragment;
-import com.google.android.gms.maps.OnMapReadyCallback;
-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.jetbrains.annotations.Nullable;
 
+import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
 
-import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 import de.pixart.messenger.services.EmojiService;
 
 import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
 
-public class ShowLocationActivity extends Activity implements OnMapReadyCallback {
-
-    private GoogleMap mGoogleMap;
-    private LatLng mLocation;
+public class ShowLocationActivity extends Activity {
+    private Location location;
     private String mLocationName;
-    private MarkerOptions options;
-    private Marker marker;
-
-    class InfoWindowAdapter implements GoogleMap.InfoWindowAdapter {
-
-        private final View InfoWindow;
-
-        InfoWindowAdapter() {
-            InfoWindow = getLayoutInflater().inflate(R.layout.show_location_infowindow, null);
-        }
-
-        @Override
-        public View getInfoWindow(Marker marker) {
-            return null;
-        }
-
-        @Override
-        public View getInfoContents(Marker marker) {
-
-            TextView Title = InfoWindow.findViewById(R.id.title);
-            Title.setText(marker.getTitle());
-            TextView Snippet = InfoWindow.findViewById(R.id.snippet);
-            Snippet.setText(marker.getSnippet());
-
-            return InfoWindow;
-        }
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -80,46 +46,8 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback
             getActionBar().setHomeButtonEnabled(true);
             getActionBar().setDisplayHomeAsUpEnabled(true);
         }
-
         setContentView(R.layout.activity_show_locaction);
-        MapFragment fragment = (MapFragment) getFragmentManager().findFragmentById(R.id.map_fragment);
-        fragment.getMapAsync(this);
-    }
-
-    protected SharedPreferences getPreferences() {
-        return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.action_navigate:
-                double longitude = mLocation.longitude;
-                double latitude = mLocation.latitude;
-                try {
-                    Intent intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("geo:" + String.valueOf(latitude) + "," + String.valueOf(longitude)));
-                    startActivity(intent);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(this, R.string.no_application_found_to_display_location, Toast.LENGTH_SHORT).show();
-                }
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.showlocation, menu);
-        return true;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
         Intent intent = getIntent();
 
         this.mLocationName = intent != null ? intent.getStringExtra("name") : null;
@@ -127,39 +55,59 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback
         if (intent != null && intent.hasExtra("longitude") && intent.hasExtra("latitude")) {
             double longitude = intent.getDoubleExtra("longitude", 0);
             double latitude = intent.getDoubleExtra("latitude", 0);
-            this.mLocation = new LatLng(latitude, longitude);
-            if (this.mGoogleMap != null) {
-                markAndCenterOnLocation(this.mLocation, this.mLocationName);
-            }
+            this.location = new Location("");
+            this.location.setLatitude(latitude);
+            this.location.setLongitude(longitude);
         }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
 
-    @Override
-    public void onMapReady(GoogleMap googleMap) {
-        this.mGoogleMap = googleMap;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
                     || checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-                this.mGoogleMap.setBuildingsEnabled(true);
-                this.mGoogleMap.setMyLocationEnabled(true);
+                markAndCenterOnLocation(location);
             }
         } else {
-            this.mGoogleMap.setBuildingsEnabled(true);
-            this.mGoogleMap.setMyLocationEnabled(true);
+            markAndCenterOnLocation(location);
         }
-        if (this.mLocation != null) {
-            this.markAndCenterOnLocation(this.mLocation, this.mLocationName);
+    }
+
+    private void markAndCenterOnLocation(final Location location) {
+        double longitude = location.getLongitude();
+        double latitude = location.getLatitude();
+        if (latitude != 0 && longitude != 0) {
+            new getAddressAsync(this).execute();
         }
     }
+    private class getAddressAsync extends AsyncTask<Void, Void, Void> {
+        String address = null;
+
+        private WeakReference<ShowLocationActivity> activityReference;
+
+        getAddressAsync(ShowLocationActivity context) {
+            activityReference = new WeakReference<>(context);
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            showLocation(location, null);
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            address = getAddress(ShowLocationActivity.this, location);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            super.onPostExecute(result);
+            showLocation(location, address);
+        }
+    };
 
-    private static String getAddress(Context context, LatLng location) {
-        double longitude = location.longitude;
-        double latitude = location.latitude;
+    private static String getAddress(Context context, Location location) {
+        double longitude = location.getLongitude();
+        double latitude = location.getLatitude();
         String address = "";
         if (latitude != 0 && longitude != 0) {
             Geocoder geoCoder = new Geocoder(context, Locale.getDefault());
@@ -172,7 +120,7 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback
                     if (Address.getAddressLine(0).length() > 0) {
                         strAddress.append(Address.getAddressLine(0));
                     }
-                    address = strAddress.toString().replace(", ", "\n");
+                    address = strAddress.toString().replace(", ", "<br>");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -181,52 +129,58 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback
         return address;
     }
 
-    private void markAndCenterOnLocation(final LatLng location, String name) {
-        mGoogleMap.clear();
-        options = new MarkerOptions();
-        options.position(location);
-        double longitude = mLocation.longitude;
-        double latitude = mLocation.latitude;
-        mGoogleMap.setInfoWindowAdapter(new InfoWindowAdapter());
-        if (name != null) {
-            options.title(name);
-        }
-        if (latitude != 0 && longitude != 0) {
-            new AsyncTask<Void, Void, Void>() {
-                String address = null;
-
-                @Override
-                protected void onPreExecute() {
-                    super.onPreExecute();
-                    marker = mGoogleMap.addMarker(options);
-                    marker.showInfoWindow();
-                    mGoogleMap.animateCamera(CameraUpdateFactory.newLatLngZoom(location, Config.DEFAULT_ZOOM));
-                }
 
-                @Override
-                protected Void doInBackground(Void... params) {
-                    address = getAddress(ShowLocationActivity.this, location);
-                    return null;
-                }
+    protected SharedPreferences getPreferences() {
+        return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    }
 
-                @Override
-                protected void onPostExecute(Void result) {
-                    super.onPostExecute(result);
-                    marker.remove();
-                    options.snippet(String.valueOf(address));
-                    marker = mGoogleMap.addMarker(options);
-                    marker.showInfoWindow();
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.action_navigate:
+                double longitude = location.getLongitude();
+                double latitude = location.getLatitude();
+                try {
+                    Intent intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("geo:" + String.valueOf(latitude) + "," + String.valueOf(longitude)));
+                    startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(this, R.string.no_application_found_to_display_location, Toast.LENGTH_SHORT).show();
                 }
-            }.execute();
+                return true;
         }
+        return super.onOptionsItemSelected(item);
+    }
 
-        mGoogleMap.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
-            @Override
-            public void onMapClick(LatLng latLng) {
-                if (marker != null) {
-                    marker.showInfoWindow();
-                }
-            }
-        });
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.showlocation, menu);
+        return true;
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
+
+    private void showLocation (@Nullable Location location, @Nullable String address) {
+        if (location == null && TextUtils.isEmpty(address)) { // no location and no address available
+            final WebView webView = findViewById(R.id.webView);
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.loadUrl("file:///android_asset/map.html");
+        } else if (location != null && TextUtils.isEmpty(address)) { // location but no address available
+            String LocationName = "<b>" + mLocationName + "</b>";
+            final WebView webView = findViewById(R.id.webView);
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.loadUrl("file:///android_asset/map.html?lat=" + location.getLatitude() + "&lon=" + location.getLongitude()+ "&name=" + LocationName);
+        } else if (location != null && !TextUtils.isEmpty(address)) { // location and address available
+            String LocationName = "<b>" + mLocationName + "</b><br>" + address;
+            final WebView webView = findViewById(R.id.webView);
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.loadUrl("file:///android_asset/map.html?lat=" + location.getLatitude() + "&lon=" + location.getLongitude() + "&name=" + LocationName);
+        }
     }
-}
+}
\ No newline at end of file