mirror/mobile
1
0
Fork 0
mirror of https://github.com/standardnotes/mobile.git synced 2026-05-19 12:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

SFJS updates

Browse Source
This commit is contained in:
Mo Bitar
2019-06-03 09:15:52 -05:00
parent c84cabb80b
commit fa620cffbf
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ios/StandardNotes.xcodeproj/project.pbxproj
View File

@@ -1080,7 +1080,8 @@
TestTargetID = 13B07F861A680F5B00A75B9A;
};
13B07F861A680F5B00A75B9A = {
ProvisioningStyle = Manual;
DevelopmentTeam = HKF9BXSN95;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.DataProtection = {
enabled = 1;
@@ -1836,11 +1837,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = Blue;
CODE_SIGN_ENTITLEMENTS = StandardNotes/StandardNotes.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = HKF9BXSN95;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-keychain/RNKeychainManager",
@@ -1877,11 +1877,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = Blue;
CODE_SIGN_ENTITLEMENTS = StandardNotes/StandardNotes.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 69F43LABD5;
DEVELOPMENT_TEAM = HKF9BXSN95;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-keychain/RNKeychainManager",
@@ -1907,7 +1905,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.standardnotes.standardnotes;
PRODUCT_NAME = StandardNotes;
PROVISIONING_PROFILE_SPECIFIER = "StandardNotes-AppStore";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};

2
ios/StandardNotes/Info.plist
View File

@@ -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>

8
src/lib/sfjs/migrationManager.js
View File

@@ -52,7 +52,7 @@ export default class MigrationManager extends SFMigrationManager {
let options = { contentType: contentType };
// The user is signed in
Sync.get().stateless_downloadAllItems(options).then((items) => {
Sync.get().stateless_downloadAllItems(options).then(async (items) => {
let matchingPrivs = items.filter((candidate) => {
return candidate.content_type == contentType;
});
@@ -61,7 +61,7 @@ export default class MigrationManager extends SFMigrationManager {
return;
}
let mapped = ModelManager.get().mapResponseItemsToLocalModelsOmittingFields(
let mapped = await ModelManager.get().mapResponseItemsToLocalModelsOmittingFields(
matchingPrivs, null, SFModelManager.MappingSourceRemoteRetrieved);
// Singleton manager usually resolves singletons on sync completion callback,
// but since we're manually mapping, we have to make it manually resolve singletons
@@ -84,7 +84,7 @@ export default class MigrationManager extends SFMigrationManager {
let options = { contentType: contentType };
// The user is signed in
Sync.get().stateless_downloadAllItems(options).then((items) => {
Sync.get().stateless_downloadAllItems(options).then(async (items) => {
let matchingTags = items.filter((candidate) => {
return candidate.content_type == contentType;
});
@@ -93,7 +93,7 @@ export default class MigrationManager extends SFMigrationManager {
return;
}
ModelManager.get().mapResponseItemsToLocalModelsOmittingFields(
await ModelManager.get().mapResponseItemsToLocalModelsOmittingFields(
matchingTags, null, SFModelManager.MappingSourceRemoteRetrieved);
})
}

2
src/screens/KeyRecovery.js
View File

@@ -73,7 +73,7 @@ export default class KeyRecovery extends Abstract {
let useKeys = async (confirm) => {
let run = async () => {
await KeysManager.get().persistOfflineKeys(keys);
ModelManager.get().mapResponseItemsToLocalModelsOmittingFields(this.items, null, SFModelManager.MappingSourceLocalRetrieved);
await ModelManager.get().mapResponseItemsToLocalModelsOmittingFields(this.items, null, SFModelManager.MappingSourceLocalRetrieved);
await Sync.get().writeItemsToLocalStorage(this.items);
this.dismiss();
}

9
src/screens/Notes/NoteCell.js
View File

@@ -92,7 +92,7 @@ export default class NoteCell extends ThemedPureComponent {
options.push(ActionSheetWrapper.BuildOption({text: "Move to Trash", key: ItemActionManager.TrashEvent, destructive: true, callback: callbackForAction}));
} else {
options.push(ActionSheetWrapper.BuildOption({text: "Restore Note", key: ItemActionManager.RestoreEvent, destructive: false, callback: callbackForAction}));
options.push(ActionSheetWrapper.BuildOption({text: "Delete Forever", key: ItemActionManager.DeleteEvent, destructive: true, callback: callbackForAction}));
options.push(ActionSheetWrapper.BuildOption({text: "Delete Permanently", key: ItemActionManager.DeleteEvent, destructive: true, callback: callbackForAction}));
}
sheet = new ActionSheetWrapper({
@@ -160,6 +160,13 @@ export default class NoteCell extends ThemedPureComponent {
})
}
if(note.deleted) {
flags.push({
text: "Deletion Pending Sync",
color: StyleKit.variables.stylekitDangerColor
})
}
return flags;
}