Offline First Implementation for Learn Progress and Jobs List Page

app/res/layout/inline_error_layout.xml → app/res/layout/network_status_bar_layout.xml

@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/connect_warning_color"
-    android:padding="5dp">
+    android:background="@color/connect_warning_color">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_error"

app/res/values-es/strings.xml

@@ -537,6 +537,8 @@
     <string name="install_barcode_top">¡Bienvenido a CommCare!</string>
     <string name="install_barcode_bottom">Por favor, elija un método de instalación a continuación</string>
     <string name="connect_last_synced">Última sincronización: %s</string>
+    <string name="connect_sync_successful">Última sincronización: Justo ahora</string>
+    <string name="connect_sync_failed">Error al sincronizar actualizaciones, última sincronización: %s</string>
     <string name="connect_offline">Sin conexión</string>
     <string name="connect_never">Nunca</string>
 </resources>

app/res/values-fr/strings.xml

@@ -536,6 +536,8 @@ License.
     <string name="install_barcode_top">Bienvenue sur CommCare !</string>
     <string name="install_barcode_bottom">Veuillez choisir une méthode d\'installation ci-dessous</string>
     <string name="connect_last_synced">Dernière synchronisation : %s</string>
+    <string name="connect_sync_successful">Dernière synchronisation : À l\'instant</string>
+    <string name="connect_sync_failed">Échec de la synchronisation des mises à jour, dernière synchronisation : %s</string>
     <string name="connect_offline">Hors ligne</string>
     <string name="connect_never">Jamais</string>
 </resources>

app/res/values-ha/strings.xml

@@ -531,6 +531,8 @@ Don cikakken aiki na wurin zama na aikace-aikace da yawa, da fatan za a yi sabon
     <string name="notification_channel_user_session_title">Zaman mai amfani</string>
     <string name="notification_channel_user_session_description">Sanarwa da ke ɗauke da bayani game da zaman mai amfani na yanzu, kamar ranar da ake sa ran zaman ya ƙare</string>
     <string name="connect_last_synced">Aiki na ƙarshe: %s</string>
+    <string name="connect_sync_successful">Aiki na ƙarshe: Yanzu haka</string>
+    <string name="connect_sync_failed">An kasa daidaita sabuntawa, aiki na ƙarshe: %s</string>
     <string name="connect_offline">Babu haɗi</string>
     <string name="connect_never">Ba taɓa</string>
 </resources>

app/res/values-hi/strings.xml

@@ -533,6 +533,8 @@ License.
     <string name="install_barcode_top">CommCare में आपका स्वागत है!</string>
     <string name="install_barcode_bottom">कृपया नीचे एक इंस्टॉलेशन विधि चुनें</string>
     <string name="connect_last_synced">अंतिम सिंक: %s</string>
+    <string name="connect_sync_successful">अंतिम सिंक: अभी-अभी</string>
+    <string name="connect_sync_failed">अपडेट सिंक करने में विफल, अंतिम सिंक: %s</string>
     <string name="connect_offline">ऑफ़लाइन</string>
     <string name="connect_never">कभी नहीं</string>
 </resources>

app/res/values-lt/strings.xml

@@ -192,6 +192,8 @@
     <string name="connect_progress_warning_relearn_tasks_pending">Užbaikite paskirtas užduotis, kad galėtumėte toliau teikti paslaugas.</string>
     <string name="connect_progress_relearn_tasks_completed">Visos reikalingos užduotys atliktos. Galite tęsti pristatymo veiklą.</string>
     <string name="connect_last_synced">Paskutinė sinchronizacija: %s</string>
+    <string name="connect_sync_successful">Paskutinė sinchronizacija: Ką tik</string>
+    <string name="connect_sync_failed">Nepavyko sinchronizuoti naujinimų, paskutinė sinchronizacija: %s</string>
     <string name="connect_offline">Neprisijungęs</string>
     <string name="connect_never">Niekada</string>
 </resources>

app/res/values-no/strings.xml

@@ -182,6 +182,8 @@
     <string name="connect_progress_warning_relearn_tasks_pending">Fullfør tildelte oppgaver for å fortsette å levere tjenester.</string>
     <string name="connect_progress_relearn_tasks_completed">Alle nødvendige oppgaver er fullført. Du kan fortsette med leveringsaktiviteter.</string>
     <string name="connect_last_synced">Sist synkronisert: %s</string>
+    <string name="connect_sync_successful">Sist synkronisert: Akkurat nå</string>
+    <string name="connect_sync_failed">Kunne ikke synkronisere oppdateringer, sist synkronisert: %s</string>
     <string name="connect_offline">Frakoblet</string>
     <string name="connect_never">Aldri</string>
 </resources>

app/res/values-pt/strings.xml

@@ -542,6 +542,8 @@
     <string name="install_barcode_top">Bem-vindo ao CommCare!</string>
     <string name="install_barcode_bottom">Por favor, escolha um método de instalação abaixo</string>
     <string name="connect_last_synced">Última sincronização: %s</string>
+    <string name="connect_sync_successful">Última sincronização: Agora mesmo</string>
+    <string name="connect_sync_failed">Falha ao sincronizar atualizações, última sincronização: %s</string>
     <string name="connect_offline">Offline</string>
     <string name="connect_never">Nunca</string>
 </resources>

app/res/values-sw/strings.xml

@@ -541,6 +541,8 @@
     <string name="install_barcode_top">Karibu CommCare!</string>
     <string name="install_barcode_bottom">Tafadhali chagua njia ya usakinishaji hapa chini</string>
     <string name="connect_last_synced">Ilisawazishwa mwisho: %s</string>
+    <string name="connect_sync_successful">Ilisawazishwa mwisho: Sasa hivi</string>
+    <string name="connect_sync_failed">Imeshindwa kusawazisha masasisho, ilisawazishwa mwisho: %s</string>
     <string name="connect_offline">Nje ya mtandao</string>
     <string name="connect_never">Kamwe</string>
 </resources>

app/res/values-ti/strings.xml

@@ -525,6 +525,8 @@
     <string name="install_barcode_top">ናብ CommCare እንቋዕ ብድሓን መጻእኩም!</string>
     <string name="install_barcode_bottom">በጃኹም ኣብ ታሕቲ ዘሎ ሜላ ምትካል ምረጹ</string>
     <string name="connect_last_synced">ናይ መወዳእታ ምስንኻል: %s</string>
+    <string name="connect_sync_successful">ናይ መወዳእታ ምስንኻል: ሕጂ ሕጂ</string>
+    <string name="connect_sync_failed">ምስንኻል ሓዲሽ ነገር ኣይሰለጠን, ናይ መወዳእታ ምስንኻል: %s</string>
     <string name="connect_offline">ኦፍላይን</string>
     <string name="connect_never">ፈጺሙ</string>
 </resources>

app/res/values/colors.xml

@@ -143,6 +143,7 @@
     <color name="connect_grey">#9A9A9A</color>
     <color name="connect_divider_color">#E5E7EB</color>
     <color name="connect_background_color">#f7f9fa</color>
+    <color name="connect_sky_blue">#87BDDF</color>
     <color name="connect_aqua">#88BEE1</color>
     <color name="connect_green">#16A085</color>
     <color name="connect_light_green">#E6F5E5</color>

app/res/values/strings.xml

@@ -397,6 +397,8 @@
 
     <string name="connect_last_update">Updated: %s</string>
     <string name="connect_last_synced">Last synced: %s</string>
+    <string name="connect_sync_successful">Last synced: Just Now</string>
+    <string name="connect_sync_failed">Failed to sync updates, last synced: %s</string>
     <string name="connect_offline">Offline</string>
     <string name="connect_never">Never</string>
     <string name="connect_title">Connect</string>

app/src/org/commcare/CommCareApplication.java

@@ -123,6 +123,7 @@
 import org.commcare.utils.MarkupUtil;
 import org.commcare.utils.MultipleAppsUtil;
 import org.commcare.utils.PendingCalcs;
+import org.commcare.connect.repository.ConnectSyncPreferences;
 import org.commcare.utils.SessionRegistrationHelper;
 import org.commcare.utils.SessionStateUninitException;
 import org.commcare.utils.SessionUnavailableException;
@@ -219,6 +220,8 @@ public class CommCareApplication extends Application implements LifecycleEventOb
     public void onCreate() {
         super.onCreate();
 
+        ConnectSyncPreferences.Companion.getInstance(this).markSessionStart();
+
         turnOnStrictMode();
 
         CommCareApplication.app = this;

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

@@ -226,7 +226,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         if(item.getItemId() == R.id.action_sync) {
             RefreshableFragment refreshable = getRefreshableFragment();
             if(refreshable != null) {
-                refreshable.refresh();
+                refreshable.refresh(true);
                 return true;
             }
         }

app/src/org/commcare/connect/network/ApiConnect.java

@@ -21,7 +21,7 @@
 import retrofit2.Call;
 
 public class ApiConnect {
-    private static final String API_VERSION_CONNECT = "1.0";
+    public static final String API_VERSION_CONNECT = "1.0";
 
     public static void getConnectOpportunities(Context context, @NonNull ConnectUserRecord user, IApiCallback callback) {
 
@@ -80,33 +80,6 @@ public void tokenRequestDenied() {
 
     }
 
-    public static void getLearningAppProgress(Context context, @NonNull ConnectUserRecord user, String jobUUID, IApiCallback callback) {
-
-        ConnectSsoHelper.retrievePersonalIdToken(context, user, new ConnectSsoHelper.TokenCallback() {
-            @Override
-            public void tokenRetrieved(AuthInfo.TokenAuth token) {
-
-                String tokenAuth = HttpUtils.getCredential(token);
-                ApiService apiService = ConnectApiClient.Companion.getClientApi();
-                HashMap<String, String> headers = new HashMap<>();
-                ConnectNetworkHelper.addVersionHeader(headers, API_VERSION_CONNECT);
-                Call<ResponseBody> call = apiService.getConnectLearningAppProgress(tokenAuth,jobUUID,headers);
-                BaseApi.Companion.callApi(context, call, callback,ApiEndPoints.connectLearnProgressURL);
-            }
-
-            @Override
-            public void tokenUnavailable() {
-                callback.processTokenUnavailableError();
-            }
-
-            @Override
-            public void tokenRequestDenied() {
-                callback.processTokenRequestDeniedError();
-            }
-        });
-
-    }
-
     public static void claimJob(Context context, @NonNull ConnectUserRecord user, String jobUUID, IApiCallback callback) {
         ConnectSsoHelper.retrievePersonalIdToken(context, user, new ConnectSsoHelper.TokenCallback() {
             @Override
@@ -120,7 +93,6 @@ public void tokenRetrieved(AuthInfo.TokenAuth token) {
                 ApiService apiService = ConnectApiClient.Companion.getClientApi();
                 Call<ResponseBody> call = apiService.connectClaimJob(tokenAuth,jobUUID,headers,requestBody);
                 BaseApi.Companion.callApi(context, call, callback,ApiEndPoints.connectClaimJobURL);
-
             }
 
             @Override

app/src/org/commcare/connect/network/ApiService.java

@@ -58,12 +58,6 @@ Call<ResponseBody> connectStartLearningApp(@Header("Authorization") String token
                                                @HeaderMap Map<String, String> headers,
                                                @Body RequestBody connectStartLearningRequest);
 
-    @GET(ApiEndPoints.connectLearnProgressURL)
-    Call<ResponseBody> getConnectLearningAppProgress(@Header("Authorization") String token,
-                                                     @Path("id") String uuid,
-                                                     @HeaderMap Map<String, String> headers);
-
-
     @POST(ApiEndPoints.connectClaimJobURL)
     Call<ResponseBody> connectClaimJob(@Header("Authorization") String token,
                                        @Path("id") String uuid,

app/src/org/commcare/connect/network/ConnectApiService.kt

@@ -0,0 +1,23 @@
+package org.commcare.connect.network
+
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.HeaderMap
+import retrofit2.http.Path
+
+interface ConnectApiService {
+    @GET(ApiEndPoints.connectOpportunitiesURL)
+    suspend fun getConnectOpportunities(
+        @Header("Authorization") authorization: String,
+        @HeaderMap headers: Map<String, String>,
+    ): Response<ResponseBody>
+
+    @GET(ApiEndPoints.connectLearnProgressURL)
+    suspend fun getLearningProgress(
+        @Header("Authorization") authorization: String,
+        @Path("id") jobId: String,
+        @HeaderMap headers: Map<String, String>,
+    ): Response<ResponseBody>
+}