app/build.gradle

@@ -10,7 +10,7 @@ android {
         applicationId "com.uam.wmi.findmytutor"
         minSdkVersion 22
         targetSdkVersion 27
-        versionCode 33
+        versionCode 34
         versionName "0.9.6-beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java

@@ -150,22 +150,7 @@ public class MapActivity extends BaseActivity
 
         mapboxMap.setOnMarkerClickListener(marker -> {
             String id = markerUserHash.get(marker.getId());
-            String locationLevel = PrefUtils.getLocationLevel(getApplicationContext());
-
-         /*   if (id.equals(myId) && (locationLevel.equals(SharingLevel.MANUAL.toString()) || locationLevel.equals(SharingLevel.PREDEFINED.toString()))) {
-                selectLocationButton.setVisibility(View.GONE);
-                removeLocationButton.setVisibility(View.VISIBLE);
-
-                removeLocationButton.setOnClickListener(view -> {
-                    stopBackgroundLocalizationTask();
-
-                    removeLocationButton.setVisibility(View.GONE);
-                    Toast.makeText(MapActivity.this, R.string.manual_marker_info, Toast.LENGTH_SHORT).show();
-
-                });
-            } else {*/
             createMarkerModal(id);
-       /*     }*/
 
             return true;
         });
@@ -248,7 +233,11 @@ public class MapActivity extends BaseActivity
     }
 
     private void setOnMapClickListener() {
-        mapboxMap.addOnMapClickListener(e -> removeLocationButton.setVisibility(View.GONE));
+
+        mapboxMap.addOnMapClickListener(e -> {
+            removeLocationButton.setVisibility(View.GONE);
+            selectLocationButton.setVisibility(View.GONE);
+        });
     }
 
     private void setOnMapLongClickListener() {