Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions app/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -356,21 +356,10 @@
android:windowSoftInputMode="adjustResize" />
<activity
android:name="org.commcare.activities.InstallArchiveActivity"
android:windowSoftInputMode="adjustResize" />
<activity android:name="org.commcare.gis.EntityMapActivity" />
<activity android:name="org.commcare.gis.EntityMapboxActivity">
</activity>

<activity
android:name="org.commcare.gis.DrawingBoundaryActivity"
android:permission="org.commcare.dalvik.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS"
android:exported="true">
<intent-filter>
<action android:name="org.commcare.dalvik.action.DrawBoundary" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
android:windowSoftInputMode="adjustResize">
</activity>

<activity android:name="org.commcare.gis.EntityMapActivity" />

<activity android:name="org.commcare.activities.RefreshToLatestBuildActivity">
</activity>
Expand All @@ -380,7 +369,6 @@
</activity>
<activity android:name="org.commcare.activities.InstallFromListActivity">
</activity>
<activity android:name="org.commcare.gis.MapboxLocationPickerActivity" />

<uses-library
android:name="com.google.android.maps"
Expand Down Expand Up @@ -569,15 +557,7 @@
android:name="firebase_performance_collection_enabled"
android:value="false" />

<!-- Somehow this receiver is getting triggered in Android 8+ devices and causing
IllegalStateException while trying to start map downloader service from background.
Below code removes this receiver's entry from Manifest.
-->
<receiver android:name="io.ona.kujaku.receivers.KujakuNetworkChangeReceiver"
android:exported="false"
tools:node="remove"/>
<!--
The zebra-print-android library is not yet targeting Android 12 and at least one
<!-- The zebra-print-android library is not yet targeting Android 12 and at least one
Activity doesn't have the required attribute exported. The entry below adds the
attribute to the final Manifest.
-->
Expand Down
5 changes: 0 additions & 5 deletions app/assets/locales/android_translatable_strings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -972,11 +972,6 @@ quarantine.reason.manual=The form was manually quarantined by a user
quarantine.reason.fnf=The file backing the form submission could not be found
quarantine.reason.unknown=Reason for quarantine unknown

drawing.boundary.map.start.tracking=Start
drawing.boundary.map.stop.tracking=Stop
drawing.boundary.map.ok.tracking=Done
drawing.boundary.map.redo.tracking=Redo

in.app.update.installed.title=Finish CommCare Update
in.app.update.installed.detail=CommCare just downloaded an update. You need to restart CommCare to finish the installation.
in.app.update.dialog.cancel=Cancel
Expand Down
14 changes: 2 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.72'
implementation 'com.google.android.gms:play-services-maps:19.0.0'
implementation 'com.google.android.gms:play-services-location:21.3.0'
implementation 'joda-time:joda-time:2.9.4'
implementation 'net.zetetic:android-database-sqlcipher:4.5.3@aar'
implementation 'androidx.sqlite:sqlite:2.2.0'
Expand Down Expand Up @@ -116,8 +117,6 @@ dependencies {
implementation('com.github.bumptech.glide:glide:4.9.0') {
exclude group: 'com.android.support'
}

implementation 'com.getkeepsafe.relinker:relinker:1.4.4'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
Expand All @@ -126,18 +125,9 @@ dependencies {
implementation "io.noties.markwon:core:$markwon_version"
implementation "io.noties.markwon:ext-tables:$markwon_version"
implementation "io.noties.markwon:ext-strikethrough:$markwon_version"

// Kujaku
implementation 'com.android.volley:volley:1.2.1'
implementation 'com.snatik:storage:2.1.0'
implementation('io.ona.kujaku:library:0.9.0') {
exclude module: 'xpp3'
exclude module: 'volley'
exclude module: 'storage'
}

implementation 'androidx.work:work-runtime:2.10.3'
implementation 'androidx.work:work-runtime-ktx:2.10.3'

implementation 'com.google.android.play:app-update:2.1.0'
implementation 'android.arch.lifecycle:common-java8:1.1.1'

Expand Down
7 changes: 0 additions & 7 deletions app/res/color/button_colored_text.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/res/color/button_green_background.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/res/color/button_orange_background.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/res/color/button_red_background.xml

This file was deleted.

81 changes: 0 additions & 81 deletions app/res/layout/activity_drawing_boundary.xml

This file was deleted.

30 changes: 0 additions & 30 deletions app/res/layout/activity_entity_kujaku_map_info_view.xml

This file was deleted.

8 changes: 0 additions & 8 deletions app/res/layout/activity_entity_mapbox.xml

This file was deleted.

76 changes: 0 additions & 76 deletions app/res/layout/activity_mapbox_location_picker.xml

This file was deleted.

3 changes: 0 additions & 3 deletions app/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
<string name="image_download_prompt">Falta el archivo de imagen para esta pregunta, haz clic en el botón de descarga de arriba para descargar</string>
<string name="audio_download_prompt">Falta el archivo de audio para esta pregunta, haz clic en el botón de descarga de arriba para descargar</string>
<string name="media_not_found_error">Medio no encontrado en la aplicación</string>
<string name="area_format">%1s sq m</string>
<string name="parse_coordinates_failure">No se pudieron analizar las coordenadas de entrada</string>
<string name="location_provider_disabled">Activa tu ubicación para recibir actualizaciones de ubicación</string>
<string name="wait_for_location_fix">CommCare todavía está intentando recuperar tu posición. Espera o haz clic en Cancelar para cancelar.</string>
Expand All @@ -169,8 +168,6 @@
<string name="root_detected_message">No estás autorizado a ejecutar CommCare en un dispositivo rooteado. Utiliza un dispositivo no rooteado.</string>
<string name="session_endpoint_unavailable">No existe ningún punto final con el ID %1$s. Los puntos finales válidos son %2$s.</string>
<string name="session_endpoint_invalid_arguments">Argumentos incorrectos proporcionados para el punto final %1$s. Argumentos proporcionados: %2$s. Argumentos esperados: %3$s.</string>
<string name="selected_location">Ubicación seleccionada</string>
<string name="confirm_location">Confirmar ubicación</string>
<string name="playback_start_time">00:00</string>
<string name="dependency_missing_dialog_title">Obtener la aplicación requerida</string>
<string name="dependency_missing_dialog_title_plural">Obtener las aplicaciones requeridas</string>
Expand Down
3 changes: 0 additions & 3 deletions app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ License.
<string name="image_download_prompt">Le fichier image est manquant pour cette question, cliquez sur le bouton de téléchargement ci-dessus pour télécharger</string>
<string name="audio_download_prompt">Le fichier audio est manquant pour cette question, cliquez sur le bouton de téléchargement ci-dessus pour télécharger</string>
<string name="media_not_found_error">Média non trouvé dans l\'application</string>
<string name="area_format">%1s m²</string>
<string name="parse_coordinates_failure">Impossible d\'analyser les coordonnées d\'entrée</string>
<string name="location_provider_disabled">Activez votre localisation pour recevoir des mises à jour de localisation</string>
<string name="wait_for_location_fix">CommCare tente toujours de récupérer votre position. Veuillez patienter ou cliquer sur Annuler pour annuler.</string>
Expand All @@ -231,8 +230,6 @@ License.
<string name="root_detected_message">Vous n\'êtes pas autorisé à exécuter CommCare sur un appareil rooté. Veuillez utiliser un appareil non rooté.</string>
<string name="session_endpoint_unavailable">Aucun point de terminaison n\'existe avec l\'ID %1$s. Les points de terminaison valides sont %2$s.</string>
<string name="session_endpoint_invalid_arguments">Arguments incorrects fournis pour le point de terminaison %1$s. Arguments fournis: %2$s. Arguments attendus: %3$s.</string>
<string name="selected_location">Emplacement sélectionné</string>
<string name="confirm_location">Confirmer l\'emplacement</string>
<string name="playback_start_time">00:00</string>
<string name="dependency_missing_dialog_title">Obtenir l\'application requise</string>
<string name="dependency_missing_dialog_title_plural">Obtenir les applications requises</string>
Expand Down
3 changes: 0 additions & 3 deletions app/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ License.
<string name="image_download_prompt">इस प्रश्न के लिए छवि फ़ाइल गायब है, डाउनलोड करने के लिए ऊपर दिए गए डाउनलोड बटन पर क्लिक करें</string>
<string name="audio_download_prompt">इस प्रश्न के लिए ऑडियो फ़ाइल गायब है, डाउनलोड करने के लिए ऊपर दिए गए डाउनलोड बटन पर क्लिक करें</string>
<string name="media_not_found_error">एप्लिकेशन में मीडिया नहीं मिला</string>
<string name="area_format">%1s वर्ग मीटर</string>
<string name="parse_coordinates_failure">इनपुट निर्देशांकों का विश्लेषण करने में असमर्थ</string>
<string name="location_provider_disabled">स्थान अपडेट प्राप्त करने के लिए अपना स्थान सक्षम करें</string>
<string name="wait_for_location_fix">CommCare अभी भी आपकी स्थिति पुनर्प्राप्त करने का प्रयास कर रहा है। कृपया प्रतीक्षा करें या रद्द करने के लिए रद्द करें पर क्लिक करें।</string>
Expand All @@ -231,8 +230,6 @@ License.
<string name="root_detected_message">आपको रूट किए गए डिवाइस पर CommCare चलाने की अनुमति नहीं है। कृपया एक गैर-रूट किए गए डिवाइस का उपयोग करें।</string>
<string name="session_endpoint_unavailable">आईडी %1$s के साथ कोई एंडपॉइंट मौजूद नहीं है। मान्य एंडपॉइंट %2$s हैं।</string>
<string name="session_endpoint_invalid_arguments">एंडपॉइंट %1$s के लिए गलत तर्क प्रदान किए गए। प्रदान किए गए तर्क: %2$s। अपेक्षित तर्क: %3$s।</string>
<string name="selected_location">चयनित स्थान</string>
<string name="confirm_location">स्थान की पुष्टि करें</string>
<string name="playback_start_time">00:00</string>
<string name="dependency_missing_dialog_title">आवश्यक एप्लिकेशन प्राप्त करें</string>
<string name="dependency_missing_dialog_title_plural">आवश्यक एप्लिकेशन प्राप्त करें</string>
Expand Down
Loading
Loading