Merge branch 'develop' into settings

apps/mobile/android/releasenotes/whatsnew-en-US

@@ -1,10 +1,4 @@
-- Sync over web-sockets
+- Improvements to sync performance
-- Optionally disable section headers in lists
+- Added sort by title option in sort menu
-- Formatting support for notification notes
-- Fix bold text in editor
-- Fix session-expired dialog does not hide after login
-- Fix login issues when 2FA enabled
-- Fix a race condition causing note to be empty in editor
-- Fix pin to notifications not working
 
 Thank you for using Notesnook!

apps/mobile/features.ts

@@ -1,12 +1,3 @@
 import { FeatureType } from './src/components/sheets/new-feature';
 
-export const features: FeatureType[] = [
+export const features: FeatureType[] = [];
-  {
-    title: 'Sync over web-sockets',
-    body: 'We have moved from SSE to web-sockets! Enjoy instant, fast and reliable sync with progress.'
-  },
-  {
-    title: 'Disable section headers',
-    body: 'Now you can disable section headers in lists by changing grouping to "none"'
-  }
-];

apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj

@@ -1118,7 +1118,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1807;
+				CURRENT_PROJECT_VERSION = 1809;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1191,7 +1191,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.8.7;
+				MARKETING_VERSION = 1.8.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1219,7 +1219,7 @@
 				CODE_SIGN_ENTITLEMENTS = Notesnook/Notesnook.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1807;
+				CURRENT_PROJECT_VERSION = 1809;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -1291,7 +1291,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.8.7;
+				MARKETING_VERSION = 1.8.9;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1449,7 +1449,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1807;
+				CURRENT_PROJECT_VERSION = 1809;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1460,7 +1460,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.8.7;
+				MARKETING_VERSION = 1.8.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1490,7 +1490,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1807;
+				CURRENT_PROJECT_VERSION = 1809;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1501,7 +1501,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.8.7;
+				MARKETING_VERSION = 1.8.9;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1530,7 +1530,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1807;
+				CURRENT_PROJECT_VERSION = 1809;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1603,7 +1603,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.8.7;
+				MARKETING_VERSION = 1.8.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1633,7 +1633,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1807;
+				CURRENT_PROJECT_VERSION = 1809;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1706,7 +1706,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.8.7;
+				MARKETING_VERSION = 1.8.9;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/release_notes.txt

@@ -1,9 +1,4 @@
-- Sync over web-sockets
+- Improvements to sync performance
-- Disable section headers in lists by changing grouping to "none"
+- Added sort by title option in sort menu
-- Fix padding-left on bold text in editor
-- Fix session-expired dialog does not hide after login
-- Fix login issues when 2FA enabled on some devices
-- Fix a race condition causing note to be empty in editor
-- Fix pin to notifications not working for some notes
 
 Thank you for using Notesnook!

apps/mobile/releasenotes.md

@@ -1,13 +1,4 @@
-# What's new
+- Improvements to sync performance
-- Sync over web-sockets
+- Added sort by title option in sort menu
-- Optionally Disable section headers in lists by changing grouping to "none"
-- Formatting support for notification notes
-
-# What's fixed
-- Fix padding-left on bold text in editor
-- Fix session-expired dialog does not hide after login
-- Fix login issues when 2FA enabled on some devices
-- Fix a race condition causing note to be empty in editor
-- Fix pin to notifications not working for some notes
 
 Thank you for using Notesnook!

apps/mobile/share/index.js

@@ -1,6 +1,7 @@
 import Clipboard from '@react-native-clipboard/clipboard';
 import { getLinkPreview } from 'link-preview-js';
 import { HTMLRootElement } from 'node-html-parser/dist/nodes/html';
+import { parseHTML } from 'notes-core/utils/htmlparser';
 import React, { Fragment, useEffect, useRef, useState } from 'react';
 import {
   ActivityIndicator,
@@ -8,18 +9,16 @@ import {
   Keyboard,
   KeyboardAvoidingView,
   Modal,
-  NativeModules,
   Platform,
   SafeAreaView,
   ScrollView,
   StatusBar,
   Text,
   TouchableOpacity,
-  UIManager,
   useWindowDimensions,
   View
 } from 'react-native';
-import Animated, { acc, Easing, timing, useValue } from 'react-native-reanimated';
+import Animated, { Easing, timing, useValue } from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
 import WebView from 'react-native-webview';
@@ -32,7 +31,6 @@ import Storage from '../src/utils/database/storage';
 import { sleep } from '../src/utils/time';
 import { Search } from './search';
 import { useShareStore } from './store';
-
 const AnimatedKAV = Animated.createAnimatedComponent(KeyboardAvoidingView);
 const AnimatedSAV = Animated.createAnimatedComponent(SafeAreaView);
 async function sanitizeHtml(site) {
@@ -114,8 +112,6 @@ function removeInvalidElements(document) {
  * @param {HTMLRootElement} document
  */
 function replaceSrcWithAbsoluteUrls(document, baseUrl) {
-  console.log('parsing:', document);
-
   let images = document.querySelectorAll('img');
   console.log(images.length);
   for (var i = 0; i < images.length; i++) {
@@ -145,7 +141,7 @@ function replaceSrcWithAbsoluteUrls(document, baseUrl) {
  */
 function fixCodeBlocks(document) {
   let elements = document.querySelectorAll('code,pre');
-  console.log(elements.length);
+
   for (let element of elements) {
     element.classList.add('.hljs');
   }
@@ -153,13 +149,11 @@ function fixCodeBlocks(document) {
 }
 
 function sanitize(html, baseUrl) {
-  let { parse } = require('node-html-parser');
+  let parser = parseHTML(html);
-  let parser = parse(html);
   parser = wrapTablesWithDiv(parser);
   parser = removeInvalidElements(parser);
   parser = replaceSrcWithAbsoluteUrls(parser, baseUrl);
   parser = fixCodeBlocks(parser);
-
   let htmlString = parser.outerHTML;
 
   htmlString = htmlString + `<hr>${makeHtmlFromUrl(baseUrl)}`;

apps/mobile/src/components/sheets/newfeature/index.tsx

@@ -77,6 +77,7 @@ NewFeature.present = () => {
   SettingsService.set({
     version: APP_VERSION
   });
+  if (features.length === 0) return;
   presentSheet({
     component: <NewFeature features={features} />
   });

apps/mobile/src/components/sheets/sort/index.js

@@ -64,10 +64,10 @@ const Sort = ({ type, screen }) => {
         <Button
           title={
             groupOptions.sortDirection === 'asc'
-              ? groupOptions.groupBy === 'abc'
+              ? groupOptions.groupBy === 'abc' || groupOptions.sortBy === 'title'
                 ? 'A - Z'
                 : 'Old - New'
-              : groupOptions.groupBy === 'abc'
+              : groupOptions.groupBy === 'abc' || groupOptions.sortBy === 'title'
               ? 'Z - A'
               : 'New - Old'
           }
@@ -114,32 +114,34 @@ const Sort = ({ type, screen }) => {
             iconSize={SIZE.md}
           />
         ) : (
-          Object.keys(SORT).map((item, index) => (
+          Object.keys(SORT).map((item, index) =>
-            <Button
+            item === 'title' && groupOptions.groupBy !== 'none' ? null : (
-              key={item}
+              <Button
-              type={groupOptions.sortBy === item ? 'grayBg' : 'gray'}
+                key={item}
-              title={SORT[item]}
+                type={groupOptions.sortBy === item ? 'grayBg' : 'gray'}
-              height={40}
+                title={SORT[item]}
-              iconPosition="left"
+                height={40}
-              icon={groupOptions.sortBy === item ? 'check' : null}
+                iconPosition="left"
-              style={{
+                icon={groupOptions.sortBy === item ? 'check' : null}
-                marginRight: 10,
+                style={{
-                paddingHorizontal: 8
+                  marginRight: 10,
-              }}
+                  paddingHorizontal: 8
-              buttonType={{
+                }}
-                text: groupOptions.sortBy === item ? colors.accent : colors.icon
+                buttonType={{
-              }}
+                  text: groupOptions.sortBy === item ? colors.accent : colors.icon
-              fontSize={SIZE.sm}
+                }}
-              onPress={async () => {
+                fontSize={SIZE.sm}
-                let _groupOptions = {
+                onPress={async () => {
-                  ...groupOptions,
+                  let _groupOptions = {
-                  sortBy: type === 'trash' ? 'dateDeleted' : item
+                    ...groupOptions,
-                };
+                    sortBy: type === 'trash' ? 'dateDeleted' : item
-                await updateGroupOptions(_groupOptions);
+                  };
-              }}
+                  await updateGroupOptions(_groupOptions);
-              iconSize={SIZE.md}
+                }}
-            />
+                iconSize={SIZE.md}
-          ))
+              />
+            )
+          )
         )}
       </View>
 

apps/mobile/src/screens/editor/Functions.js

@@ -746,7 +746,8 @@ async function addToCollection(id) {
       break;
     }
     case 'color': {
-      await db.notes.note(id).color(editing.actionAfterFirstSave.id);
+      console.log('after save action:', editing.actionAfterFirstSave.name);
+      await db.notes.note(id).color(editing.actionAfterFirstSave.color);
       editing.actionAfterFirstSave = {
         type: null
       };

apps/mobile/src/screens/editor/tiny/toolbar/picker.js

@@ -10,6 +10,7 @@ import PremiumService from '../../../../services/premium';
 import { editing } from '../../../../utils';
 import { db } from '../../../../utils/database';
 import { eCloseProgressDialog } from '../../../../utils/events';
+import filesystem from '../../../../utils/filesystem';
 import { sleep } from '../../../../utils/time';
 import { EditorWebView, getNote } from '../../Functions';
 import tiny, { safeKeyboardDismiss } from '../tiny';
@@ -321,7 +322,9 @@ async function attachFile(uri, hash, type, filename, options) {
       return false;
     }
 
-    if (!exists || options?.reupload) {
+    let fileCheck = exists && (await filesystem.checkAttachment(hash));
+
+    if (!exists || options?.reupload || !fileCheck?.success) {
       let key = await db.attachments.generateKey();
       encryptionInfo = await Sodium.encryptFile(key, {
         uri: uri,

apps/mobile/src/screens/notes/index.js

@@ -98,10 +98,12 @@ export const Notes = ({ route, navigation }) => {
 
   const setActionAfterFirstSave = () => {
     if (params.current?.get === 'monographs') return;
+    console.log(params.current);
     editing.actionAfterFirstSave = {
       type: params.current?.type,
       id: params.current?.id,
-      notebook: params.current?.notebookId
+      notebook: params.current?.notebookId,
+      color: params.current.title
     };
   };
 

apps/mobile/src/services/exporter.js

@@ -380,7 +380,7 @@ async function saveToMarkdown(note) {
     path = file.uri;
   }
 
-  let markdown = await db.notes.note(note.id).export('md', markdown);
+  let markdown = await db.notes.note(note.id).export('md');
   let fileName = sanitizeFilename(note.title + Date.now(), { replacement: '_' });
 
   let fileUri;

apps/mobile/src/utils/constants.js

@@ -19,8 +19,8 @@ export const GROUP = {
 
 export const SORT = {
   dateEdited: 'Date edited',
-  dateCreated: 'Date created'
+  dateCreated: 'Date created',
-  //title:"Title",
+  title: 'Title'
 };
 
 export const itemSkus = [

apps/mobile/src/utils/filesystem/download.js

@@ -10,6 +10,7 @@ import { db } from '../database';
 import Storage from '../database/storage';
 import { cacheDir, fileCheck } from './utils';
 import hosts from 'notes-core/utils/constants';
+import NetInfo from '@react-native-community/netinfo';
 
 export async function downloadFile(filename, data, cancelToken) {
   if (!data) return false;
@@ -163,6 +164,9 @@ export async function getUploadedFileSize(hash) {
 }
 
 export async function checkAttachment(hash) {
+  const internetState = await NetInfo.fetch();
+  const isInternetReachable = internetState.isConnected && internetState.isInternetReachable;
+  if (!isInternetReachable) return { success: true };
   const attachment = db.attachments.attachment(hash);
   if (!attachment) return { failed: 'Attachment not found.' };
 
@@ -170,7 +174,7 @@ export async function checkAttachment(hash) {
     const size = await getUploadedFileSize(hash);
     if (size <= 0) return { failed: 'File length is 0.' };
   } catch (e) {
-    return { failed: e.message };
+    return { failed: e?.message };
   }
   return { success: true };
 }

apps/mobile/src/utils/functions.js

@@ -1,12 +1,11 @@
 import { Linking } from 'react-native';
-import { InAppBrowser } from 'react-native-inappbrowser-reborn';
 import { history } from '.';
-import { useMenuStore, useSelectionStore } from '../stores/stores';
 import { eSendEvent, ToastEvent } from '../services/event-manager';
 import Navigation from '../services/navigation';
+import SearchService from '../services/search';
+import { useMenuStore, useSelectionStore } from '../stores/stores';
 import { db } from './database';
 import { eClearEditor } from './events';
-import SearchService from '../services/search';
 
 export const deleteItems = async item => {
   if (item && db.monographs.isPublished(item.id)) {
@@ -118,27 +117,7 @@ export const deleteItems = async item => {
 export const openLinkInBrowser = async (link, colors) => {
   try {
     const url = link;
-    if (await InAppBrowser.isAvailable()) {
+    Linking.openURL(url);
-      await InAppBrowser.open(url, {
-        // iOS Properties
-        dismissButtonStyle: 'cancel',
-        preferredBarTintColor: colors.accent,
-        preferredControlTintColor: 'white',
-        readerMode: false,
-        animated: true,
-        modalPresentationStyle: 'fullScreen',
-        modalTransitionStyle: 'coverVertical',
-        modalEnabled: true,
-        enableBarCollapsing: false,
-        // Android Properties
-        showTitle: true,
-        toolbarColor: colors.accent,
-        secondaryToolbarColor: 'black',
-        enableUrlBarHiding: true,
-        enableDefaultShare: true,
-        forceCloseOnRedirection: false
-      });
-    } else Linking.openURL(url);
   } catch (error) {
     console.log(error.message);
   }

apps/mobile/src/utils/hooks/useAppEvents.js

@@ -11,7 +11,7 @@ import {
 } from 'react-native';
 import * as RNIap from 'react-native-iap';
 import { enabled } from 'react-native-privacy-snapshot';
-import { doInBackground, editing } from '..';
+import { editing } from '..';
 import { Walkthrough } from '../../components/walkthroughs';
 import {
   EditorWebView,
@@ -37,7 +37,7 @@ import {
 } from '../../services/message';
 import PremiumService from '../../services/premium';
 import SettingsService from '../../services/settings';
-import Sync, { ignoredMessages } from '../../services/sync';
+import Sync from '../../services/sync';
 import {
   clearAllStores,
   initialize,

apps/mobile/src/utils/index.js

@@ -111,12 +111,15 @@ export function setWidthHeight(size) {
 }
 
 export function getTotalNotes(notebook) {
+  if (!notebook || notebook.type === 'header') return 0;
   if (notebook.type === 'topic') {
+    if (!notebook.notes) return 0;
     return notebook.notes.length;
   }
   if (!notebook.topics) return 0;
   return notebook.topics.reduce((sum, topic) => {
-    return sum + topic.notes.length;
+    let length = topic?.notes ? topic.notes.length : 0;
+    return sum + length;
   }, 0);
 }
 

apps/mobile/version.js

@@ -1 +1 @@
-export const APP_VERSION=1807;
+export const APP_VERSION=1809;