From 488393e75dd3e75f2037e0ba525472a57158bb16 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 5 Aug 2020 00:07:55 +0100 Subject: [PATCH 1/3] Mobile: Fixes #3597: Fixed regression when saving a new notebook --- ReactNativeClient/lib/BaseModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactNativeClient/lib/BaseModel.js b/ReactNativeClient/lib/BaseModel.js index 06efaad03..7eca84ec7 100644 --- a/ReactNativeClient/lib/BaseModel.js +++ b/ReactNativeClient/lib/BaseModel.js @@ -446,7 +446,7 @@ class BaseModel { } static userSideValidation(o) { - if (('id' in o) && !o.id.match(/^[a-f0-9]{32}$/)) { + if (o.id && !o.id.match(/^[a-f0-9]{32}$/)) { throw new Error('Validation error: ID must a 32-characters lowercase hexadecimal string'); } From 8299164964ddfb36ff0ee00c0e9be58cf3b87f14 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 5 Aug 2020 00:18:42 +0100 Subject: [PATCH 2/3] Android release v1.0.336 --- README.md | 2 +- ReactNativeClient/android/app/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f34faff51..ac7982b5a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Linux | Get it on Google Play | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.335/joplin-v1.0.335.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.335/joplin-v1.0.335-32bit.apk) +Android | Get it on Google Play | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.336/joplin-v1.0.336.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.336/joplin-v1.0.336-32bit.apk) iOS | Get it on the App Store | - ## Terminal application diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index 774b5973d..c53a49a34 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -125,8 +125,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097571 - versionName "1.0.335" + versionCode 2097572 + versionName "1.0.336" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } From 60d77cb5ea632c68fc1abfb40c1135b61ca75bf1 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 5 Aug 2020 15:57:21 +0100 Subject: [PATCH 3/3] ios-v10.0.52 --- ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj index 73effa903..543125c9f 100644 --- a/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj +++ b/ReactNativeClient/ios/Joplin.xcodeproj/project.pbxproj @@ -337,7 +337,7 @@ CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 52; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = A9BXAFS6CT; HEADER_SEARCH_PATHS = ( @@ -357,7 +357,7 @@ INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 10.0.51; + MARKETING_VERSION = 10.0.52; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -380,7 +380,7 @@ CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 52; DEVELOPMENT_TEAM = A9BXAFS6CT; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -393,7 +393,7 @@ INFOPLIST_FILE = Joplin/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 10.0.51; + MARKETING_VERSION = 10.0.52; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC",