Skip to content

Commit 26a98f7

Browse files
AmanseCopilot
andcommitted
Release v2.0.1
Bump app and package versions to 2.0.1, include the key-generation route fix, and update native build versions for the release. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent bff31eb commit 26a98f7

9 files changed

Lines changed: 31 additions & 25 deletions

File tree

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ android {
9292
applicationId 'com.sanuki.PrettyPrivacy'
9393
minSdkVersion rootProject.ext.minSdkVersion
9494
targetSdkVersion rootProject.ext.targetSdkVersion
95-
versionCode 3
96-
versionName "2.0.0"
95+
versionCode 4
96+
versionName "2.0.1"
9797
}
9898
signingConfigs {
9999
debug {

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"expo": {
33
"name": "PrettyPrivacy",
44
"slug": "PrettyPrivacy",
5-
"version": "2.0.0",
5+
"version": "2.0.1",
66
"orientation": "portrait",
77
"icon": "./assets/images/icon.png",
88
"scheme": "prettyprivacy",

app/Home/keys.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const KeysScreen = () => {
5757
<View style={styles.emptyContainer}>
5858
<Text style={[styles.title, { color: colors.text }]}>No keys found</Text>
5959
<Text style={[styles.subtitle, { color: colors.placeholder }]}>
60-
Press '+' to import or generate a new key.
60+
Press &apos;+&apos; to import or generate a new key.
6161
</Text>
6262
</View>
6363
)}
@@ -136,4 +136,4 @@ const styles = StyleSheet.create({
136136
}
137137
});
138138

139-
export default KeysScreen;
139+
export default KeysScreen;

app/encrypt/generateKey.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ export default function GenerateKeyForm() {
3737
keyManager.generateKeyPairAndSave(name, email, passphrase).then(res => {
3838
if (res === "success") {
3939
setUpdateKey((c) => !c)
40-
router.navigate("/keys");
40+
router.navigate("/Home/keys");
41+
} else {
42+
alert("Failed to generate key. Please try again.");
4143
}
4244
})
4345
};

helpers/keyManager.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,19 @@ export default class PGPKeyManager {
6666
this.initStorages()
6767
}
6868

69-
const keyPair = await OpenPGP.generate({
70-
name,
71-
email,
72-
passphrase: passphrase || "",
73-
});
69+
try {
70+
const keyPair = await OpenPGP.generate({
71+
name,
72+
email,
73+
passphrase: passphrase || "",
74+
});
75+
await this.saveKey(keyPair.privateKey);
7476

75-
await this.saveKey(keyPair.privateKey);
77+
return "success"
78+
} catch (e) {
79+
return new Error("Failed to generate key pair. Please try again. Error: " + e.message);
80+
}
7681

77-
return "success"
7882
}
7983

8084
getPrivateKeyById(keyId) {

ios/PrettyPrivacy.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@
439439
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
440440
CLANG_ENABLE_MODULES = YES;
441441
CODE_SIGN_ENTITLEMENTS = PrettyPrivacy/PrettyPrivacy.entitlements;
442-
CURRENT_PROJECT_VERSION = 2;
442+
CURRENT_PROJECT_VERSION = 3;
443443
DEVELOPMENT_TEAM = S8C9WFT4QV;
444444
ENABLE_BITCODE = NO;
445445
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -452,7 +452,7 @@
452452
"$(inherited)",
453453
"@executable_path/Frameworks",
454454
);
455-
MARKETING_VERSION = 2.0.0;
455+
MARKETING_VERSION = 2.0.1;
456456
OTHER_LDFLAGS = (
457457
"$(inherited)",
458458
"-ObjC",
@@ -476,15 +476,15 @@
476476
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
477477
CLANG_ENABLE_MODULES = YES;
478478
CODE_SIGN_ENTITLEMENTS = PrettyPrivacy/PrettyPrivacy.entitlements;
479-
CURRENT_PROJECT_VERSION = 2;
479+
CURRENT_PROJECT_VERSION = 3;
480480
DEVELOPMENT_TEAM = S8C9WFT4QV;
481481
INFOPLIST_FILE = PrettyPrivacy/Info.plist;
482482
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
483483
LD_RUNPATH_SEARCH_PATHS = (
484484
"$(inherited)",
485485
"@executable_path/Frameworks",
486486
);
487-
MARKETING_VERSION = 2.0.0;
487+
MARKETING_VERSION = 2.0.1;
488488
OTHER_LDFLAGS = (
489489
"$(inherited)",
490490
"-ObjC",
@@ -506,7 +506,7 @@
506506
CLANG_ENABLE_MODULES = YES;
507507
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
508508
CODE_SIGN_STYLE = Automatic;
509-
CURRENT_PROJECT_VERSION = 2;
509+
CURRENT_PROJECT_VERSION = 3;
510510
DEVELOPMENT_TEAM = S8C9WFT4QV;
511511
GCC_PREPROCESSOR_DEFINITIONS = (
512512
"DEBUG=1",
@@ -519,7 +519,7 @@
519519
"@executable_path/Frameworks",
520520
"@executable_path/../../Frameworks",
521521
);
522-
MARKETING_VERSION = 2.0.0;
522+
MARKETING_VERSION = 2.0.1;
523523
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
524524
PRODUCT_BUNDLE_IDENTIFIER = "com.sanuki.PrettyPrivacyReact.share-extension";
525525
PRODUCT_NAME = ShareExtension;
@@ -658,7 +658,7 @@
658658
CLANG_ENABLE_MODULES = YES;
659659
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
660660
CODE_SIGN_STYLE = Automatic;
661-
CURRENT_PROJECT_VERSION = 2;
661+
CURRENT_PROJECT_VERSION = 3;
662662
DEVELOPMENT_TEAM = S8C9WFT4QV;
663663
GENERATE_INFOPLIST_FILE = YES;
664664
INFOPLIST_FILE = "ShareExtension/ShareExtension-Info.plist";
@@ -667,7 +667,7 @@
667667
"@executable_path/Frameworks",
668668
"@executable_path/../../Frameworks",
669669
);
670-
MARKETING_VERSION = 2.0.0;
670+
MARKETING_VERSION = 2.0.1;
671671
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
672672
PRODUCT_BUNDLE_IDENTIFIER = "com.sanuki.PrettyPrivacyReact.share-extension";
673673
PRODUCT_NAME = ShareExtension;

ios/PrettyPrivacy/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>2.0.0</string>
24+
<string>2.0.1</string>
2525
<key>CFBundleSignature</key>
2626
<string>????</string>
2727
<key>CFBundleURLTypes</key>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "prettyprivacy",
33
"main": "expo-router/entry",
4-
"version": "2.0.0",
4+
"version": "2.0.1",
55
"scripts": {
66
"start": "expo start",
77
"reset-project": "node ./scripts/reset-project.js",

0 commit comments

Comments
 (0)