Merge branch 'release/v2.1.0' into develop

* release/v2.1.0: (53 commits) fix: Turn off dev mode (yellow warning boxes) in universal build chore: Roll back to react-native-mapbox-gl/[email protected] chore: Update KNOWN_ISSUES for v5.0.0 release chore: Update changelog (prepare for release) fix: Update Thai and Nepali translations fix: Update Portuguese translations fix: Fix observations not rendering when GPS is off (#431) fix: Ensure sync errors are always propagated to frontend. chore: Update to [email protected] chore: Update package-lock to v5.0.0 chore(deps): bump to @mapeo/core v8.3.2 for missing data fixes fix: ignore missing data errors and errors that are stale chore: ensure flow understands we use select_multiple now too fix: some last fixes for mapeo alerts chore: for flow, ensure fields and preset are always present fix: Improve the formatting of Mapeo Alerts fixes #401 fix: 'missing data' error will not cancel large syncs too early fix: Ignore errors (e.g., ECONNABORTED) that are now caught by the 'connected' property fix: When WiFi connection state changes, refresh peer list fix: show a yellow icon when disconnected ... # Conflicts: # messages/pt.json # package-lock.json # package.json # src/backend/package-lock.json # src/backend/package.json # src/frontend/screens/SyncModal/index.js
digidem · Jul 23, 2020 · c565989 · c565989
2 parents be8dc75 + 0963147
commit c565989
Show file tree

Hide file tree

Showing 34 changed files with 1,023 additions and 517 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [2.1.0](https://github.com/digidem/mapeo-mobile/compare/v2.0.0-beta.5...v2.1.0) (2020-03-27)
+## [5.0.0](https://github.com/digidem/mapeo-mobile/compare/v2.0.0-beta.5...v5.0.0) (2020-07-21)
 
 ### Features
 
 - 🎉 Import configuration files (.mapeosettings) from a new settings screen ([562b95a](https://github.com/digidem/mapeo-mobile/commit/562b95ac2cac4406e3ba9631ea59707d5e087565))
 - 📏 Add scale bar to map & improve battery usage ([#356](https://github.com/digidem/mapeo-mobile/issues/356)) ([841c031](https://github.com/digidem/mapeo-mobile/commit/841c0316065e4311c1aff524cceb7efab9a75a7a))
+- Add Brazilian Portuguese translations ([#412](https://github.com/digidem/mapeo-mobile/issues/412)) ([9748298](https://github.com/digidem/mapeo-mobile/commit/9748298a3691dbbef43a3a416a65dc54a4c611de))
 - Add end-to-end tests with Detox ([#355](https://github.com/digidem/mapeo-mobile/issues/355)) ([385b0fd](https://github.com/digidem/mapeo-mobile/commit/385b0fd10a320afc5795e04b4362b57fdfce7845)), closes [#310](https://github.com/digidem/mapeo-mobile/issues/310)
 - Add settings screen to change language (independent of device language) ([#302](https://github.com/digidem/mapeo-mobile/issues/302)) ([f3d487b](https://github.com/digidem/mapeo-mobile/commit/f3d487bfcc77a77ec538ab31488b9e8e8c69f548))
 - Ask for confirmation when the user presses the back button when editing/creating an observation ([281553a](https://github.com/digidem/mapeo-mobile/commit/281553aab0df3674bbd46b1ab4b8564627924aab))
+- Device name remains the same across app restarts ([#369](https://github.com/digidem/mapeo-mobile/issues/369)) ([db79df7](https://github.com/digidem/mapeo-mobile/commit/db79df703d483fb03ef7e506f05a600143036cf6))
 - New "Mapeo for ICCAs" variant for UNEP WCMC ([#346](https://github.com/digidem/mapeo-mobile/issues/346)) ([2354a4a](https://github.com/digidem/mapeo-mobile/commit/2354a4a2b3902a02c6754b805b3fc770eafb2b86))
 - New translations including Vietnamese ([#303](https://github.com/digidem/mapeo-mobile/issues/303)) ([7df584d](https://github.com/digidem/mapeo-mobile/commit/7df584dc6e7972b96d45f6e11d612621dfe7366b))
 - Release smaller APK for Arm devices only ([#322](https://github.com/digidem/mapeo-mobile/issues/322)) ([ffbaa23](https://github.com/digidem/mapeo-mobile/commit/ffbaa23cfecbb63775617c4787784c06633bb371))
@@ -20,27 +22,55 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
+- 'missing data' error will not cancel large syncs too early ([b820ad0](https://github.com/digidem/mapeo-mobile/commit/b820ad070fc391396e6ccde9a3675ba8e97fcb2c))
 - add package-lock.json files for front and backend ([67e3565](https://github.com/digidem/mapeo-mobile/commit/67e35656581b98bc85c35497923b845728d53492))
 - Adjust projectKey styling and text ([c022422](https://github.com/digidem/mapeo-mobile/commit/c0224225c7ee03116d6ea7d5ae1a1dab5913838b))
 - Attempt to fix builds for OPPO phones (fixes [#301](https://github.com/digidem/mapeo-mobile/issues/301)) ([808e900](https://github.com/digidem/mapeo-mobile/commit/808e900a1549ed7f7cd144c84f27088e0c447319))
 - Bundle React-Native code in Universal & Intel build types ([1324a8d](https://github.com/digidem/mapeo-mobile/commit/1324a8d3ca79d8a34ec2ef9e6639b1fa859d996c))
 - Do not update user location (blue dot) on map until user moves more than 15 meters (saves battery life) ([960776f](https://github.com/digidem/mapeo-mobile/commit/960776f3cccd58f2baed9cc9edb8cb5c9dd0f120))
 - Don't [silently] throw error if a user cancels a share action ([f02c837](https://github.com/digidem/mapeo-mobile/commit/f02c8372c7655781d0eb5f894be46704b5d61c3f)), closes [#344](https://github.com/digidem/mapeo-mobile/issues/344)
 - Don't render app until saved draft is loaded from storage ([f8d7a0b](https://github.com/digidem/mapeo-mobile/commit/f8d7a0b963e68bb987503c199d4db92609a23369))
+- Ensure sync errors are always propagated to frontend. ([2ceec76](https://github.com/digidem/mapeo-mobile/commit/2ceec764fa16d9936a874f136a0832e233e30aae))
+- Ensure that presets are not cached after config is changed ([d570c04](https://github.com/digidem/mapeo-mobile/commit/d570c0411d41aeef5c95b3629356fa1f26722e79))
 - Fix bug when a user edits an existing observation and is returned to the home screen (map) ([9751501](https://github.com/digidem/mapeo-mobile/commit/975150194033d38a203ce39cba9000b7956281ee))
+- Fix changing config with new project key (fix sync not working after change) ([a47ed38](https://github.com/digidem/mapeo-mobile/commit/a47ed3848c1ef9c806290d042f720d82c8915ef3))
 - Fix config import failing when there is an existing config ([5dbe33e](https://github.com/digidem/mapeo-mobile/commit/5dbe33eca8a48a410d1a587ac95d147331444290))
+- Fix config loading on Samsung devices ([d3d6273](https://github.com/digidem/mapeo-mobile/commit/d3d6273ce7401fcef29fa13361288ef3a5a48ee5))
 - Fix crash after deleting an observation's description ([330fdab](https://github.com/digidem/mapeo-mobile/commit/330fdab7f8ff701d13180113539cb06af7b86915))
 - Fix crash caused by react-native-v8 patch release fixes [#311](https://github.com/digidem/mapeo-mobile/issues/311) ([3f8d5c6](https://github.com/digidem/mapeo-mobile/commit/3f8d5c676966a83e3358e69a7679e316e0433c5a))
 - Fix crash caused by react-native-v8 patch release fixes [#311](https://github.com/digidem/mapeo-mobile/issues/311) ([66cb216](https://github.com/digidem/mapeo-mobile/commit/66cb216f6f0cc328f45b3099174d0f5c2a9baa0e))
-- **Sync:** Touch up styles of no wifi sync screen ([8362831](https://github.com/digidem/mapeo-mobile/commit/8362831fddc5a7f58bd8633bdc1f3c9f78ef5e18))
-- Fix crash from switching away from app during camera view ([d0ce93b](https://github.com/digidem/mapeo-mobile/commit/d0ce93ba4eb874cb1404bff14f51bbe12ae998db)), closes [#330](https://github.com/digidem/mapeo-mobile/issues/330) [#187](https://github.com/digidem/mapeo-mobile/issues/187) [#138](https://github.com/digidem/mapeo-mobile/issues/138)
+- Fix crash during sync progress (updates progress circle library) ([699b280](https://github.com/digidem/mapeo-mobile/commit/699b280fcbb2c8fb9febac9fbbca7e9cac369f02))
 - Fix crash when presets have empty placeholder field ([06887d0](https://github.com/digidem/mapeo-mobile/commit/06887d02941cb506439940f1f729cb8250065e15))
-- Fix double header on photo modal (from alphas) ([6bba57a](https://github.com/digidem/mapeo-mobile/commit/6bba57aa2219bf33a6da10dad9a9616d4122a727))
+- Fix observations not rendering when GPS is off ([#431](https://github.com/digidem/mapeo-mobile/issues/431)) ([358ffb6](https://github.com/digidem/mapeo-mobile/commit/358ffb674cd44ced45f40e4dbbb3a6b556f0a7cc))
 - Fix online mapstyle not loading when offline style is removed ([84faf09](https://github.com/digidem/mapeo-mobile/commit/84faf09fc2321b0ced7839dc67a5316b74829f31))
-- Fix race conditions with server start-stop (switching away from app and back) ([694977c](https://github.com/digidem/mapeo-mobile/commit/694977c24ffb9454e7096c59dfc473c84b97caf4)), closes [#210](https://github.com/digidem/mapeo-mobile/issues/210)
+- Fix photos rotated incorrectly when the phone is rotated soon after photo capture ([86f9b86](https://github.com/digidem/mapeo-mobile/commit/86f9b8601456e467588b89cfb11c7f58702b9013))
+- Fix Portuguese (Brazilian) translations ([dbce6d6](https://github.com/digidem/mapeo-mobile/commit/dbce6d61ca27747e6087048fac43644eb1c3bfb9))
 - Fix sync errors by locking discovery swarm to v6.0.0 ([657c817](https://github.com/digidem/mapeo-mobile/commit/657c817c4fb1d535771f48c9c1279df5c6a39a1d))
 - Fix translations build script ([f21259c](https://github.com/digidem/mapeo-mobile/commit/f21259c09bcb7b2fa5ebff6bfc22593f7358a427))
+- get sync to render properly with new mapeo core ([1b7ec8e](https://github.com/digidem/mapeo-mobile/commit/1b7ec8eb9f5d04ccb7624789da114a2e715a203d))
+- Ignore errors (e.g., ECONNABORTED) that are now caught by the ([890205e](https://github.com/digidem/mapeo-mobile/commit/890205eff45e5b88750629d900f248f0d96a1078))
+- ignore missing data errors and errors that are stale ([dca117d](https://github.com/digidem/mapeo-mobile/commit/dca117d08db2ca756ffaa53541f79d590d11b264))
+- Improve the formatting of Mapeo Alerts fixes [#401](https://github.com/digidem/mapeo-mobile/issues/401) ([fa60732](https://github.com/digidem/mapeo-mobile/commit/fa60732241285ea915bdbd8416590e127dcd7b09))
+- Move attribution (i) to bottom-right (avoid overlap with scale bar) ([eb07da9](https://github.com/digidem/mapeo-mobile/commit/eb07da97ee2055d6caaed1ddde0ef5a577f68432))
+- pass through 'connected' state to peer list ([27def8c](https://github.com/digidem/mapeo-mobile/commit/27def8cd93bc7cbd2d8540538510d68e99c897b4))
+- pull in code from desktop for usePeers state manager ([1154045](https://github.com/digidem/mapeo-mobile/commit/1154045e263683325e4ee4bcd879579b6c7b9dbf))
 - Remove unused picker component (pending coordinate format setting) ([0e6514d](https://github.com/digidem/mapeo-mobile/commit/0e6514d5d9ba7b6d861ecc201ba44ab9968f199f))
+- show a yellow icon when disconnected ([cf2178b](https://github.com/digidem/mapeo-mobile/commit/cf2178b484c8cb1602939cf450f52fcc86415566))
+- Show error to user if there is an error importing config ([a711ab6](https://github.com/digidem/mapeo-mobile/commit/a711ab6f606eb58dadbe1fe7085700c6d5ecd6a3))
+- show indeterminate state when progress is 1 ([875db5f](https://github.com/digidem/mapeo-mobile/commit/875db5fa6082f083da0ddaba21f17444a79928ea))
+- some last fixes for mapeo alerts ([f489734](https://github.com/digidem/mapeo-mobile/commit/f4897345aa1094a3745f6b0626278adb90e65ea5))
+- Support presets version 3 (only breaks compat with iD, not MM) ([03287fb](https://github.com/digidem/mapeo-mobile/commit/03287fb772504ab567ecbee16bbe1e368a93d3e7))
+- sync on peer device should show progress events on local device ([be480be](https://github.com/digidem/mapeo-mobile/commit/be480be38244fd6593aa81946b545d6d89b00a6a))
+- Update Portuguese translations ([2d32ca3](https://github.com/digidem/mapeo-mobile/commit/2d32ca32f01cf4eda3a6facf46d0afe35e85bbc0))
+- **ObservationView:** Fix display of observation icon on inset map ([b01c259](https://github.com/digidem/mapeo-mobile/commit/b01c259b8bb82e4d7c58c919d5c34737f34d0084))
+- Update Thai and Nepali translations ([7d52832](https://github.com/digidem/mapeo-mobile/commit/7d52832d6c141d6399f60f7e9037dc0f5326d2ca))
+- **MapView:** Improve map performance and device compatibility ([1d49511](https://github.com/digidem/mapeo-mobile/commit/1d495118bf0568637001b1c6e60be55b773b7638)), closes [#387](https://github.com/digidem/mapeo-mobile/issues/387)
+- **ObservationView:** Speed up initial load of inset map ([e129456](https://github.com/digidem/mapeo-mobile/commit/e129456277ea7c97992e5f171743c8dc5aac826b))
+- **Sync:** Touch up styles of no wifi sync screen ([8362831](https://github.com/digidem/mapeo-mobile/commit/8362831fddc5a7f58bd8633bdc1f3c9f78ef5e18))
+- **SyncPeer:** Make sync button respond immediately to press ([a0e4593](https://github.com/digidem/mapeo-mobile/commit/a0e45931c3e2531fddd3394cec1a75651506d613))
+- **update-config:** Don't import presets if version check fails ([174d05b](https://github.com/digidem/mapeo-mobile/commit/174d05b41043c192b62252f2f297f93dd83ce9bb))
+- Update to latest Mapbox. Potentially fixes missing map icon. ([4589eac](https://github.com/digidem/mapeo-mobile/commit/4589eac68272831e84a6c2ca052fbc0e8434feda))
+- When WiFi connection state changes, refresh peer list ([42df960](https://github.com/digidem/mapeo-mobile/commit/42df9604713aac90f4071cfed1123cec41282187))
 
 ## [2.0.0-beta.5](https://github.com/digidem/mapeo-mobile/compare/v2.0.0-beta.4...v2.0.0-beta.5) (2020-02-18)
 

diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
@@ -2,15 +2,19 @@
 
 #### Map
 
-- Sometimes existing observations do not appear on the map
+- If there is no offline style and the device is offline, an empty white screen shows [#379](https://github.com/digidem/mapeo-mobile/issues/379)
 - If you open the app without an offline style, and then add a default offline
   style, the offline style may not appear until 5 minutes later on some phones
   (caching issues)
-- Map "my location" blue dot sometimes appears behind observations
+- Map "my location" blue dot sometimes appears behind observations [#432](https://github.com/digidem/mapeo-mobile/issues/432)
 - Transparent circle around "my location" blue dot does not actually signify GPS
-  accuracy.
-- Pressing the "locate me" button moves the map to your location without
-  animation (sudden jump)
+  accuracy. [#433](https://github.com/digidem/mapeo-mobile/issues/433)
+- GPS pill in header somtimes does not update correctly (it shows "no gps" when there is, in fact, GPS) [#378](https://github.com/digidem/mapeo-mobile/issues/378)
+
+#### Observation view
+
+- There is no explanation of what the blue "lightning bolt" means or why you cannot edit an observation [#382](https://github.com/digidem/mapeo-mobile/issues/382)
+- Sharing an observation does not work consistently when sharing with different apps [#380](https://github.com/digidem/mapeo-mobile/issues/380)
 
 #### New/Edit Observation
 
@@ -19,19 +23,13 @@
 - There is no way to stop the location of a new observation updating from the
   GPS except from saving the observation (e.g. the user needs to stay in the
   same location until they save the observation for the first time)
-- Confirmation does not show up when pressing the back button (only when
-  pressing the close icon)
-
-#### Edit Observation
-
-- There is no way to delete an existing observation
-- No confirmation shown when cancelling edit
+- In the "Details" questions, there is no way to exit without clicking through every question to the end [#383](https://github.com/digidem/mapeo-mobile/issues/383)
+- Cancelling an edit should show "discard edits" not "discard observation" [#381](https://github.com/digidem/mapeo-mobile/issues/381)
 
 #### Photos
 
-- Sometimes photos stop working (you will see a grey box then error). You may
-  need to restart the app for them to work again.
-- There is no way to delete / remove a photo from an observation
+- Sometimes photos will not rotate on a device with low memory [#353](https://github.com/digidem/mapeo-mobile/issues/353)
+- There is no way to delete / remove a photo from an observation [#384](https://github.com/digidem/mapeo-mobile/issues/384)
 
 #### Sync
 
@@ -40,12 +38,6 @@
   reliable)
 - Device name is random (user cannot change it)
 
-#### I8n (translations)
-
-- No English translation, only in Spanish
-
 #### Misc
 
-- It is not possible to have different versions of Mapeo open on the
-  phone at the same time. You need to force-quit other versions before opening
-  another
+- Switching quickly between two different installations of Mapeo on the same phone can cause an error. [#434](https://github.com/digidem/mapeo-mobile/issues/434)
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -83,7 +83,10 @@ project.ext.react = [
     // bundler running in order to run the Debug QA build
     bundleInQaDebug: true,
     bundleInUniversal: true,
-    enableHermes: false // clean and rebuild if changing
+    enableHermes: false, // clean and rebuild if changing
+    // Disable dev logging in the Universal build (only disabled in release
+    // build type by default)
+    devDisabledInUniversal: true
 ]
 
 project.ext.vectoricons = [

diff --git a/messages/en.json b/messages/en.json
@@ -244,6 +244,18 @@
     "description": "Title of message when the server has not responded for 10 seconds",
     "message": "Something is up with the Mapeo database"
   },
+  "screens.Settings.configErrorDescription": {
+    "description": "Description of error dialog when there is an error importing a config file",
+    "message": "There was an error trying to import this config file"
+  },
+  "screens.Settings.configErrorOkButton": {
+    "description": "Button to dismiss error dialog when there is an error importing a config file",
+    "message": "OK"
+  },
+  "screens.Settings.configErrorTitle": {
+    "description": "Title of error dialog when there is an error importing a config file",
+    "message": "Import Error"
+  },
   "screens.Settings.currentConfig": {
     "description": "Label for name & version of current configuration",
     "message": "Current Configuration"

diff --git a/messages/es.json b/messages/es.json
@@ -244,6 +244,18 @@
     "description": "Title of message when the server has not responded for 10 seconds",
     "message": "Algo está pasando con la base de datos Mapeo"
   },
+  "screens.Settings.configErrorDescription": {
+    "description": "Description of error dialog when there is an error importing a config file",
+    "message": "There was an error trying to import this config file"
+  },
+  "screens.Settings.configErrorOkButton": {
+    "description": "Button to dismiss error dialog when there is an error importing a config file",
+    "message": "OK"
+  },
+  "screens.Settings.configErrorTitle": {
+    "description": "Title of error dialog when there is an error importing a config file",
+    "message": "Import Error"
+  },
   "screens.Settings.currentConfig": {
     "description": "Label for name & version of current configuration",
     "message": "Configuración actual"

diff --git a/messages/fr.json b/messages/fr.json
@@ -244,6 +244,18 @@
     "description": "Title of message when the server has not responded for 10 seconds",
     "message": "Something is up with the Mapeo database"
   },
+  "screens.Settings.configErrorDescription": {
+    "description": "Description of error dialog when there is an error importing a config file",
+    "message": "There was an error trying to import this config file"
+  },
+  "screens.Settings.configErrorOkButton": {
+    "description": "Button to dismiss error dialog when there is an error importing a config file",
+    "message": "OK"
+  },
+  "screens.Settings.configErrorTitle": {
+    "description": "Title of error dialog when there is an error importing a config file",
+    "message": "Import Error"
+  },
   "screens.Settings.currentConfig": {
     "description": "Label for name & version of current configuration",
     "message": "Current Configuration"

diff --git a/messages/hi.json b/messages/hi.json
@@ -244,6 +244,18 @@
     "description": "Title of message when the server has not responded for 10 seconds",
     "message": "Something is up with the Mapeo database"
   },
+  "screens.Settings.configErrorDescription": {
+    "description": "Description of error dialog when there is an error importing a config file",
+    "message": "There was an error trying to import this config file"
+  },
+  "screens.Settings.configErrorOkButton": {
+    "description": "Button to dismiss error dialog when there is an error importing a config file",
+    "message": "OK"
+  },
+  "screens.Settings.configErrorTitle": {
+    "description": "Title of error dialog when there is an error importing a config file",
+    "message": "Import Error"
+  },
   "screens.Settings.currentConfig": {
     "description": "Label for name & version of current configuration",
     "message": "Current Configuration"

diff --git a/messages/id.json b/messages/id.json
@@ -244,6 +244,18 @@
     "description": "Title of message when the server has not responded for 10 seconds",
     "message": "Something is up with the Mapeo database"
   },
+  "screens.Settings.configErrorDescription": {
+    "description": "Description of error dialog when there is an error importing a config file",
+    "message": "There was an error trying to import this config file"
+  },
+  "screens.Settings.configErrorOkButton": {
+    "description": "Button to dismiss error dialog when there is an error importing a config file",
+    "message": "OK"
+  },
+  "screens.Settings.configErrorTitle": {
+    "description": "Title of error dialog when there is an error importing a config file",
+    "message": "Import Error"
+  },
   "screens.Settings.currentConfig": {
     "description": "Label for name & version of current configuration",
     "message": "Current Configuration"