Pm Dummy PR

app/assets/locales/android_translatable_strings.txt

@@ -363,13 +363,15 @@ select.detail.bypass=Done
 select.address.show=Show Address
 select.menu.sort=Sort By...
 select.menu.map=View on Map
+select.menu.scan=Scan Barcode
 select.menu.settings=Settings
 select.detail.title=Details
 select.list.title=Select
 select.detail.callout.title=Select phone number action
 select.detail.callout.call=Call
 select.detail.callout.sms=Send SMS
 
+
 home.logged.in.message=Logged In: ${0}
 notification.logged.in=Logged Into ${0}
 

app/res/drawable-anydpi/ic_marker.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>

app/src/org/commcare/activities/EntitySelectActivity.java

@@ -705,8 +705,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, MENU_SORT, MENU_SORT, Localization.get("select.menu.sort")).setIcon(
                 android.R.drawable.ic_menu_sort_alphabetically);
         if (isMappingEnabled) {
-            menu.add(0, MENU_MAP, MENU_MAP, Localization.get("select.menu.map")).setIcon(
-                    android.R.drawable.ic_menu_mapmode);
+            menu.add(0, MENU_MAP, MENU_MAP, Localization.get("select.menu.scan")).setIcon(
+                   R.drawable.startup_barcode);
         }
 
         if (entitySelectSearchUI != null) {
@@ -743,6 +743,9 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         menu.findItem(MENU_SORT).setEnabled(adapter != null);
         // hide sorting menu when using async loading strategy
         menu.findItem(MENU_SORT).setVisible((shortSelect == null || shortSelect.hasSortField()));
+        if(isMappingEnabled) {
+            menu.findItem(R.id.barcode_scan_action_bar).setIcon(R.drawable.ic_marker);
+        }
 
         if (menu.findItem(R.id.menu_settings) != null) {
             // For the same reason as in onCreateOptionsMenu(), we may be trying to call this
@@ -763,14 +766,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 createSortMenu();
                 return true;
             case MENU_MAP:
-                Intent i = new Intent(this,
-                        HiddenPreferences.shouldUseMapboxMap() ? EntityMapboxActivity.class : EntityMapActivity.class);
-                this.startActivityForResult(i, MAP_SELECT);
+                barcodeScanOnClickListener.onClick(null);
                 return true;
             // handling click on the barcode scanner's actionbar
             // trying to set the onclicklistener in its view in the onCreateOptionsMenu method does not work because it returns null
             case R.id.barcode_scan_action_bar:
-                barcodeScanOnClickListener.onClick(null);
+                if(isMappingEnabled){
+                    Intent intent = new Intent(this,
+                            HiddenPreferences.shouldUseMapboxMap() ? EntityMapboxActivity.class : EntityMapActivity.class);
+                    this.startActivityForResult(intent, MAP_SELECT);
+                }else {
+                    barcodeScanOnClickListener.onClick(null);
+                }
                 return true;
             // this is needed because superclasses do not implement the menu_settings click
             case R.id.menu_settings:

app/src/org/commcare/activities/LoginActivity.java

@@ -85,7 +85,6 @@ public class LoginActivity extends CommCareActivity<LoginActivity>
     public final static String KEY_LAST_APP = "id-last-seated-app";
     public final static String KEY_ENTERED_USER = "entered-username";
     public final static String KEY_ENTERED_PW_OR_PIN = "entered-password-or-pin";
-
     private static final int SEAT_APP_ACTIVITY = 0;
     public final static String USER_TRIGGERED_LOGOUT = "user-triggered-logout";
 

app/src/org/commcare/gis/EntityMapActivity.java

@@ -1,15 +1,20 @@
 package org.commcare.gis;
 
+import static org.commcare.views.EntityView.FORM_IMAGE;
+
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.util.Pair;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptor;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.Marker;
@@ -20,8 +25,11 @@
 import org.commcare.activities.EntityDetailActivity;
 import org.commcare.cases.entity.Entity;
 import org.commcare.dalvik.R;
+import org.commcare.preferences.HiddenPreferences;
 import org.commcare.suite.model.Detail;
+import org.commcare.suite.model.DetailField;
 import org.commcare.suite.model.EntityDatum;
+import org.commcare.utils.MediaUtil;
 import org.commcare.utils.SerializationUtil;
 import org.commcare.views.UserfacingErrorHandling;
 import org.javarosa.core.model.data.GeoPointData;
@@ -39,12 +47,16 @@
 public class EntityMapActivity extends CommCareActivity implements OnMapReadyCallback,
         GoogleMap.OnInfoWindowClickListener {
     private static final int MAP_PADDING = 50;  // Number of pixels to pad bounding region of markers
+    private static final int DEFAULT_MARKER_SIZE = 120;
 
     private final Vector<Pair<Entity<TreeReference>, LatLng>> entityLocations = new Vector<>();
     private final HashMap<Marker, TreeReference> markerReferences = new HashMap<>();
 
     private GoogleMap mMap;
 
+    // keeps track of detail field index that should be used to show a custom icon
+    private int imageFieldIndex = -1;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -71,6 +83,7 @@ private void addEntityData() {
         if (selectDatum != null) {
             Detail detail = CommCareApplication.instance().getCurrentSession()
                     .getDetail(selectDatum.getShortDetail());
+            evalImageFieldIndex(detail);
             for (Entity<TreeReference> entity : EntityMapUtils.getEntities(detail, selectDatum.getNodeset())) {
                 for (int i = 0; i < detail.getHeaderForms().length; ++i) {
                     GeoPointData data = EntityMapUtils.getEntityLocation(entity, detail, i);
@@ -83,54 +96,79 @@ private void addEntityData() {
         }
     }
 
+    private void evalImageFieldIndex(Detail detail) {
+        DetailField[] fields = detail.getFields();
+        for (int i = 0; i < fields.length; i++) {
+            if (fields[i].getTemplateForm().equals(FORM_IMAGE)) {
+                imageFieldIndex = i;
+                break;
+            }
+        }
+    }
+
     @Override
     public void onMapReady(final GoogleMap map) {
         mMap = map;
 
         if (entityLocations.size() > 0) {
+            boolean showCustomMapMarker = HiddenPreferences.shouldShowCustomMapMarker();
             LatLngBounds.Builder builder = new LatLngBounds.Builder();
             // Add markers to map and find bounding region
             for (Pair<Entity<TreeReference>, LatLng> entityLocation : entityLocations) {
-                Marker marker = mMap.addMarker(new MarkerOptions()
+                MarkerOptions markerOptions = new MarkerOptions()
                         .position(entityLocation.second)
                         .title(entityLocation.first.getFieldString(0))
-                        .snippet(entityLocation.first.getFieldString(1)));
+                        .snippet(entityLocation.first.getFieldString(1));
+                if (showCustomMapMarker) {
+                    markerOptions.icon(getEntityIcon(entityLocation.first));
+                }
+                Marker marker = mMap.addMarker(markerOptions);
                 markerReferences.put(marker, entityLocation.first.getElement());
                 builder.include(entityLocation.second);
             }
             final LatLngBounds bounds = builder.build();
 
             // Move camera to be include all markers
-            mMap.setOnMapLoadedCallback(() -> mMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, MAP_PADDING)));
+            mMap.setOnMapLoadedCallback(
+                    () -> mMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, MAP_PADDING)));
         }
 
         mMap.setOnInfoWindowClickListener(this);
+        setMapLocationEnabled(true);
+    }
 
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-            mMap.setMyLocationEnabled(true);
+    private BitmapDescriptor getEntityIcon(Entity<TreeReference> entity) {
+        if (imageFieldIndex != -1) {
+            String jrUri = String.valueOf(entity.getData()[imageFieldIndex]);
+            Bitmap bitmap = MediaUtil.inflateDisplayImage(this, jrUri, DEFAULT_MARKER_SIZE, DEFAULT_MARKER_SIZE,
+                    true);
+            if (bitmap != null) {
+                return BitmapDescriptorFactory.fromBitmap(bitmap);
+            }
         }
+        return null;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-
-        if (mMap != null && (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED)) {
-            mMap.setMyLocationEnabled(true);
-        }
+        setMapLocationEnabled(true);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
+        setMapLocationEnabled(false);
+    }
 
+    private void setMapLocationEnabled(boolean enabled) {
         if (mMap != null) {
-            mMap.setOnMapLoadedCallback(null);  // Avoid memory leak in callback
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-                    || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-                mMap.setMyLocationEnabled(false);
+            boolean fineLocationPermission = ContextCompat.checkSelfPermission(this,
+                    Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+            boolean coarseLocationPermission = ContextCompat.checkSelfPermission(this,
+                    Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+            if (fineLocationPermission || coarseLocationPermission) {
+                mMap.setMyLocationEnabled(enabled);
             }
         }
     }

app/src/org/commcare/preferences/HiddenPreferences.java

@@ -110,6 +110,8 @@ public class HiddenPreferences {
     public final static String DONT_SHOW_PENDING_SYNC_DIALOG = "dont-show-pending-sync-dialog";
     private static final String ENABLE_BACKGROUND_SYNC = "cc-enable-background-sync";
 
+    private static final String ENABLE_CUSTOM_MAP_MARKER = "cc-enable-custom-map-marker";
+
     /**
      * The domain name in the application profile file comes in the <domain>.commcarehq.org form,
      * this is standard across the different HQ servers. This constant is to store that suffix and
@@ -435,6 +437,11 @@ public static boolean shouldShowUnsentFormsWhenZero() {
         return properties.getString(SHOW_UNSENT_FORMS_WHEN_ZERO, PrefValues.NO).equals(PrefValues.YES);
     }
 
+    public static boolean shouldShowCustomMapMarker() {
+        SharedPreferences properties = CommCareApplication.instance().getCurrentApp().getAppPreferences();
+        return properties.getString(ENABLE_CUSTOM_MAP_MARKER, PrefValues.NO).equals(PrefValues.YES);
+    }
+
 
     public static boolean preUpdateSyncNeeded() {
         SharedPreferences properties = CommCareApplication.instance().getCurrentApp().getAppPreferences();

app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java

@@ -361,6 +361,8 @@ public class FormStorageTest {
             // Added in 2.55
             , "org.javarosa.core.model.FormIndex"
             , "org.commcare.models.database.InterruptedFormState"
+            , "org.javarosa.xpath.expr.XPathClosestPolygonPointFunc"
+            , "org.javarosa.xpath.expr.XPathPointInsidePolygon"
     );