Backmerge Commcare 2.60.0

app/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           android:versionCode="106"
-          android:versionName="2.61">
+          android:versionName="2.60.0">
 
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

app/res/menu/menu_connect.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_messaging"
-        android:icon="@drawable/ic_connect_messaging_base"
-        android:title="@string/personalid_messaging_menu_title"
-        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_bell"

app/res/values-es/strings.xml

@@ -209,7 +209,9 @@
     <string name="connect_register_success_message">¡Tu cuenta de PersonalId se ha creado con éxito y ahora está lista para usar!</string>
     <string name="connect_register_success_button">DE ACUERDO</string>
     <string name="connect_verify_title">Opciones de desbloqueo</string>
-    <string name="connect_verify_message">Configura un método a continuación para desbloquear tanto tu dispositivo como tu cuenta de PersonalId</string>
+    <string name="connect_verify_message">Configura un método a continuación para desbloquear tanto tu dispositivo como tu cuenta de PersonalID</string>
+    <string name="connect_verify_message_pin">Configure un PIN o patrón a continuación para desbloquear su dispositivo y su cuenta PersonalID</string>
+    <string name="connect_verify_message_fingerprint">Configure su huella digital a continuación para desbloquear tanto su dispositivo como su cuenta PersonalID</string>
     <string name="connect_verify_use_fingerprint_long">Usar huella digital para iniciar sesión</string>
     <string name="connect_verify_fingerprint_configured">Tu huella digital ya se ha configurado y se utilizará para desbloquear PersonalId.</string>
     <string name="connect_verify_configure_fingerprint">Configurar huella digital</string>

app/res/values-fr/strings.xml

@@ -271,7 +271,9 @@ License.
     <string name="connect_register_success_message">Votre compte PersonalId a été créé avec succès et est maintenant prêt à être utilisé!</string>
     <string name="connect_register_success_button">D\'ACCORD</string>
     <string name="connect_verify_title">Options de déverrouillage</string>
-    <string name="connect_verify_message">Veuillez configurer une méthode ci-dessous pour déverrouiller à la fois votre appareil et votre compte PersonalId</string>
+    <string name="connect_verify_message">Veuillez configurer une méthode ci-dessous pour déverrouiller à la fois votre appareil et votre compte PersonalID</string>
+    <string name="connect_verify_message_pin">Veuillez configurer un code PIN ou un modèle ci-dessous pour déverrouiller votre appareil et votre compte PersonalID</string>
+    <string name="connect_verify_message_fingerprint">Veuillez configurer votre empreinte digitale ci-dessous pour déverrouiller à la fois votre appareil et votre compte PersonalID</string>
     <string name="connect_verify_use_fingerprint_long">Utiliser l\'empreinte digitale pour se connecter</string>
     <string name="connect_verify_fingerprint_configured">Votre empreinte digitale a déjà été configurée et sera utilisée pour déverrouiller PersonalId.</string>
     <string name="connect_verify_configure_fingerprint">Configurer l\'empreinte digitale</string>

app/res/values-hi/strings.xml

@@ -271,9 +271,11 @@ License.
     <string name="connect_register_success_message">आपका PersonalId खाता सफलतापूर्वक बना लिया गया है और अब उपयोग के लिए तैयार है!</string>
     <string name="connect_register_success_button">ठीक है</string>
     <string name="connect_verify_title">अनलॉक विकल्प</string>
-    <string name="connect_verify_message">कृपया अपने डिवाइस और अपने PersonalId खाते दोनों को अनलॉक करने के लिए नीचे एक विधि कॉन्फ़िगर करें</string>
+    <string name="connect_verify_message">कृपया अपने डिवाइस और अपने PersonalID खाते दोनों को अनलॉक करने के लिए नीचे एक विधि कॉन्फ़िगर करें</string>
+    <string name="connect_verify_message_pin">कृपया अपने डिवाइस और पर्सनलआईडी खाते दोनों को अनलॉक करने के लिए नीचे पिन या पैटर्न कॉन्फ़िगर करें</string>
+    <string name="connect_verify_message_fingerprint">कृपया अपने डिवाइस और पर्सनलआईडी खाते दोनों को अनलॉक करने के लिए नीचे अपना फ़िंगरप्रिंट कॉन्फ़िगर करें</string>
     <string name="connect_verify_use_fingerprint_long">लॉग इन करने के लिए फ़िंगरप्रिंट का उपयोग करें</string>
-    <string name="connect_verify_fingerprint_configured">आपका फ़िंगरप्रिंट पहले ही कॉन्फ़िगर किया जा चुका है और इसका उपयोग PersonalId को अनलॉक करने के लिए किया जाएगा।</string>
+    <string name="connect_verify_fingerprint_configured">आपका फ़िंगरप्रिंट पहले ही कॉन्फ़िगर किया जा चुका है और इसका उपयोग PersonalID को अनलॉक करने के लिए किया जाएगा।</string>
     <string name="connect_verify_configure_fingerprint">फ़िंगरप्रिंट कॉन्फ़िगर करें</string>
     <string name="connect_verify_use_pin_long">लॉग इन करने के लिए पिन का उपयोग करें</string>
     <string name="connect_verify_pin_configured">आपका पिन पहले ही कॉन्फ़िगर किया जा चुका है और इसका उपयोग PersonalId को अनलॉक करने के लिए किया जाएगा।</string>

app/res/values-pt/strings.xml

@@ -276,7 +276,9 @@
     <string name="connect_register_success_message">Sua conta PersonalId foi criada com sucesso e agora está pronta para você usar!</string>
     <string name="connect_register_success_button">OK</string>
     <string name="connect_verify_title">Opções de desbloqueio</string>
-    <string name="connect_verify_message">Configure um método abaixo para desbloquear o seu dispositivo e a conta PersonalId</string>
+    <string name="connect_verify_message">Configure um método abaixo para desbloquear o seu dispositivo e a conta PersonalID</string>
+    <string name="connect_verify_message_pin">Configure um PIN ou padrão abaixo para desbloquear seu dispositivo e sua conta PersonalID</string>
+    <string name="connect_verify_message_fingerprint">Configure sua impressão digital abaixo para desbloquear seu dispositivo e sua conta PersonalID</string>
     <string name="connect_verify_use_fingerprint_long">Usar impressão digital para se conectar</string>
     <string name="connect_verify_fingerprint_configured">Sua impressão digital já foi configurada e será usada para desbloquear o PersonalId.</string>
     <string name="connect_verify_configure_fingerprint">Configurar impressão digital</string>

app/res/values-sw/strings.xml

@@ -273,7 +273,9 @@
     <string name="connect_register_success_message">Akaunti yako ya PersonalId imeundwa kwa ufanisi na sasa iko tayari kwako kuitumia!</string>
     <string name="connect_register_success_button">Sawa</string>
     <string name="connect_verify_title">Fungua Chaguzi</string>
-    <string name="connect_verify_message">Tafadhali sanidi mbinu iliyo hapa chini ili kufungua kifaa chako na akaunti ya PersonalId</string>
+    <string name="connect_verify_message">Tafadhali sanidi mbinu iliyo hapa chini ili kufungua kifaa chako na akaunti ya PersonalID</string>
+    <string name="connect_verify_message_pin">Tafadhali sanidi PIN au mchoro hapa chini ili kufungua kifaa chako na akaunti ya Kitambulisho cha Kibinafsi</string>
+    <string name="connect_verify_message_fingerprint">Tafadhali sanidi alama ya kidole chako hapa chini ili kufungua kifaa chako na akaunti ya Kitambulisho cha Kibinafsi</string>
     <string name="connect_verify_use_fingerprint_long">Tumia Alama ya Kidole Kuunganisha</string>
     <string name="connect_verify_fingerprint_configured">Alama yako ya kidole tayari imesanidiwa na itatumika kufungua PersonalId.</string>
     <string name="connect_verify_configure_fingerprint">Sanidi Alama ya Kidole</string>

app/res/values-ti/strings.xml

@@ -264,7 +264,9 @@
     <string name="connect_register_success_message">ናይ PersonalId ኣካውንትካ ብዓወት ተፈጢሩ ኣሎ፡ ኸዚ ድማ ንኽትጥቀመሉ ድሉው ኮይኑ ኣሎ!</string>
     <string name="connect_register_success_button">እሺ</string>
     <string name="connect_verify_title">ኣማራፂታት ምኽፋት።</string>
-    <string name="connect_verify_message">በይዛኻ ንኽልቲኡ መሳርሒኻን PersonalId ኣካውንትካን ንምኽፋት ኣብ ታሕቲ ዘሎ ሜላ ኣወሃህድ</string>
+    <string name="connect_verify_message">በይዛኻ ንኽልቲኡ መሳርሒኻን PersonalID ኣካውንትካን ንምኽፋት ኣብ ታሕቲ ዘሎ ሜላ ኣወሃህድ</string>
+    <string name="connect_verify_message_pin">ንኽልቲኡ መሳርሒኻን PersonalID ኣካውንትካን ንምኽፋት በጃኻ ኣብ ታሕቲ ፒን ወይ ፓተርን ኣወሃህድ</string>
+    <string name="connect_verify_message_fingerprint">ንኽልቲኡ መሳርሒኻን PersonalID ኣካውንትካን ንምኽፋት በጃኻ ኣብ ታሕቲ ኣሰር ኣጻብዕትኻ ኣወሃህቦ</string>
     <string name="connect_verify_use_fingerprint_long">ንምትእስሳር ኣሰር ኣፃብዕቲ ተጠቐም</string>
     <string name="connect_verify_fingerprint_configured">ኣሰር ኣፃብዕትኻ በቃ ተዋቒሩ ኣሎ፡ ንPersonalId ንምኽፋት ድማ ክጥቀመሉ እዩ።</string>
     <string name="connect_verify_configure_fingerprint">ኣሰር ኣፃብዕቲ ምውቃር</string>

app/res/values/strings.xml

@@ -343,7 +343,9 @@
     <string name="connect_register_success_message">Your PersonalID account has been successfully created and is now ready for you to use!</string>
     <string name="connect_register_success_button">OK</string>
     <string name="connect_verify_title">Unlock Options</string>
-    <string name="connect_verify_message">Please configure a method below to unlock both your device and PersonalId account</string>
+    <string name="connect_verify_message">Please configure a method below to unlock both your device and PersonalID account</string>
+    <string name="connect_verify_message_pin">Please configure a PIN or pattern below to unlock both your device and PersonalID account</string>
+    <string name="connect_verify_message_fingerprint">Please configure your fingerprint below to unlock both your device and PersonalID account</string>
     <string name="connect_verify_use_fingerprint_long">Use Fingerprint to Connect</string>
     <string name="connect_verify_fingerprint_configured">Your fingerprint has already been configured and will be used to unlock PersonalID.</string>
     <string name="connect_verify_configure_fingerprint">Configure Fingerprint</string>

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

@@ -23,8 +23,6 @@
 import org.commcare.core.network.AuthInfo;
 import org.commcare.core.network.AuthenticationInterceptor;
 import org.commcare.dalvik.R;
-import org.commcare.google.services.analytics.AnalyticsParamValue;
-import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.network.CommcareRequestGenerator;
 import org.commcare.preferences.GlobalPrivilegesManager;
@@ -326,7 +324,7 @@ private void saveLastSuccessfulCredentials() {
     }
 
     @Override
-    public void processClientError(int responseCode) {
+    public void processClientError(int responseCode, InputStream errorStream) {
         handleRequestError(responseCode, true);
     }
 

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

@@ -179,7 +179,7 @@ public void processSuccess(int responseCode, InputStream responseData, String ap
     }
 
     @Override
-    public void processClientError(int responseCode) {
+    public void processClientError(int responseCode, InputStream errorStream) {
         String clientErrorMessage;
         switch (responseCode) {
             case 409:

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

@@ -173,7 +173,7 @@ private boolean isResponseEmpty(ExternalDataInstance instance) {
     }
 
     @Override
-    public void processClientError(int responseCode) {
+    public void processClientError(int responseCode, InputStream errorStream) {
         enterErrorState(Localization.get("post.client.error", responseCode + ""));
     }
 

app/src/org/commcare/activities/connect/ConnectActivity.java

@@ -3,6 +3,7 @@
 import static org.commcare.connect.ConnectConstants.GO_TO_JOB_STATUS;
 import static org.commcare.connect.ConnectConstants.REDIRECT_ACTION;
 import static org.commcare.connect.ConnectConstants.SHOW_LAUNCH_BUTTON;
+import static org.commcare.personalId.PersonalIdFeatureFlagChecker.FeatureFlag.NOTIFICATIONS;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,6 +26,7 @@
 
 import com.google.common.base.Strings;
 
+import org.apache.commons.lang3.StringUtils;
 import org.commcare.activities.NavigationHostCommCareActivity;
 import org.commcare.activities.PushNotificationActivity;
 import org.commcare.android.database.connect.models.ConnectJobRecord;
@@ -36,6 +38,7 @@
 import org.commcare.connect.database.ConnectMessagingDatabaseHelper;
 import org.commcare.dalvik.R;
 import org.commcare.fragments.RefreshableFragment;
+import org.commcare.personalId.PersonalIdFeatureFlagChecker;
 import org.commcare.utils.FirebaseMessagingUtil;
 import org.commcare.views.dialogs.CustomProgressDialog;
 
@@ -94,9 +97,15 @@ private int getStartDestinationId(Bundle startArgs) {
 
     private void initStateFromExtras() {
         redirectionAction = getIntent().getStringExtra(REDIRECT_ACTION);
-        String opportunityId = getIntent().getStringExtra(ConnectConstants.OPPORTUNITY_ID);
-        if(!TextUtils.isEmpty(opportunityId)){
-            job = ConnectJobUtils.getCompositeJob(this, Integer.parseInt(opportunityId));
+        int opportunityId = getIntent().getIntExtra(ConnectConstants.OPPORTUNITY_ID, -1);
+        if (opportunityId == -1) {
+            String opportunityIdStr = getIntent().getStringExtra(ConnectConstants.OPPORTUNITY_ID);
+            if (!StringUtils.isEmpty(opportunityIdStr)) {
+                opportunityId = Integer.parseInt(opportunityIdStr);
+            }
+        }
+        if(opportunityId != -1) {
+            job = ConnectJobUtils.getCompositeJob(this, opportunityId);
         }
     }
 
@@ -120,28 +129,6 @@ private int handleSecureRedirect(Bundle startArgs) {
         return R.id.connect_unlock_fragment;
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        updateMessagingIcon();
-
-        LocalBroadcastManager.getInstance(this).registerReceiver(messagingUpdateReceiver,
-                new IntentFilter(FirebaseMessagingUtil.MESSAGING_UPDATE_BROADCAST));
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(messagingUpdateReceiver);
-    }
-
-    private final BroadcastReceiver messagingUpdateReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            updateMessagingIcon();
-        }
-    };
-
     @Override
     public void setTitle(CharSequence title) {
         super.setTitle(title);
@@ -155,16 +142,15 @@ public boolean onCreateOptionsMenu(Menu menu) {
         MenuItem notification = menu.findItem(R.id.action_sync);
         notification.getIcon().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
 
-        messagingMenuItem = menu.findItem(R.id.action_messaging);
-        updateMessagingIcon();
+        MenuItem notiificationsMenuItem = menu.findItem(R.id.action_bell);
+        notiificationsMenuItem.setVisible(PersonalIdFeatureFlagChecker.isFeatureEnabled(NOTIFICATIONS));
 
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.findItem(R.id.action_sync).setVisible(backButtonAndActionBarEnabled);
-        menu.findItem(R.id.action_messaging).setVisible(backButtonAndActionBarEnabled);
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -177,27 +163,11 @@ public void setActiveJob(ConnectJobRecord job) {
 
     private void retrieveMessages(){
         MessageManager.retrieveMessages(this, success -> {
-            updateMessagingIcon();
         });
     }
 
-    public void updateMessagingIcon() {
-        if(messagingMenuItem != null) {
-            int icon = R.drawable.ic_connect_messaging_base;
-            if(ConnectMessagingDatabaseHelper.getUnviewedMessages(this).size() > 0) {
-                icon = R.drawable.ic_connect_messaging_unread;
-            }
-            messagingMenuItem.setIcon(ResourcesCompat.getDrawable(getResources(), icon, null));
-        }
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.action_messaging) {
-            ConnectNavHelper.INSTANCE.goToMessaging(this);
-            return true;
-        }
-
         if (item.getItemId() == R.id.action_bell) {
             ConnectNavHelper.goToNotification(this);
             return true;

app/src/org/commcare/adapters/EntityStringFilterer.java

@@ -74,7 +74,9 @@ protected void filter() {
                         String.valueOf(StringUtils.getSumOfLengths(searchTerms)));
                 attrs.put(CCPerfMonitoring.ATTR_NUM_CASES_LOADED, String.valueOf(fullEntityList.size()));
                 CCPerfMonitoring.INSTANCE.stopTracing(trace, attrs);
-            } catch (Exception ignored) {}
+            } catch (Exception e) {
+                Logger.exception("Failed to stop tracing ", e);
+            }
         }
 
         long time = System.currentTimeMillis() - startTime;

app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java

@@ -567,7 +567,7 @@ public int numberOfDeliveriesToday() {
         int dailyVisitCount = 0;
         Date today = new Date();
         for (ConnectJobDeliveryRecord record : deliveries) {
-            if(DateUtils.dateDiff(today, record.getDate()) == 0 && record.getStatus().equals(STATUS_APPROVED)) {
+            if(DateUtils.dateDiff(today, record.getDate()) == 0) {
                 dailyVisitCount++;
             }
         }