Permalink
Browse files

[#90]

  • Loading branch information...
1 parent 69bf85d commit 71a5cea2681b651667c9607fe8f41a3ba5d8aa86 Roman Zechmeister committed Oct 20, 2011
Showing with 9 additions and 16 deletions.
  1. +1 −2 .gitignore
  2. +0 −6 GPGServices.xcodeproj/project.pbxproj
  3. +3 −3 Resources/Info.plist
  4. +5 −5 Source/GPGServices.m
View
@@ -1,6 +1,5 @@
# Xcode
-build/*
-Dependencies/zipkit/build/*
+build/
build.log
*.pbxuser
!default.pbxuser
@@ -502,13 +502,10 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
- "$(SRCROOT)/Dependencies/zipkit/build/Debug",
"$(FRAMEWORK_SEARCH_PATHS)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
- "$(SRCROOT)/Dependencies/libmacgpg/build/Debug",
- "\"$(SRCROOT)/Dependencies/libmacgpg/build/Release\"",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Dependencies/zipkit/build/$CONFIGURATION\"";
@@ -530,13 +527,10 @@
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
- "$(SRCROOT)/Dependencies/libmacgpg/build/Debug",
- "$(SRCROOT)/Dependencies/zipkit/build/Debug",
"$(FRAMEWORK_SEARCH_PATHS)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
- "\"$(SRCROOT)/Dependencies/libmacgpg/build/Release\"",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Dependencies/zipkit/build/$CONFIGURATION\"";
View
@@ -68,9 +68,9 @@
<key>CFBundleURLTypes</key>
<array/>
<key>CFBundleShortVersionString</key>
- <string>1.7a1</string>
+ <string>1.7a2</string>
<key>CFBundleVersion</key>
- <string>1.7a1</string>
+ <string>1.7a2</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -148,6 +148,7 @@
<array>
<string>NSStringPboardType</string>
<string>NSRTFPboardType</string>
+ <string>public.plain-text</string>
</array>
</dict>
<dict>
@@ -280,7 +281,6 @@
</dict>
<key>NSSendTypes</key>
<array>
- <string>public.plain-text</string>
<string>NSFilenamesPboardType</string>
</array>
</dict>
View
@@ -279,7 +279,7 @@ -(NSString *)encryptTextString:(NSString *)inputString
if(ret != 0) {
return nil;
} else {
- NSData* inputData = [inputString gpgData];
+ NSData* inputData = [inputString UTF8Data];
BOOL sign = rcp.sign;
NSArray* validRecipients = rcp.selectedKeys;
GPGKey* privateKey = rcp.selectedPrivateKey;
@@ -353,7 +353,7 @@ -(NSString *)decryptTextString:(NSString *)inputString
NSData* outputData = nil;
@try {
- outputData = [ctx decryptData:[inputString gpgData]];
+ outputData = [ctx decryptData:[inputString UTF8Data]];
} @catch (NSException* localException) {
[self displayOperationFailedNotificationWithTitle:[localException reason]
message:[[[localException userInfo] valueForKey:@"gpgTask"] errText]];
@@ -370,7 +370,7 @@ -(NSString *)signTextString:(NSString *)inputString
GPGController* ctx = [GPGController gpgController];
ctx.useArmor = YES;
- NSData* inputData = [inputString gpgData];
+ NSData* inputData = [inputString UTF8Data];
GPGKey* chosenKey = [GPGServices myPrivateKey];
NSSet* availableKeys = [[GPGServices myPrivateKeys] filteredSetUsingPredicate:
@@ -440,8 +440,8 @@ -(void)verifyTextString:(NSString *)inputString
ctx.useArmor = YES;
@try {
- //NSArray* sigs = [ctx verifySignature:[inputString gpgData] originalData:[NSData data]];
- NSArray* sigs = [ctx verifySignature:[inputString gpgData] originalData:nil];
+ //NSArray* sigs = [ctx verifySignature:[inputString UTF8Data] originalData:[NSData data]];
+ NSArray* sigs = [ctx verifySignature:[inputString UTF8Data] originalData:nil];
if([sigs count] > 0)
{

0 comments on commit 71a5cea

Please sign in to comment.