From 148ef4732b69cbef06c2e3cb6c0423a8f69c1109 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 11:22:59 +0500
Subject: [PATCH 01/12] add proguard rules

---
 apps/mobile/android/app/proguard-rules.pro | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/mobile/android/app/proguard-rules.pro b/apps/mobile/android/app/proguard-rules.pro
index 091103133..e25229466 100644
--- a/apps/mobile/android/app/proguard-rules.pro
+++ b/apps/mobile/android/app/proguard-rules.pro
@@ -43,4 +43,6 @@
 
 -dontwarn java.awt.*
 -keep class com.sun.jna.* { *; }
+-keep class net.jpountz.** { *; }
+-keep class com.goterl.** { *; }
 -keepclassmembers class * extends com.sun.jna.* { public *; }
\ No newline at end of file

From 95fa4e5b6f80f619da7b147f471774f479452216 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 11:23:12 +0500
Subject: [PATCH 02/12] fix share extension crash on android

---
 apps/mobile/share/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/mobile/share/index.js b/apps/mobile/share/index.js
index 8450f3fd7..e50e3f979 100644
--- a/apps/mobile/share/index.js
+++ b/apps/mobile/share/index.js
@@ -17,7 +17,6 @@ import {
   View
 } from 'react-native';
 import Animated, {
-  color,
   Easing,
   timing,
   useValue
@@ -34,7 +33,6 @@ import {
 } from '../src/services/EventManager';
 import {getElevation} from '../src/utils';
 import {db} from '../src/utils/database';
-import {SIZE} from '../src/utils/SizeUtils';
 import Storage from '../src/utils/storage';
 import {sleep} from '../src/utils/TimeUtils';
 import {Search} from './search';
@@ -425,7 +423,7 @@ const NotesnookShare = ({quicknote = false}) => {
           <Text
             style={{
               color: colors.pri,
-              fontSize: SIZE.md,
+              fontSize: 17,
               fontFamily: 'OpenSans-Regular'
             }}>
             Quick note

From 4c891a5a91cdd537e3483764561c1f5d5264bcb8 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 11:31:14 +0500
Subject: [PATCH 03/12] fix file upload bug

---
 apps/mobile/src/utils/filesystem.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/mobile/src/utils/filesystem.js b/apps/mobile/src/utils/filesystem.js
index 3738bfe37..d3197af7c 100644
--- a/apps/mobile/src/utils/filesystem.js
+++ b/apps/mobile/src/utils/filesystem.js
@@ -70,6 +70,7 @@ async function uploadFile(filename, {url, headers}, cancelToken) {
     });
     const uploadUrl = await res.text();
     console.log(uploadUrl);
+    console.log(uploadUrl);
     let request = RNFetchBlob.config({
       IOSBackgroundTask: true
     })
@@ -100,7 +101,7 @@ async function uploadFile(filename, {url, headers}, cancelToken) {
       }
     }
 
-    return attachment;
+    return result;
   } catch (e) {
     useAttachmentStore.getState().remove(filename);
     console.log('upload file: ', e, url, headers);
@@ -114,9 +115,10 @@ async function downloadFile(filename, {url, headers}, cancelToken) {
     let path = `${cacheDir}/${filename}`;
     let exists = await RNFetchBlob.fs.exists(path);
     if (exists) {
+      console.log("file is downloaded");
       return true;
     }
-
+    console.log('downloading again')
     let res = await fetch(url, {
       method: 'GET',
       headers

From 62f1d6cd8f19a1583db18dc058d2bb508d04fa7b Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 11:32:07 +0500
Subject: [PATCH 04/12] check if attachment was found

---
 apps/mobile/src/utils/filesystem.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mobile/src/utils/filesystem.js b/apps/mobile/src/utils/filesystem.js
index d3197af7c..4f24f5dad 100644
--- a/apps/mobile/src/utils/filesystem.js
+++ b/apps/mobile/src/utils/filesystem.js
@@ -96,6 +96,7 @@ async function uploadFile(filename, {url, headers}, cancelToken) {
     useAttachmentStore.getState().remove(filename);
     if (result) {
       let attachment = db.attachments.attachment(filename);
+      if (!attachment) return result;
       if (!attachment.metadata.type.startsWith('image/')) {
         RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
       }

From 92daa3c5bb11a3293c008896ae5a1e97547d32b7 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 11:48:28 +0500
Subject: [PATCH 05/12] allow copying debug data if content is null

---
 .../src/components/ActionSheetComponent/index.js     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/mobile/src/components/ActionSheetComponent/index.js b/apps/mobile/src/components/ActionSheetComponent/index.js
index b99bc173e..df402679f 100644
--- a/apps/mobile/src/components/ActionSheetComponent/index.js
+++ b/apps/mobile/src/components/ActionSheetComponent/index.js
@@ -977,21 +977,25 @@ export const ActionSheetComponent = ({
           style={{
             width: '100%',
             paddingHorizontal: 12,
-            marginTop: 10
+            marginTop: 10,
           }}>
           <Button
             onPress={async () => {
+              console.log('copy data');
               let additionalData = {}
               if (note.type === "note") {
                 let content = await db.content.raw(note.contentId);
-                content = db.debug.strip(content);
-                additionalData.content = content;
+                if (content) {
+                  content = db.debug.strip(content);
+                  additionalData.content = content;
+                }
               }
               additionalData.lastSynced = await db.lastSynced();
-              
+              console.log(_note);
               let _note = {...note};
               _note.additionalData = additionalData;
               Clipboard.setString(db.debug.strip(_note));
+
               ToastEvent.show({
                 heading:"Debug data copied!",
                 type:'success',

From 0014ec4e356a38c075025c8963cfa2d80a7e3fbd Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 13:23:35 +0500
Subject: [PATCH 06/12] fix content not editable in share extension

---
 apps/mobile/share/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/mobile/share/index.js b/apps/mobile/share/index.js
index e50e3f979..7c3480126 100644
--- a/apps/mobile/share/index.js
+++ b/apps/mobile/share/index.js
@@ -252,6 +252,11 @@ const NotesnookShare = ({quicknote = false}) => {
 
   const onLoad = () => {
     postMessage(webviewRef, 'htmldiff', note.content?.data || '');
+    setTimeout(() => {
+      webviewRef.current?.injectJavaScript(`document
+      .querySelector('.htmldiff_div')
+      .setAttribute('contenteditable', 'true');`)
+    },300)
     let theme = {...colors};
     theme.factor = 1;
     postMessage(webviewRef, 'theme', JSON.stringify(theme));
@@ -352,7 +357,7 @@ const NotesnookShare = ({quicknote = false}) => {
           return {...note};
         });
       } else {
-        let html = validator.isURL(rawData.value)
+        let html =  validator.isURL(rawData.value)
           ? makeHtmlFromUrl(rawData.value)
           : makeHtmlFromPlainText(rawData.value);
         setNote(note => {
@@ -660,7 +665,7 @@ const NotesnookShare = ({quicknote = false}) => {
                   paddingRight: 80,
                   alignItems: 'center'
                 }}>
-                {validator.isURL(rawData.value) && (
+                {rawData.value && validator.isURL(rawData.value) && (
                   <Button
                     color={mode == 2 ? colors.shade : colors.nav}
                     icon={modes[2].icon}

From 9550bd4eec6672b7f86640bd87a3a0213872fae6 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 13:23:46 +0500
Subject: [PATCH 07/12] disable app update checker

---
 apps/mobile/src/components/AppLoader/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/src/components/AppLoader/index.js b/apps/mobile/src/components/AppLoader/index.js
index a9dd6c947..3b55f2568 100644
--- a/apps/mobile/src/components/AppLoader/index.js
+++ b/apps/mobile/src/components/AppLoader/index.js
@@ -1,5 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { Appearance, Platform, SafeAreaView, View } from 'react-native';
+import deviceInfoModule from 'react-native-device-info';
 import Animated, { Easing } from 'react-native-reanimated';
 import AnimatedProgress from 'react-native-reanimated-progress-bar';
 import SpInAppUpdates, {
@@ -21,7 +22,7 @@ import {
   eUnSubscribeEvent,
   ToastEvent
 } from '../../services/EventManager';
-import { editing } from '../../utils';
+import { APP_VERSION, editing } from '../../utils';
 import { COLOR_SCHEME_DARK } from '../../utils/Colors';
 import { db } from '../../utils/database';
 import {
@@ -141,6 +142,7 @@ const AppLoader = ({onLoad}) => {
   };
 
   const checkAppUpdates = async () => {
+    return false;
     if (Platform.OS === 'android') {
       try {
         let needsUpdate = await inAppUpdates.checkNeedsUpdate();

From f4f21e16c1b3b21e8f9b165af55e78454c0e858e Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 13:28:37 +0500
Subject: [PATCH 08/12] fix error

---
 apps/mobile/share/index.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/mobile/share/index.js b/apps/mobile/share/index.js
index 7c3480126..eb7736fba 100644
--- a/apps/mobile/share/index.js
+++ b/apps/mobile/share/index.js
@@ -16,11 +16,7 @@ import {
   useWindowDimensions,
   View
 } from 'react-native';
-import Animated, {
-  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';
@@ -255,8 +251,8 @@ const NotesnookShare = ({quicknote = false}) => {
     setTimeout(() => {
       webviewRef.current?.injectJavaScript(`document
       .querySelector('.htmldiff_div')
-      .setAttribute('contenteditable', 'true');`)
-    },300)
+      .setAttribute('contenteditable', 'true');`);
+    }, 300);
     let theme = {...colors};
     theme.factor = 1;
     postMessage(webviewRef, 'theme', JSON.stringify(theme));
@@ -357,7 +353,7 @@ const NotesnookShare = ({quicknote = false}) => {
           return {...note};
         });
       } else {
-        let html =  validator.isURL(rawData.value)
+        let html = validator.isURL(rawData.value)
           ? makeHtmlFromUrl(rawData.value)
           : makeHtmlFromPlainText(rawData.value);
         setNote(note => {
@@ -565,7 +561,7 @@ const NotesnookShare = ({quicknote = false}) => {
             style={{
               width: '100%'
             }}>
-            {!quicknote && (
+            {!quicknote ? (
               <Button
                 color={colors.accent}
                 onPress={onPress}
@@ -583,7 +579,7 @@ const NotesnookShare = ({quicknote = false}) => {
                   bottom: -35
                 }}
               />
-            )}
+            ) : null}
 
             <View
               style={{
@@ -665,7 +661,7 @@ const NotesnookShare = ({quicknote = false}) => {
                   paddingRight: 80,
                   alignItems: 'center'
                 }}>
-                {rawData.value && validator.isURL(rawData.value) && (
+                {rawData.value && validator.isURL(rawData.value) ? (
                   <Button
                     color={mode == 2 ? colors.shade : colors.nav}
                     icon={modes[2].icon}
@@ -677,7 +673,7 @@ const NotesnookShare = ({quicknote = false}) => {
                     type="rounded"
                     style={{paddingHorizontal: 12}}
                   />
-                )}
+                ) : null}
                 <Button
                   color={mode == 1 ? colors.shade : colors.nav}
                   icon={modes[1].icon}

From 1ea0a6db2dc663f5dc4afc8841d5677cb3ea31bf Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 14:35:27 +0500
Subject: [PATCH 09/12] add clearFileStorage function

---
 apps/mobile/src/utils/filesystem.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/apps/mobile/src/utils/filesystem.js b/apps/mobile/src/utils/filesystem.js
index 4f24f5dad..eb922091a 100644
--- a/apps/mobile/src/utils/filesystem.js
+++ b/apps/mobile/src/utils/filesystem.js
@@ -116,10 +116,10 @@ async function downloadFile(filename, {url, headers}, cancelToken) {
     let path = `${cacheDir}/${filename}`;
     let exists = await RNFetchBlob.fs.exists(path);
     if (exists) {
-      console.log("file is downloaded");
+      console.log('file is downloaded');
       return true;
     }
-    console.log('downloading again')
+    console.log('downloading again');
     let res = await fetch(url, {
       method: 'GET',
       headers
@@ -182,7 +182,7 @@ function cancelable(operation) {
       execute: () => operation(filename, {url, headers}, cancelToken),
       cancel: async () => {
         await cancelToken.cancel();
-        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log)
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
       }
     };
   };
@@ -232,9 +232,9 @@ async function downloadAttachment(hash, global = true) {
       message: attachment.metadata.filename + ' downloaded',
       type: 'success'
     });
-    RNFetchBlob.fs.unlink(
-      RNFetchBlob.fs.dirs.CacheDir + `/${attachment.metadata.hash}`
-    ).catch(console.log);
+    RNFetchBlob.fs
+      .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.metadata.hash}`)
+      .catch(console.log);
 
     if (Platform.OS === 'ios') {
       fileUri = folder.uri + `/${attachment.metadata.filename}`;
@@ -266,6 +266,18 @@ async function downloadAttachment(hash, global = true) {
   }
 }
 
+async function clearFileStorage() {
+  try {
+    let files = await RNFetchBlob.fs.ls(cacheDir);
+    for (let file of files) {
+      await RNFetchBlob.fs.unlink(file).catch(console.log);
+    }
+    console.log(await RNFetchBlob.fs.ls(cacheDir));
+  } catch (e) {
+    console.log(e);
+  }
+}
+
 export default {
   readEncrypted,
   writeEncrypted,
@@ -273,5 +285,6 @@ export default {
   downloadFile: cancelable(downloadFile),
   deleteFile,
   exists,
-  downloadAttachment
+  downloadAttachment,
+  clearFileStorage
 };

From 6ae34e759219a256358d13f9700f6b030df0868f Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 14:46:31 +0500
Subject: [PATCH 10/12] fix cache files not deleted

---
 apps/mobile/src/utils/filesystem.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/mobile/src/utils/filesystem.js b/apps/mobile/src/utils/filesystem.js
index eb922091a..8915be7b4 100644
--- a/apps/mobile/src/utils/filesystem.js
+++ b/apps/mobile/src/utils/filesystem.js
@@ -270,9 +270,12 @@ async function clearFileStorage() {
   try {
     let files = await RNFetchBlob.fs.ls(cacheDir);
     for (let file of files) {
-      await RNFetchBlob.fs.unlink(file).catch(console.log);
+      try {
+        await RNFetchBlob.fs.unlink(cacheDir + `/${file}`);
+      } catch (e) {
+        console.log(e);
+      }
     }
-    console.log(await RNFetchBlob.fs.ls(cacheDir));
   } catch (e) {
     console.log(e);
   }

From 2ca228bf0cdfdef2bb2b69f578dabdaee84dd7e1 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 14:48:00 +0500
Subject: [PATCH 11/12] bump version of bundle


From d7bfc1ac679adccdc451b4413107efad8311a204 Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 2 Nov 2021 15:21:47 +0500
Subject: [PATCH 12/12] update version

---
 .../ios/Notesnook.xcodeproj/project.pbxproj   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj
index 9c1232bf3..750ff6655 100644
--- a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj
+++ b/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 = 1600;
+				CURRENT_PROJECT_VERSION = 1601;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1191,7 +1191,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.00;
+				MARKETING_VERSION = 1.6.01;
 				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 = 1600;
+				CURRENT_PROJECT_VERSION = 1601;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -1291,7 +1291,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.00;
+				MARKETING_VERSION = 1.6.01;
 				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 = 1600;
+				CURRENT_PROJECT_VERSION = 1601;
 				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.6.00;
+				MARKETING_VERSION = 1.6.01;
 				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 = 1600;
+				CURRENT_PROJECT_VERSION = 1601;
 				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.6.00;
+				MARKETING_VERSION = 1.6.01;
 				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 = 1600;
+				CURRENT_PROJECT_VERSION = 1601;
 				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.6.00;
+				MARKETING_VERSION = 1.6.01;
 				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 = 1600;
+				CURRENT_PROJECT_VERSION = 1601;
 				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.6.00;
+				MARKETING_VERSION = 1.6.01;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";