Fix zombie note issue, update sfjs to 0.3.11, v2.3.4

standardnotes · Aug 14, 2018 · 3b11667 · 3b11667
1 parent 71b34f9
commit 3b11667
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 23 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -97,8 +97,8 @@ android {
         applicationId "com.standardnotes"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 2030300
-        versionName "2.3.3"
+        versionCode 2030400
+        versionName "2.3.4"
         multiDexEnabled  true
         ndk {
             abiFilters "armeabi-v7a", "x86"

diff --git a/ios/StandardNotes/Info.plist b/ios/StandardNotes/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.3</string>
+	<string>2.3.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "StandardNotes",
-  "version": "2.3.3",
-  "versionIOS": "2.3.3",
-  "versionAndroid": "2.3.3",
+  "version": "2.3.4",
+  "versionIOS": "2.3.4",
+  "versionAndroid": "2.3.4",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -22,7 +22,7 @@
     "react-native-vector-icons": "^4.3.0",
     "regenerator": "^0.13.2",
     "sn-models": "0.1.8",
-    "standard-file-js": "0.3.10"
+    "standard-file-js": "0.3.11"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

diff --git a/src/containers/NoteCell.js b/src/containers/NoteCell.js
@@ -156,7 +156,7 @@ export default class NoteCell extends React.PureComponent {
               <Text style={this.styles.deleting}>Deleting...</Text>
             }
 
-            {note.conflictOf &&
+            {note.conflict_of &&
               <Text style={this.styles.deleting}>Conflicted Copy</Text>
             }
 

diff --git a/src/lib/sfjs/modelManager.js b/src/lib/sfjs/modelManager.js
@@ -37,15 +37,6 @@ export default class ModelManager extends SFModelManager {
     this.themes.length = 0;
   }
 
-  findOrCreateTagByTitle(title) {
-    var tag = _.find(this.tags, {title: title})
-    if(!tag) {
-      tag = this.createItem({content_type: "Tag", title: title});
-      this.addItem(tag);
-    }
-    return tag;
-  }
-
   addItems(items, globalOnly = false) {
     super.addItems(items, globalOnly);
 

diff --git a/src/screens/Notes.js b/src/screens/Notes.js
@@ -451,8 +451,8 @@ export default class Notes extends Abstract {
 
   _onPressItem = (item: hash) => {
     var run = () => {
-      if(item.conflictOf) {
-        item.conflictOf = null;
+      if(item.conflict_of) {
+        item.conflict_of = null;
       }
 
       this.props.navigator.push({