Skip to content
Permalink
Browse files

0.9.5 Release Merge

commit 125bc655774113cb32fa9dfa5742af87ebfaa060
Merge: d087b3a b49b64d
Author: Joe Keenan <joe@flyingdiver.com>
Date:   Mon Sep 9 09:29:33 2013 -0400

    Merge branch 'release-0.9.5' of https://bitbucket.org/jpkeenanjr/stokerx into release-0.9.5

    Conflicts:
    	StokerX.xcodeproj/project.pbxproj

commit d087b3a79a83d25e22668ee6d892abf766b93340
Author: Joe Keenan <joe@flyingdiver.com>
Date:   Fri Sep 6 07:02:04 2013 -0400

    Moved files in project directory

    moved some class files to subfolders
    deleted ancient readme file
    Fixed some debug messages
    updated Credits
    Added CoreServices.framework for MailCore
    Changed deployment target to 10.7

commit b49b64d3c9395e46887d7dbab53bf576ac3ff3ca
Author: Joe Keenan <joe@flyingdiver.com>
Date:   Fri Sep 6 07:02:04 2013 -0400

    Moved files in project directory

    moved some class files to subfolders
    deleted ancient readme file
    Fixed some debug messages
    updated Credits

commit 6cbb9f4bf36c85517961048c23350502be424eb2
Author: Joe Keenan <joe@flyingdiver.com>
Date:   Fri Sep 6 06:59:04 2013 -0400

    0.9.5 bug fixes

    Removed some unneeded debug messages.
    Fixed Prowl so messages can be disabled.

commit 9e9a0951e1ae8301bae9fe177132fbfd564059ec
Author: Joe Keenan <joe@flyingdiver.com>
Date:   Thu Sep 5 22:04:00 2013 -0400

    Analyzer fixes

    Memory leaks and over-releases found by analyzer
  • Loading branch information...
FlyingDiver committed Sep 9, 2013
1 parent 9e77ed0 commit 8283660add81632dd76939e19c884f94a79e1f4c
@@ -1,23 +1,25 @@
{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww9000\viewh8400\viewkind0
\margl1440\margr1440\vieww10660\viewh16560\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

\f0\fs28 \cf0 StokerX was inspired by StokerLog by
\f1 Amir Majidimehr
\f0 . StokerX is not a port of StokerLog, it's a completely new program.\
\f0 . \
StokerX is not a port of StokerLog, it's a completely new program.\
\
StokerX icon by Dani Mazer.\
\
Thanks to all the Stoker users at the Virtual Weber Bulletin Board (http://tvwbb.com), especially my beta testers.\
Thanks to all my beta testers.\
\
StokerX uses the following frameworks and classes:\
\
AsyncSocket\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/cocoaasyncsocket/"}}{\fldrslt \cf0 http://code.google.com/p/cocoaasyncsocket/}}\
\
{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/cocoaasyncsocket/"}}{\fldrslt \cf0 https://github.com/robbiehanson/CocoaAsyncSocket\
}}\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\cf0 \
CorePlot\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/core-plot/"}}{\fldrslt \cf0 http://code.google.com/p/core-plot/}}\
@@ -28,8 +30,10 @@ Feedback Reporter\
}}\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\cf0 \
GRMustache\
{\field{\*\fldinst{HYPERLINK "https://github.com/groue/GRMustache"}}{\fldrslt https://github.com/groue/GRMustache\
}}\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "https://github.com/groue/GRMustache"}}{\fldrslt \cf0 https://github.com/groue/GRMustache\
}}\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\cf0 \
Growl\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "http://growl.info/"}}{\fldrslt \cf0 http://growl.info/}}\
@@ -46,13 +50,21 @@ GTM OAuth\
\cf0 \
JSON Framework\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/json-framework"}}{\fldrslt \cf0 http://code.google.com/p/json-framework}}\
\
{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/json-framework"}}{\fldrslt \cf0 https://github.com/stig/json-framework/\
}}\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\cf0 \
LVColorWellCell\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "https://github.com/lakshmivyas/lvcolorwellcell"}}{\fldrslt \cf0 https://github.com/lakshmivyas/lvcolorwellcell}}\
\
MailCore2\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "https://github.com/MailCore/mailcore2"}}{\fldrslt \cf0 https://github.com/MailCore/mailcore2}}\
\
Sparkle\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org/"}}{\fldrslt \cf0 http://sparkle.andymatuschak.org/}}\
}
\
SSKeyChain\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
{\field{\*\fldinst{HYPERLINK "https://github.com/soffes/sskeychain"}}{\fldrslt \cf0 https://github.com/soffes/sskeychain}}}
File renamed without changes.
@@ -14,7 +14,7 @@ @implementation EmailSender

- (void)sendEmailMessage:(NSString *) messageBody to: (NSString *) recipient
{
MCOSMTPSession *smtpSession = [[MCOSMTPSession alloc] init];
MCOSMTPSession *smtpSession = [[[MCOSMTPSession alloc] init] autorelease];

smtpSession.hostname = [[NSUserDefaults standardUserDefaults] stringForKey: kSMTPServerKey];
smtpSession.port = [[NSUserDefaults standardUserDefaults] integerForKey: kSMTPPortKey];
@@ -23,7 +23,7 @@ - (void)sendEmailMessage:(NSString *) messageBody to: (NSString *) recipient
smtpSession.username = [SSKeychain passwordForService: kStokerSMTPService account: kStokerSMTPLogin];
smtpSession.password = [SSKeychain passwordForService: kStokerSMTPService account: kStokerSMTPPassword];

MCOMessageBuilder * builder = [[MCOMessageBuilder alloc] init];
MCOMessageBuilder * builder = [[[MCOMessageBuilder alloc] init] autorelease];

[[builder header] setFrom:[MCOAddress addressWithDisplayName:nil mailbox: recipient]];

@@ -45,7 +45,7 @@ - (void)sendEmailMessage:(NSString *) messageBody to: (NSString *) recipient

- (void) validateSMTPWithCompletionHandler:(void (^)(BOOL))handler
{
MCOSMTPSession *smtpSession = [[MCOSMTPSession alloc] init];
MCOSMTPSession *smtpSession = [[[MCOSMTPSession alloc] init] autorelease];

smtpSession.hostname = [[NSUserDefaults standardUserDefaults] stringForKey: kSMTPServerKey];
smtpSession.port = [[NSUserDefaults standardUserDefaults] integerForKey: kSMTPPortKey];
@@ -6,7 +6,7 @@
//

#import <Foundation/Foundation.h>
#import "GTMOAuth/GTMOAuthWindowController.h"
#import "GTMOAuthWindowController.h"
#import "PreferencesController.h"
#import "JSON.h"

@@ -279,6 +279,7 @@ - (void) sendTweet: (NSString *) tweet

NSString *encodedText = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL,(CFStringRef) trimmedText, NULL,(CFStringRef) @"!*'();:@&=+$,/?%#[]", kCFStringEncodingUTF8);
NSString *body = [NSString stringWithFormat: @"status=%@", encodedText];
[encodedText release];

NSString *query = [@"https://api.twitter.com/1.1/statuses/update.json" stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:query]];
@@ -332,6 +333,7 @@ - (void) getDirectMessages:(NSTimer *) theTimer
NSString *replyMessage = [NSString stringWithFormat: @"Message received: \"%@\".", message];
NSString *encodedText = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL,(CFStringRef) replyMessage, NULL,(CFStringRef) @"!*'();:@&=+$,/?%#[]", kCFStringEncodingUTF8);
NSString *body = [NSString stringWithFormat: @"text=%@&user_id=%@", encodedText, senderID];
[encodedText release];

NSString *query = [@"https://api.twitter.com/1.1/direct_messages/new.json" stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:query]];
@@ -264,7 +264,7 @@ - (void) doNotification: (NotificationRule *) rule withMessage: (NSString *) mes

case kTwitterNotification:
{
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
[dateFormatter setDateFormat:@"HH:mm:ss"];
NSString *formattedMessage = [NSString stringWithFormat: @"%@ \nTime: %@", message, [dateFormatter stringFromDate: [NSDate date]]];

@@ -397,8 +397,6 @@ - (void)ruleEditDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:
theRule.value = [NSNumber numberWithDouble: [valueTextField doubleValue]];
theRule.lastNotified = [NSNumber numberWithDouble: 0.0];

NSLog(@"Notifications ruleEditDidEnd: new rule = %@", theRule);

[NotificationRule saveRules: ruleList];
[theRule release];

@@ -6,7 +6,7 @@
//

#import <Foundation/Foundation.h>
#import "GTMOAuth/GTMHTTPFetcher.h"
#import "GTMHTTPFetcher.h"
#import "XMLReader.h"
#import "PreferencesController.h"
#import "StokerXAppDelegate.h"
@@ -138,12 +138,19 @@ - (void) checkForProwlAuthWithToken: (NSTimer*) theTimer


- (void) sendPushMessage: (NSString *) message
{
{
// Don't send message if they're not enabled

if (![[[NSUserDefaults standardUserDefaults] stringForKey: kSendPushMessagesKey] boolValue])
return;

if (self.prowlAPIKey)
{
NSString *trimmedText = [message precomposedStringWithCanonicalMapping];
NSString *encodedText = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL,(CFStringRef) trimmedText, NULL,(CFStringRef) @"!*'();:@&=+$,/?%#[]", kCFStringEncodingUTF8);
NSString *body = [NSString stringWithFormat: @"apikey=%@&application=%@&event=%@", self.prowlAPIKey, @"StokerX", encodedText];
[encodedText release];

NSString *query = [@"https://api.prowlapp.com/publicapi/add" stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:query]];

File renamed without changes.
File renamed without changes.

This file was deleted.

Oops, something went wrong.
File renamed without changes.
File renamed without changes.
@@ -516,7 +516,7 @@ -(BOOL)axis:(CPTAxis *)axis shouldUpdateAxisLabelsAtLocations:(NSSet *)locations

-(IBAction)exportToPDF:(id)sender
{
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
[dateFormatter setDateFormat:@"yyyy-MM-dd"];
NSString *formattedDateString = [dateFormatter stringFromDate: [NSDate date]];

@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBuildDate</key>
<string>Thu Sep 5 20:23:07 EDT 2013</string>
<string>Mon Sep 9 09:32:41 EDT 2013</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
@@ -34,11 +34,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.9.4</string>
<string>0.9.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>498</string>
<string>515</string>
<key>FRFeedbackReporter.addressbookEmail </key>
<string>YES</string>
<key>FRFeedbackReporter.sendDetailsIsOptional</key>
Oops, something went wrong.

0 comments on commit 8283660

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.