chore: upgrade snjs; fixes #619

package.json

@@ -1,7 +1,7 @@
 {
   "name": "standardnotes-mobile",
-  "version": "3.20.0",
-  "user-version": "3.20.0",
+  "version": "3.20.1",
+  "user-version": "3.20.1",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
@@ -19,7 +19,8 @@
     "start": "react-native start",
     "test": "jest",
     "postinstall": "patch-package && yarn run ncu",
-    "android:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/"
+    "android:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/",
+    "upgrade:snjs": "ncu -u '@standardnotes/*' && yarn"
   },
   "resolutions": {
     "@types/react": "^17",
@@ -34,12 +35,12 @@
     "@react-navigation/native": "^6.0.10",
     "@react-navigation/stack": "^6.2.1",
     "@standardnotes/components": "^1.8.1",
-    "@standardnotes/filepicker": "^1.14.7",
+    "@standardnotes/filepicker": "^1.14.9",
     "@standardnotes/react-native-aes": "^1.4.3",
     "@standardnotes/react-native-textview": "1.0.2",
     "@standardnotes/react-native-utils": "1.0.1",
     "@standardnotes/sncrypto-common": "1.8.2",
-    "@standardnotes/snjs": "2.109.0",
+    "@standardnotes/snjs": "2.109.6",
     "@standardnotes/stylekit": "5.26.0",
     "@types/styled-components-react-native": "5.1.3",
     "js-base64": "^3.7.2",

src/Lib/ApplicationState.ts

@@ -265,9 +265,9 @@ export class ApplicationState extends ApplicationService {
         : this.selectedTag.uuid
       : undefined
 
-    this.application.editorGroup.closeActiveNoteView()
+    this.application.editorGroup.closeActiveNoteController()
 
-    const noteView = await this.application.editorGroup.createNoteView(undefined, title, selectedTagUuid)
+    const noteView = await this.application.editorGroup.createNoteController(undefined, title, selectedTagUuid)
 
     const defaultEditor = this.application.componentManager.getDefaultEditor()
     if (defaultEditor) {
@@ -281,10 +281,10 @@ export class ApplicationState extends ApplicationService {
     const note = this.application.items.findItem(noteUuid) as SNNote
     const activeEditor = this.getActiveNoteController()
     if (activeEditor) {
-      this.application.editorGroup.closeActiveNoteView()
+      this.application.editorGroup.closeActiveNoteController()
     }
 
-    const noteView = await this.application.editorGroup.createNoteView(noteUuid)
+    const noteView = await this.application.editorGroup.createNoteController(noteUuid)
 
     if (note && note.conflictOf) {
       void InteractionManager.runAfterInteractions(() => {
@@ -307,17 +307,17 @@ export class ApplicationState extends ApplicationService {
 
   closeEditor(editor: NoteViewController) {
     this.notifyOfStateChange(AppStateType.EditorClosed)
-    this.application.editorGroup.closeNoteView(editor)
+    this.application.editorGroup.closeNoteController(editor)
   }
 
   closeActiveEditor() {
     this.notifyOfStateChange(AppStateType.EditorClosed)
-    this.application.editorGroup.closeActiveNoteView()
+    this.application.editorGroup.closeActiveNoteController()
   }
 
   closeAllEditors() {
     this.notifyOfStateChange(AppStateType.EditorClosed)
-    this.application.editorGroup.closeAllNoteViews()
+    this.application.editorGroup.closeAllNoteControllers()
   }
 
   editorForNote(uuid: Uuid): NoteViewController | void {

src/Lib/ComponentManager.ts

@@ -64,8 +64,8 @@ export class ComponentManager extends SNComponentManager {
     } catch (e) {
       void this.alertService.alert(
         'Unable to start component server. ' +
-        'Editors other than the Plain Editor will fail to load. ' +
-        'Please restart the app and try again.'
+          'Editors other than the Plain Editor will fail to load. ' +
+          'Please restart the app and try again.'
       )
       SNLog.error(e as any)
     }

src/Lib/Interface.ts

@@ -305,6 +305,14 @@ export class MobileDeviceInterface implements DeviceInterface {
       .catch(() => showAlert())
   }
 
+  async clearAllDataFromDevice(_workspaceIdentifiers: string[]): Promise<{ killsApplication: boolean }> {
+    await this.clearRawKeychainValue()
+
+    await this.removeAllRawStorageValues()
+
+    return { killsApplication: false }
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   performSoftReset() {}
 

src/Screens/SideMenu/NoteSideMenu.tsx

@@ -6,7 +6,7 @@ import { useSafeApplicationContext } from '@Root/Hooks/useSafeApplicationContext
 import { SCREEN_COMPOSE, SCREEN_INPUT_MODAL_TAG, SCREEN_NOTE_HISTORY } from '@Root/Screens/screens'
 import { Files } from '@Root/Screens/SideMenu/Files'
 import { Listed } from '@Root/Screens/SideMenu/Listed'
-import { FeatureIdentifier } from '@standardnotes/features'
+import { FeatureIdentifier, FindNativeFeature } from '@standardnotes/features'
 import {
   ApplicationEvent,
   ButtonType,
@@ -49,7 +49,9 @@ import { TagSelectionList } from './TagSelectionList'
 
 function sortAlphabetically(array: SNComponent[]): SNComponent[] {
   return array.sort((a, b) => {
-    return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1
+    const aName = FindNativeFeature(a.identifier)?.name || a.name
+    const bName = FindNativeFeature(b.identifier)?.name || b.name
+    return aName.toLowerCase() < bName.toLowerCase() ? -1 : 1
   })
 }
 
@@ -376,7 +378,7 @@ export const NoteSideMenu = React.memo((props: Props) => {
     ]
     components.map(component => {
       options.push({
-        text: component.name,
+        text: FindNativeFeature(component.identifier)?.name || component.name,
         subtext: component.isMobileDefault ? 'Mobile Default' : undefined,
         key: component.uuid || component.name,
         selected: component.uuid === componentEditor?.uuid,