Skip to content
This repository has been archived by the owner on Jun 15, 2022. It is now read-only.

Commit

Permalink
SFJS updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@moughxyz
moughxyz committed May 27, 2019
1 parent c01d631 commit 4ffbdd7
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 13 deletions.
34 changes: 31 additions & 3 deletions ios/StandardNotes.xcodeproj/project.pbxproj
View file
Expand Up @@ -5,6 +5,7 @@
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
Expand Down Expand Up @@ -41,6 +42,7 @@
5A8928DC2824482A99763067 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EF2E9E34ADA441EDB4CE8370 /* FontAwesome5_Regular.ttf */; };
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
6C1915C4DE9040A9BB17CFBB /* libRNStoreReview.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADB6F6B9BC7144FCB2C08D40 /* libRNStoreReview.a */; };
7A0B269BD1714EA79E486BAE /* libRNCAsyncStorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1009A2994551440E819E2CE6 /* libRNCAsyncStorage.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
840E2D03A7CE4291AA2D3383 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 131C577CAE5F4B7D8CFF1197 /* AntDesign.ttf */; };
965031D980094619B7DBA0FD /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1F569402A90047A59845394A /* Ionicons.ttf */; };
Expand All @@ -58,7 +60,6 @@
CDB58A211F6C51A4009EF868 /* libReactNativeFingerprintScanner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDB58A0F1F6C5174009EF868 /* libReactNativeFingerprintScanner.a */; };
CDB58A221F6C5235009EF868 /* libRCTAes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDB58A091F6C516B009EF868 /* libRCTAes.a */; };
F0D84FDB75374348BC0017C2 /* libBugsnagReactNative.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EFD3F9197A5F41C0904D7E60 /* libBugsnagReactNative.a */; };
7A0B269BD1714EA79E486BAE /* libRNCAsyncStorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1009A2994551440E819E2CE6 /* libRNCAsyncStorage.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -419,6 +420,13 @@
remoteGlobalIDString = 5DBEB1501B18CEA900B34395;
remoteInfo = RNVectorIcons;
};
CDBA9120228CE3AC009F7AC7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FF655164AD874250A8F6E20E /* RNCAsyncStorage.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNCAsyncStorage;
};
CDE0D5F821D4012300E093B5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 19A39FBB53A3465B81022E02 /* RNGestureHandler.xcodeproj */;
Expand Down Expand Up @@ -471,6 +479,7 @@
074A7613CE8C41BAB3C4193E /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; };
0752A2CAF82B4C9198CAC803 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
0BA1C89777414706A3F02AC6 /* RNKeychain.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNKeychain.xcodeproj; path = "../node_modules/react-native-keychain/RNKeychain.xcodeproj"; sourceTree = "<group>"; };
1009A2994551440E819E2CE6 /* libRNCAsyncStorage.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCAsyncStorage.a; sourceTree = "<group>"; };
12E89137A7104D91898C2734 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
131C577CAE5F4B7D8CFF1197 /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; };
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -523,8 +532,7 @@
EC178A0479CE4154896293C3 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCWebView.xcodeproj; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = "<group>"; };
EF2E9E34ADA441EDB4CE8370 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; };
EFD3F9197A5F41C0904D7E60 /* libBugsnagReactNative.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBugsnagReactNative.a; sourceTree = "<group>"; };
FF655164AD874250A8F6E20E /* RNCAsyncStorage.xcodeproj */ = {isa = PBXFileReference; name = "RNCAsyncStorage.xcodeproj"; path = "../node_modules/@react-native-community/async-storage/ios/RNCAsyncStorage.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
1009A2994551440E819E2CE6 /* libRNCAsyncStorage.a */ = {isa = PBXFileReference; name = "libRNCAsyncStorage.a"; path = "libRNCAsyncStorage.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
FF655164AD874250A8F6E20E /* RNCAsyncStorage.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCAsyncStorage.xcodeproj; path = "../node_modules/@react-native-community/async-storage/ios/RNCAsyncStorage.xcodeproj"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -916,6 +924,14 @@
name = Products;
sourceTree = "<group>";
};
CDBA911D228CE3AC009F7AC7 /* Products */ = {
isa = PBXGroup;
children = (
CDBA9121228CE3AC009F7AC7 /* libRNCAsyncStorage.a */,
);
name = Products;
sourceTree = "<group>";
};
CDD38E0A1F6DCEBB00740780 /* Recovered References */ = {
isa = PBXGroup;
children = (
Expand All @@ -927,6 +943,7 @@
CEB6B877AE784055A8E294A8 /* libRNFS.a */,
37A42F4068AE42DD8D2DF182 /* libRNFileViewer.a */,
4449457EB3FC4387810027F1 /* libRNCWebView.a */,
1009A2994551440E819E2CE6 /* libRNCAsyncStorage.a */,
);
name = "Recovered References";
sourceTree = "<group>";
Expand Down Expand Up @@ -1152,6 +1169,10 @@
ProductGroup = CDB58A0B1F6C5174009EF868 /* Products */;
ProjectRef = CDB58A0A1F6C5174009EF868 /* ReactNativeFingerprintScanner.xcodeproj */;
},
{
ProductGroup = CDBA911D228CE3AC009F7AC7 /* Products */;
ProjectRef = FF655164AD874250A8F6E20E /* RNCAsyncStorage.xcodeproj */;
},
{
ProductGroup = CD5AEDE022825CB8002439FB /* Products */;
ProjectRef = EC178A0479CE4154896293C3 /* RNCWebView.xcodeproj */;
Expand Down Expand Up @@ -1543,6 +1564,13 @@
remoteRef = CDB58A671F6C5294009EF868 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CDBA9121228CE3AC009F7AC7 /* libRNCAsyncStorage.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNCAsyncStorage.a;
remoteRef = CDBA9120228CE3AC009F7AC7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CDE0D5F921D4012300E093B5 /* libRNGestureHandler.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down
6 changes: 4 additions & 2 deletions ios/StandardNotes/Info.plist
View file
Expand Up @@ -71,7 +71,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand All @@ -88,7 +88,9 @@
<key>NSFaceIDUsageDescription</key>
<string>Face ID is required to unlock your notes.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Not used but required because API exists somewhere in build or dependencies.</string>
<string>Not used by application; required in configuration because API exists in build dependencies.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Not used by application; required in configuration because API exists in build dependencies.</string>
<key>UIAppFonts</key>
<array>
<string>Entypo.ttf</string>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/itemActionManager.js
View file
Expand Up @@ -96,7 +96,7 @@ export default class ItemActionManager {

else if(event == this.LockEvent || event == this.UnlockEvent) {
item.setAppDataItem("locked", event == this.LockEvent);
item.setDirty(true, true);
item.setDirty(true);
Sync.get().sync();
callback && callback();
}
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Compose.js
View file
Expand Up @@ -408,7 +408,7 @@ export default class Compose extends Abstract {
}

sync(note, callback) {
note.setDirty(true);
note.setDirty(true, true);

Sync.get().sync().then((response) => {
if(response && response.error) {
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Notes/Notes.js
View file
Expand Up @@ -356,7 +356,7 @@ export default class Notes extends Abstract {
var run = () => {
if(item.content.conflict_of) {
item.content.conflict_of = null;
item.setDirty(true, true);
item.setDirty(true);
Sync.get().sync();
}

Expand Down
6 changes: 1 addition & 5 deletions src/screens/Root.js
View file
Expand Up @@ -164,9 +164,6 @@ export default class Root extends Abstract {
}

initializeData() {
// Ensure no sync executes until initial data load
Sync.get().lockSyncing();

let encryptionEnabled = KeysManager.get().isOfflineEncryptionEnabled();
this.setSubTitle(encryptionEnabled ? "Decrypting items..." : "Loading items...");
let incrementalCallback = (current, total) => {
Expand All @@ -180,7 +177,6 @@ export default class Root extends Abstract {
}

let loadLocalCompletion = (items) => {
Sync.get().unlockSyncing();
this.setSubTitle("Syncing...");
this.dataLoaded = true;

Expand All @@ -195,7 +191,7 @@ export default class Root extends Abstract {
loadLocalCompletion();
} else {
let batchSize = 100;
Sync.get().loadLocalItems(incrementalCallback, batchSize).then((items) => {
Sync.get().loadLocalItems({incrementalCallback, batchSize}).then((items) => {
setTimeout(() => {
loadLocalCompletion(items);
});
Expand Down

0 comments on commit 4ffbdd7

Please sign in to comment.