[2016] Don't repeatedly attempt login with an incorrect password

.gitignore

@@ -44,3 +44,6 @@ local.properties
 .classpath
 .settings
 .project
+
+# OpenMRS password file.
+.openmrs_password

app/build.gradle

@@ -32,6 +32,11 @@ android {
         preDexLibraries = false
         javaMaxHeapSize = '4g'
     }
+
+    // Enable multidex support.
+    defaultConfig {
+        multiDexEnabled true
+    }
 }
 dependencies {
     // Build plugins
@@ -44,10 +49,9 @@ dependencies {
     compile project(':third_party:odkcollect')
 
     // External dependencies
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:support-annotations:22.2.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-annotations:23.1.1'
     compile 'com.google.code.gson:gson:2.3' // JSON parser
-    compile 'com.google.guava:guava:18.0' // Google common libraries
     compile 'com.jakewharton:butterknife:5.1.2' // View injection
     compile 'com.mcxiaoke.volley:library:1.0.6' // HTTP framework
     compile 'com.joanzapata.android:android-iconify:1.0.8' // Font-based icons
@@ -59,9 +63,14 @@ dependencies {
     compile 'com.mitchellbosecke:pebble:1.5.1' // HTML templating
     compile 'org.slf4j:slf4j-simple:1.7.12' // HTML templating dependency
     compile 'org.apache.commons:commons-lang3:3.4'
+    // Magic sliding panel that we use for the notes view.
+    compile 'com.sothree.slidinguppanel:library:3.2.1'
 
     // Testing
     androidTestCompile 'com.android.support.test:runner:0.3'
+    // Explicitly add this dep at 23.1.1, because the above entry depends on 22.2.0, and the
+    // discrepancy can introduce differences in behaviour between prod and test.
+    androidTestCompile 'com.android.support:support-annotations:23.1.1'
     // Espresso
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
     androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2'
@@ -71,6 +80,11 @@ dependencies {
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.0'
     androidTestCompile 'org.mockito:mockito-core:1.9.5'
+
+    // Multidex.
+    // NOTE: This is temporary only! See https://slack-files.com/T02T5LNM4-F0JQ1UDRV-716ebe431f
+    // for more information.
+    compile 'com.android.support:multidex:1.0.1'
 }
 
 apply plugin: 'spoon'
@@ -170,8 +184,11 @@ logger.info("Default package server root URL: ${packageServerRootUrl}")
 logger.info("Database encryption password: ${encryptionPassword}")
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+    // TODO: Port the various health checks to use HttpURLConnection instead and remove this
+    // dependency.
+    useLibrary 'org.apache.http.legacy'
 
     sourceSets.main {
         jniLibs.srcDir 'libs'
@@ -231,6 +248,8 @@ android {
         exclude 'META-INF/NOTICE.txt'
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
+        exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
     }
 
     lintOptions {

app/src/androidTest/java/org/projectbuendia/client/ui/chart/PatientChartControllerTest.java

@@ -107,6 +107,7 @@ public void testPatientDetailsLoaded_SetsObservationsOnUi() {
         verify(mMockUi).updateTilesAndGrid(
             null, recentObservations, allObservations, ImmutableList.<Order> of(), null, null);
         verify(mMockUi).updateAdmissionDateAndFirstSymptomsDateUi(null, null);
+        verify(mMockUi).updateWeightUi(recentObservations);
         verify(mMockUi).updateEbolaPcrTestResultUi(recentObservations);
         verify(mMockUi).updatePregnancyAndIvStatusUi(recentObservations);
     }

app/src/androidTest/java/org/projectbuendia/client/ui/dialogs/EditPatientDialogFragmentTest.java

@@ -59,7 +59,7 @@ public void testNewPatient() {
 
         // The symptom onset date should not be assigned a default value.
         expectVisible(viewThat(
-            hasAncestorThat(withId(R.id.attribute_symptoms_onset_days)),
+            hasAncestorThat(withId(R.id.attribute_weight)),
             hasText("–")));
 
         // The admission date should be visible right after adding a patient.

app/src/main/assets/chart.css

@@ -70,6 +70,15 @@ th, td {
   font-size: 1.9rem;
   padding-bottom: 3.8rem;
   font-weight: bold;
+  overflow: visible;
+}
+/*
+HACK: freezepanes.js puts a div inside our th, which (because of the rest of our CSS) triggers
+overflow: hidden. We don't want this for command buttons, because they're usually rows, so we
+explicitly turn it on for the div inside "command" cells.
+*/
+#grid th[scope="row"].command > div {
+  overflow: visible;
 }
 
 /* Tiles */

app/src/main/assets/chart.html

@@ -18,7 +18,14 @@
         {% set values = tile.points | values %}
         {% set class = values | format_values(tile.item.cssClass) %}
         {% set style = values | format_values(tile.item.cssStyle) %}
-        <td id="tile-{{id}}" class="tile concept-{{id}} {{class}}" onclick="od('{{tile.item.conceptUuids[0]}}','','');" style="{{style}}" width="{{100.0 / tileRow.size}}%">
+        <td
+          id="tile-{{id}}"
+          class="tile concept-{{id}} {{class}}"
+          {% if tile.item.conceptUuids.size == 1 %}
+            onclick="od('{{tile.item.conceptUuids[0] }}','','');"
+          {% endif %}
+          style="{{style}}"
+          width="{{100.0 / tileRow.size}}%" >
           <div class="heading">{{tile.item.label}}</div>
           <div class="value">{{values | format_values(tile.item.format) | line_break_html | raw}}</div>
           <div class="caption">{{values | format_values(tile.item.captionFormat) | line_break_html | raw}}</div>
@@ -49,7 +56,7 @@
     <tbody>
       <tr>
         <th scope="rowgroup">
-          Observations
+          {{ string_resource("observations") }}
         </th>
         {% for column in columns %}
           {% if prevColumn is not null and column.start != prevColumn.stop %}
@@ -77,6 +84,8 @@
             {% set class = summaryValue | format_values(row.item.cssClass) %}
             {% set style = summaryValue | format_values(row.item.cssStyle) %}
             <td id="cell-{{id}}-{{column.start.millis}}"
+              data-start="{{column.start.millis}}"
+              data-stop="{{column.stop.millis}}"
               class="{{column.start == nowColumnStart ? 'now' : ''}} {{class}}"
               style="{{style}}"
               onclick="{% if points is not empty%}
@@ -97,14 +106,22 @@
             {% endif %}
           </td>
           {% endfor %}
+          <script>
+            // Hides the row if not required and no observation is recorded.
+            if (!{{row.item.required}}) {
+              if (isRowEmpty(document.currentScript.parentNode)) {
+                document.currentScript.parentNode.style.display = 'none';
+              }
+            }
+          </script>
         </tr>
       {% endfor %}
     </tbody>
 
     <tbody>
       <tr>
         <th scope="rowgroup">
-          Treatment Plan
+          {{ string_resource("treatment_plan_title") }}
         </th>
         {% for column in columns %}
           {% if prevColumn is not null and column.start != prevColumn.stop %}
@@ -118,7 +135,8 @@
         <tr class="order">
           <th scope="row" onclick="controller.onOrderHeadingPressed('{{order.uuid}}')">
             <div class="medication">{{order.medication}}</div>
-            <div>{{order.dosage}}&nbsp;</div>
+            <!-- TODO: make string_resource take format strings and args so we don't need to manually concatenate like this. -->
+            <div>{{order.dosage}}&nbsp;{{order.frequency != null ? order.frequency + string_resource("times_daily") : ''}}</div>
           </th>
           {% set previousActive = false %}
           {% set future = false %}
@@ -148,7 +166,7 @@
 
       <tr>
         <th scope="row" class="command" onclick="controller.onNewOrderPressed()">
-          Add a New Treatment
+          {{ string_resource("treatment_add_new") }}
         </th>
       </tr>
     </tbody>

app/src/main/assets/chart.js

@@ -1,3 +1,13 @@
+function isRowEmpty(parentNode) {
+  var rowEmpty = true;
+  $(parentNode).find('td').each(function(index, element) {
+    var innerHtml = element.innerHTML.trim();
+    if ( innerHtml != "" ) {
+      rowEmpty = false;
+    }
+  });
+  return rowEmpty;
+}
 
 function popup(name, pairs) {
   // var dialog = document.getElementById('obs-dialog');

app/src/main/java/org/projectbuendia/client/App.java

@@ -12,7 +12,9 @@
 package org.projectbuendia.client;
 
 import android.app.Application;
+import android.content.Context;
 import android.preference.PreferenceManager;
+import android.support.multidex.MultiDex;
 
 import com.facebook.stetho.Stetho;
 
@@ -85,6 +87,13 @@ public static synchronized OpenMrsConnectionDetails getConnectionDetails() {
         mHealthMonitor.start();
     }
 
+    @Override
+    public void attachBaseContext(Context base) {
+        // Set up Multidex.
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
     public void inject(Object obj) {
         mObjectGraph.inject(obj);
     }

app/src/main/java/org/projectbuendia/client/diagnostics/BuendiaApiHealthCheck.java

@@ -71,6 +71,8 @@ public class BuendiaApiHealthCheck extends HealthCheck {
     private Handler mHandler;
     private BuendiaModuleHealthCheckRunnable mRunnable;
 
+    private boolean httpUnauthorized;
+
     BuendiaApiHealthCheck(
         Application application,
         OpenMrsConnectionDetails connectionDetails) {
@@ -118,6 +120,20 @@ protected int getCheckPeriodMillis() {
             ? CHECK_PERIOD_MS : FAST_CHECK_PERIOD_MS;
     }
 
+    @Override
+    public boolean isApiUnavailable() {
+        // Prevents continued http request attempts after a 401 http error.
+        return httpUnauthorized;
+    }
+
+    /** Clears all the issues for this health check. */
+    @Override
+    public void clear() {
+        // Back to original state.
+        httpUnauthorized = false;
+    }
+
+
     private class BuendiaModuleHealthCheckRunnable implements Runnable {
         public final AtomicBoolean isRunning;
 
@@ -142,32 +158,38 @@ public BuendiaModuleHealthCheckRunnable(Handler handler) {
                 }
 
                 try {
-                    httpGet.addHeader(BasicScheme.authenticate(
-                        new UsernamePasswordCredentials(
-                            mConnectionDetails.getUser(),
-                            mConnectionDetails.getPassword()),
-                        "UTF-8", false));
-                    HttpResponse httpResponse = httpClient.execute(httpGet);
-                    if (httpResponse.getStatusLine().getStatusCode() != HttpURLConnection.HTTP_OK) {
-                        LOG.w("The OpenMRS URL '%1$s' returned unexpected error code: %2$s",
-                            uri, httpResponse.getStatusLine().getStatusCode());
-                        switch (httpResponse.getStatusLine().getStatusCode()) {
-                            case HttpURLConnection.HTTP_INTERNAL_ERROR:
-                                reportIssue(HealthIssue.SERVER_INTERNAL_ISSUE);
-                                break;
-                            case HttpURLConnection.HTTP_FORBIDDEN:
-                            case HttpURLConnection.HTTP_UNAUTHORIZED:
-                                reportIssue(HealthIssue.SERVER_AUTHENTICATION_ISSUE);
-                                break;
-                            case HttpURLConnection.HTTP_NOT_FOUND:
-                            default:
-                                reportIssue(HealthIssue.SERVER_NOT_RESPONDING);
-                                break;
-                        }
-                        if (hasIssue(HealthIssue.SERVER_HOST_UNREACHABLE)){
-                            resolveIssue(HealthIssue.SERVER_HOST_UNREACHABLE);
-                        }
+                    if (httpUnauthorized) {
+                        reportIssue(HealthIssue.SERVER_AUTHENTICATION_ISSUE);
                         return;
+                    } else {
+                        httpGet.addHeader(BasicScheme.authenticate(
+                            new UsernamePasswordCredentials(
+                                mConnectionDetails.getUser(),
+                                mConnectionDetails.getPassword()),
+                            "UTF-8", false));
+                        HttpResponse httpResponse = httpClient.execute(httpGet);
+                        if (httpResponse.getStatusLine().getStatusCode() != HttpURLConnection.HTTP_OK) {
+                            LOG.w("The OpenMRS URL '%1$s' returned unexpected error code: %2$s",
+                                uri, httpResponse.getStatusLine().getStatusCode());
+                            switch (httpResponse.getStatusLine().getStatusCode()) {
+                                case HttpURLConnection.HTTP_INTERNAL_ERROR:
+                                    reportIssue(HealthIssue.SERVER_INTERNAL_ISSUE);
+                                    break;
+                                case HttpURLConnection.HTTP_FORBIDDEN:
+                                case HttpURLConnection.HTTP_UNAUTHORIZED:
+                                    httpUnauthorized = true;
+                                    reportIssue(HealthIssue.SERVER_AUTHENTICATION_ISSUE);
+                                    break;
+                                case HttpURLConnection.HTTP_NOT_FOUND:
+                                default:
+                                    reportIssue(HealthIssue.SERVER_NOT_RESPONDING);
+                                    break;
+                            }
+                            if (hasIssue(HealthIssue.SERVER_HOST_UNREACHABLE)){
+                                resolveIssue(HealthIssue.SERVER_HOST_UNREACHABLE);
+                            }
+                            return;
+                        }
                     }
                 } catch (UnknownHostException | IllegalArgumentException e) {
                     LOG.w("OpenMRS server unreachable: %s", uri);

app/src/main/java/org/projectbuendia/client/diagnostics/DiagnosticsModule.java

@@ -40,10 +40,10 @@ public class DiagnosticsModule {
         Application application,
         OpenMrsConnectionDetails connectionDetails,
         AppSettings settings) {
+        // TODO: restore PackageServerHealthCheck, we'll probably want that again in the future.
         return ImmutableSet.of(
             new WifiHealthCheck(application, settings),
-            new BuendiaApiHealthCheck(application, connectionDetails),
-            new PackageServerHealthCheck(application, settings));
+            new BuendiaApiHealthCheck(application, connectionDetails));
     }
 
     @Provides

app/src/main/java/org/projectbuendia/client/diagnostics/HealthCheck.java

@@ -75,7 +75,7 @@ public final void stop() {
     protected abstract void stopImpl();
 
     /** Clears all the issues for this health check. */
-    public final void clear() {
+    public void clear() {
         mActiveIssues.clear();
     }
 

app/src/main/java/org/projectbuendia/client/diagnostics/PackageServerHealthCheck.java

@@ -29,6 +29,9 @@
 import java.net.UnknownHostException;
 
 /** A {@link HealthCheck} that checks whether the package server is up and running. */
+// TODO: restore PackageServerHealthCheck, we'll probably want it again once the packages are
+// working on the server.
+@SuppressWarnings("unused")
 public class PackageServerHealthCheck extends HealthCheck {
 
     private static final Logger LOG = Logger.create();

app/src/main/java/org/projectbuendia/client/events/data/EncounterAddFailedEvent.java

@@ -12,6 +12,7 @@
 package org.projectbuendia.client.events.data;
 
 import org.projectbuendia.client.events.DefaultCrudEventBus;
+import org.projectbuendia.client.models.Encounter;
 
 /**
  * An event bus event indicating that adding an encounter failed.
@@ -21,6 +22,7 @@
 public class EncounterAddFailedEvent {
     public final Reason reason;
     public final Exception exception;
+    public final Encounter encounter;
 
     public enum Reason {
         UNKNOWN,
@@ -33,7 +35,8 @@ public enum Reason {
         FAILED_TO_FETCH_SAVED_OBSERVATION
     }
 
-    public EncounterAddFailedEvent(Reason reason, Exception exception) {
+    public EncounterAddFailedEvent(Encounter encounter, Reason reason, Exception exception) {
+        this.encounter = encounter;
         this.reason = reason;
         this.exception = exception;
     }

app/src/main/java/org/projectbuendia/client/json/JsonEncounter.java

@@ -13,15 +13,13 @@
 
 import org.joda.time.DateTime;
 
-import java.util.Map;
+import java.util.List;
 
 /** JSON representation of an OpenMRS Encounter; call Serializers.registerTo before use. */
 public class JsonEncounter {
     public String patient_uuid;
     public String uuid;
     public DateTime timestamp;
-    public String enterer_id;
-    /** A {conceptUuid: value} map, where value can be a number, string, or answer UUID. */
-    public Map<Object, Object> observations;
+    public List<JsonObservation> observations;
     public String[] order_uuids;  // orders executed during this encounter
 }