Now using own pods (DMListener, DMJobManager)

Author: Dylan Marriott

BitStore.xcodeproj/project.pbxproj

@@ -30,8 +30,6 @@
 		9A073F421996F044007E0D0F /* PhoneInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A073F411996F044007E0D0F /* PhoneInputViewController.m */; };
 		9A073F4819978042007E0D0F /* PhoneVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A073F4719978042007E0D0F /* PhoneVerificationViewController.m */; };
 		9A19022D19A0FAD7008D928B /* Keys.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A19022C19A0FAD7008D928B /* Keys.m */; };
-		9A1DAEBB197BD5B600BB9DF7 /* JobHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1DAEBA197BD5B600BB9DF7 /* JobHelper.m */; };
-		9A1DAEC1197BD72900BB9DF7 /* Job.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1DAEC0197BD72900BB9DF7 /* Job.m */; };
 		9A1DAEC4197BD95300BB9DF7 /* PushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1DAEC3197BD95300BB9DF7 /* PushHelper.m */; };
 		9A1DAEC8197C2C1C00BB9DF7 /* Unit.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1DAEC7197C2C1C00BB9DF7 /* Unit.m */; };
 		9A1DAECB197C305400BB9DF7 /* ChangeUnitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1DAECA197C305400BB9DF7 /* ChangeUnitViewController.m */; };
@@ -105,8 +103,6 @@
 		9AAAC43119D0C97400994EB6 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9AAAC43019D0C97400994EB6 /* MainInterface.storyboard */; };
 		9AB7EAF019903DEA00B9A1BA /* API.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AB7EAEF19903DEA00B9A1BA /* API.m */; };
 		9AB7EAF319903DFB00B9A1BA /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AB7EAF219903DFB00B9A1BA /* Environment.m */; };
-		9ABC07131983092500EC87A3 /* WeakRef.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABC07121983092500EC87A3 /* WeakRef.m */; };
-		9ABC071619830FB800EC87A3 /* Listeners.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABC071519830FB800EC87A3 /* Listeners.m */; };
 		9ABC07241983171000EC87A3 /* ReceiveNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABC07191983171000EC87A3 /* ReceiveNavigationController.m */; };
 		9ABC07251983171000EC87A3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABC071B1983171000EC87A3 /* ReceiveViewController.m */; };
 		9ABC07271983171000EC87A3 /* SendNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABC07211983171000EC87A3 /* SendNavigationController.m */; };
@@ -194,10 +190,6 @@
 		9A073F4719978042007E0D0F /* PhoneVerificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhoneVerificationViewController.m; sourceTree = "<group>"; };
 		9A19022B19A0FAD7008D928B /* Keys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Keys.h; sourceTree = "<group>"; };
 		9A19022C19A0FAD7008D928B /* Keys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Keys.m; sourceTree = "<group>"; };
-		9A1DAEB9197BD5B600BB9DF7 /* JobHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JobHelper.h; sourceTree = "<group>"; };
-		9A1DAEBA197BD5B600BB9DF7 /* JobHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JobHelper.m; sourceTree = "<group>"; };
-		9A1DAEBF197BD72900BB9DF7 /* Job.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Job.h; sourceTree = "<group>"; };
-		9A1DAEC0197BD72900BB9DF7 /* Job.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Job.m; sourceTree = "<group>"; };
 		9A1DAEC2197BD95300BB9DF7 /* PushHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushHelper.h; sourceTree = "<group>"; };
 		9A1DAEC3197BD95300BB9DF7 /* PushHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PushHelper.m; sourceTree = "<group>"; };
 		9A1DAEC6197C2C1C00BB9DF7 /* Unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unit.h; sourceTree = "<group>"; };
@@ -342,10 +334,6 @@
 		9AB7EAF119903DFB00B9A1BA /* Environment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Environment.h; sourceTree = "<group>"; };
 		9AB7EAF219903DFB00B9A1BA /* Environment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Environment.m; sourceTree = "<group>"; };
 		9ABC07091981C18500EC87A3 /* AddressHelperListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AddressHelperListener.h; sourceTree = "<group>"; };
-		9ABC07111983092500EC87A3 /* WeakRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakRef.h; sourceTree = "<group>"; };
-		9ABC07121983092500EC87A3 /* WeakRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeakRef.m; sourceTree = "<group>"; };
-		9ABC071419830FB800EC87A3 /* Listeners.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Listeners.h; sourceTree = "<group>"; };
-		9ABC071519830FB800EC87A3 /* Listeners.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Listeners.m; sourceTree = "<group>"; };
 		9ABC07181983171000EC87A3 /* ReceiveNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReceiveNavigationController.h; sourceTree = "<group>"; };
 		9ABC07191983171000EC87A3 /* ReceiveNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReceiveNavigationController.m; sourceTree = "<group>"; };
 		9ABC071A1983171000EC87A3 /* ReceiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReceiveViewController.h; sourceTree = "<group>"; };
@@ -515,16 +503,12 @@
 				9AA466BA1972D82A00A7B562 /* Color.h */,
 				9AA466BB1972D82A00A7B562 /* Color.m */,
 				9AF0C4F5196B3A0200F62DB5 /* iOSFix.h */,
-				9ABC071419830FB800EC87A3 /* Listeners.h */,
-				9ABC071519830FB800EC87A3 /* Listeners.m */,
 				9A265ED81965EE03005BE50A /* NSString+Satoshi.h */,
 				9A265ED91965EE03005BE50A /* NSString+Satoshi.m */,
 				9A265EDB1965EE42005BE50A /* UIAlertView+BitStore.h */,
 				9A265EDC1965EE42005BE50A /* UIAlertView+BitStore.m */,
 				9A33C53019956FD100312A88 /* URI.h */,
 				9A33C53119956FD100312A88 /* URI.m */,
-				9ABC07111983092500EC87A3 /* WeakRef.h */,
-				9ABC07121983092500EC87A3 /* WeakRef.m */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -663,8 +647,6 @@
 				9A67A7141950D70A001FCE32 /* ContactHelper.m */,
 				9A67A7151950D70A001FCE32 /* ExchangeHelper.h */,
 				9A67A7161950D70A001FCE32 /* ExchangeHelper.m */,
-				9A1DAEB9197BD5B600BB9DF7 /* JobHelper.h */,
-				9A1DAEBA197BD5B600BB9DF7 /* JobHelper.m */,
 				9A702651196098BF0033026C /* MessageHelper.h */,
 				9A702652196098BF0033026C /* MessageHelper.m */,
 				9A1DAEC2197BD95300BB9DF7 /* PushHelper.h */,
@@ -736,8 +718,6 @@
 				9A67A74F1950D70A001FCE32 /* Exchange.h */,
 				9A67A7501950D70A001FCE32 /* Exchange.m */,
 				9A67A7511950D70A001FCE32 /* ExchangeListener.h */,
-				9A1DAEBF197BD72900BB9DF7 /* Job.h */,
-				9A1DAEC0197BD72900BB9DF7 /* Job.m */,
 				9A073F3D1996EDCD007E0D0F /* Order.h */,
 				9A073F3E1996EDCD007E0D0F /* Order.m */,
 				9A67A7521950D70A001FCE32 /* Receiver.h */,
@@ -1132,7 +1112,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				9A702638195F26ED0033026C /* KeyExportViewController.m in Sources */,
-				9A1DAEBB197BD5B600BB9DF7 /* JobHelper.m in Sources */,
 				9A67A7851950D70A001FCE32 /* Transaction.m in Sources */,
 				9ABC07271983171000EC87A3 /* SendNavigationController.m in Sources */,
 				9A33C53219956FD100312A88 /* URI.m in Sources */,
@@ -1153,7 +1132,6 @@
 				037BB8A21961DEBB001C42B8 /* SettingsNavigationController.m in Sources */,
 				9A67A7671950D70A001FCE32 /* ContactHelper.m in Sources */,
 				9A8D3C53195E258600E88A1C /* SettingsViewController.m in Sources */,
-				9A1DAEC1197BD72900BB9DF7 /* Job.m in Sources */,
 				9A8D3C50195E248C00E88A1C /* ChangeCurrencyViewController.m in Sources */,
 				9A67A77B1950D70A001FCE32 /* qrspec.c in Sources */,
 				9ABC07241983171000EC87A3 /* ReceiveNavigationController.m in Sources */,
@@ -1177,7 +1155,6 @@
 				9A67A7831950D70A001FCE32 /* Exchange.m in Sources */,
 				9A67A7791950D70A001FCE32 /* qrencode.c in Sources */,
 				9A67A7681950D70A001FCE32 /* ExchangeHelper.m in Sources */,
-				9ABC07131983092500EC87A3 /* WeakRef.m in Sources */,
 				9A19022D19A0FAD7008D928B /* Keys.m in Sources */,
 				9A67A77F1950D70A001FCE32 /* Address.m in Sources */,
 				9A67A7821950D70A001FCE32 /* ContactList.m in Sources */,
@@ -1209,7 +1186,6 @@
 				9A67A76A1950D70A001FCE32 /* RequestHelper.m in Sources */,
 				9A9D588E19D4867400EA940A /* AccountActionButton.m in Sources */,
 				9A67A7561950D70A001FCE32 /* AppDelegate.m in Sources */,
-				9ABC071619830FB800EC87A3 /* Listeners.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

BitStore/AppDelegate.m

@@ -15,21 +15,23 @@
 #import "SendNavigationController.h"
 #import "ReceiveNavigationController.h"
 #import "AppStart.h"
+#import <DMJobManager/DMJobManager.h>
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
     [self.window makeKeyAndVisible];
-	[AppStart start];
+    [DMJobManager startManager];
+    [AppStart start];
     return YES;
 }
 
 - (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken {
     NSString* token = [deviceToken description];
-	token = [token stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"<>"]];
-	token = [token stringByReplacingOccurrencesOfString:@" " withString:@""];
+    token = [token stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"<>"]];
+    token = [token stringByReplacingOccurrencesOfString:@" " withString:@""];
     [PushHelper registerPush:token];
 }
 
@@ -45,7 +47,7 @@ - (void)application:(UIApplication*)application didFailToRegisterForRemoteNotifi
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     Address* address = [AddressHelper instance].defaultAddress;
     [address refresh];
-	[AppStart loadSettings];
+    [AppStart loadSettings];
 }
 
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
@@ -66,7 +68,7 @@ - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
             opened = YES;
         }
     }
-	return opened;
+    return opened;
 }
 
 @end

BitStore/Controller/Settings/ChangeUnitViewController.m

@@ -14,8 +14,7 @@
 #import "ExchangeListener.h"
 #import "Address.h"
 #import "AddressHelper.h"
-#import "Job.h"
-#import "JobHelper.h"
+#import <DMJobManager/DMJobManager.h>
 
 @interface ChangeUnitViewController () <ExchangeListener>
 @end
@@ -83,8 +82,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     [[PiwikTracker sharedInstance] sendEventWithCategory:@"Events" action:[NSString stringWithFormat:@"ChangedUnit_%@", [unit displayName]] label:@"ChangeUnit"];
     [[ExchangeHelper instance] changeUnit:unit];
     NSString* url = [NSString stringWithFormat:@"%@?a=%@&u=%@", [API changeUnitUrl], [AddressHelper instance].defaultAddress.address, unit.technicalName];
-    Job* job = [[Job alloc] initWithUrl:url];
-    [[JobHelper instance] postJob:job];
+    DMHTTPRequestJob* job = [[DMHTTPRequestJob alloc] initWithUrl:url];
+    [DMJobManager postJob:job];
     [self.navigationController popViewControllerAnimated:YES];
 }
 

BitStore/Helper/AddressHelper.m

@@ -11,13 +11,13 @@
 #import "Address.h"
 #import "AddressHelperListener.h"
 #import "AddressListener.h"
-#import "Listeners.h"
+#import <DMListener/DMListener.h>
 
 @interface AddressHelper () <AddressListener>
 @end
 
 @implementation AddressHelper {
-    Listeners* _listeners;
+    DMListeners* _listeners;
     NSMutableArray* _addresses;
 }
 
@@ -35,7 +35,7 @@ + (AddressHelper *)instance {
 - (id)init {
     if (self = [super init]) {
 	    [self loadState];
-		_listeners = [[Listeners alloc] init];
+		_listeners = [[DMListeners alloc] init];
 	}
     return self;
 }

BitStore/Helper/ContactHelper.m

@@ -10,11 +10,11 @@
 #import "ContactListListener.h"
 #import "UserDefaults.h"
 #import "Address.h"
-#import "Listeners.h"
+#import <DMListener/DMListener.h>
 
 @implementation ContactHelper {
     ContactList* _contactList;
-    Listeners* _listeners;
+    DMListeners* _listeners;
 }
 
 static ContactHelper* sharedHelper;
@@ -30,7 +30,7 @@ + (ContactHelper *)instance {
 
 - (id)init {
     if (self = [super init]) {
-		_listeners = [[Listeners alloc] init];
+		_listeners = [[DMListeners alloc] init];
 		[self loadState];
 		for (Address* a in _contactList.contacts) {
 			[a refresh];

BitStore/Helper/ExchangeHelper.m

@@ -11,11 +11,11 @@
 #import "UserDefaults.h"
 #import "ExchangeListener.h"
 #import "RequestHelper.h"
-#import "Listeners.h"
+#import <DMListener/DMListener.h>
 #import "SharedUser.h"
 
 @implementation ExchangeHelper {
-	Listeners* _listeners;
+	DMListeners* _listeners;
     Exchange* _exchange;
 	NSTimer* _timer;
 }
@@ -34,7 +34,7 @@ + (ExchangeHelper *)instance {
 
 - (id)init {
     if (self = [super init]) {
-		_listeners = [[Listeners alloc] init];
+		_listeners = [[DMListeners alloc] init];
 		[self loadState];
 		[self update];
 		_timer = [NSTimer scheduledTimerWithTimeInterval:(DELAY)

BitStore/Helper/JobHelper.h

@@ -7,13 +7,12 @@
 //
 
 #import "PushHelper.h"
-#import "JobHelper.h"
-#import "Job.h"
 #import "UserDefaults.h"
 #import "Address.h"
 #import "AddressHelper.h"
 #import "ExchangeHelper.h"
 #import "Unit.h"
+#import <DMJobManager/DMJobManager.h>
 
 @implementation PushHelper
 
@@ -23,7 +22,8 @@ + (void)registerPush:(NSString *)token {
     NSString* lang = [[NSLocale preferredLanguages] objectAtIndex:0];
     Unit* unit = [[ExchangeHelper instance] currentUnit];
     NSString* url = [NSString stringWithFormat:@"%@?a=%@&t=%@&l=%@&u=%@", [API registerPushUrl], address.address, token, lang, unit.technicalName];
-    [[JobHelper instance] postJob:[[Job alloc] initWithUrl:url]];
+    DMHTTPRequestJob* job = [[DMHTTPRequestJob alloc] initWithUrl:url];
+    [DMJobManager postJob:job];
 }
 
 + (void)unregister {
@@ -34,7 +34,8 @@ + (void)unregister {
 + (void)unregister:(NSString *)address {
     NSLog(@"push unregister: %@", address);
     NSString* url = [NSString stringWithFormat:@"%@?a=%@", [API unregisterPushUrl], address];
-    [[JobHelper instance] postJob:[[Job alloc] initWithUrl:url]];
+    DMHTTPRequestJob* job = [[DMHTTPRequestJob alloc] initWithUrl:url];
+    [DMJobManager postJob:job];
 }
 
 @end

BitStore/Helper/JobHelper.m

@@ -13,16 +13,16 @@
 #import "Receiver.h"
 #import "MessageHelper.h"
 #import "UserDefaults.h"
-#import "Listeners.h"
+#import <DMListener/DMListener.h>
 
 @implementation Address {
-    Listeners* _listeners;
+    DMListeners* _listeners;
     NSTimer* _timer;
 }
 
 - (id)init {
     if (self = [super init]) {
-        _listeners = [[Listeners alloc] init];
+        _listeners = [[DMListeners alloc] init];
         self.total = -1;
     }
     return self;