Remvoing public Motis dependency

mobilejazz · Oct 14, 2015 · 3865de5 · 3865de5
1 parent 4852a55
commit 3865de5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/Sample Project/ApiClient.xcodeproj/project.pbxproj b/Sample Project/ApiClient.xcodeproj/project.pbxproj
@@ -261,7 +261,7 @@
 		D20428C41AC400F3002F18FD /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0620;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Mobile Jazz";
 				TargetAttributes = {
 					D20428CB1AC400F3002F18FD = {
@@ -425,6 +425,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -488,6 +489,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = ApiClient/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mobilejazz.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -499,6 +501,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = ApiClient/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mobilejazz.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -517,6 +520,7 @@
 				);
 				INFOPLIST_FILE = ApiClientTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mobilejazz.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ApiClient.app/ApiClient";
 			};
@@ -532,6 +536,7 @@
 				);
 				INFOPLIST_FILE = ApiClientTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mobilejazz.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ApiClient.app/ApiClient";
 			};

diff --git a/Sample Project/ApiClient/Info.plist b/Sample Project/ApiClient/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mobilejazz.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Sample Project/ApiClientTests/Info.plist b/Sample Project/ApiClientTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mobilejazz.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Source Code/MJApiSession.m b/Source Code/MJApiSession.m
@@ -18,6 +18,7 @@
 
 #import "MJApiClientKeychainManager.h"
 #import "NSString+MJApiClientMD5Hashing.h"
+#import <Motis/Motis.h>
 
 @interface MJApiSessionConfiguration ()
 

diff --git a/Source Code/MJApiSessionOAuth.h b/Source Code/MJApiSessionOAuth.h
@@ -14,9 +14,9 @@
 // limitations under the License.
 //
 
-#import <Motis/Motis.h>
+#import <Foundation/Foundation.h>
 
-@interface MJApiSessionOAuth : MTSMotisObject
+@interface MJApiSessionOAuth : NSObject <NSCoding>
 
 @property (nonatomic, strong) NSString *accessToken;
 @property (nonatomic, strong) NSString *refreshToken;

diff --git a/Source Code/MJApiSessionOAuth.m b/Source Code/MJApiSessionOAuth.m
@@ -15,9 +15,32 @@
 //
 
 #import "MJApiSessionOAuth.h"
+#import <Motis/Motis.h>
 
 @implementation MJApiSessionOAuth
 
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super init];
+    if (self) {
+        _accessToken = [aDecoder decodeObjectForKey:@"accessToken"];
+        _refreshToken = [aDecoder decodeObjectForKey:@"refreshToken"];
+        _expiryDate = [aDecoder decodeObjectForKey:@"expiryDate"];
+        _tokenType = [aDecoder decodeObjectForKey:@"tokenType"];
+        _scope = [aDecoder decodeObjectForKey:@"scope"];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+    [aCoder encodeObject:_accessToken forKey:@"accessToken"];
+    [aCoder encodeObject:_refreshToken forKey:@"refreshToken"];
+    [aCoder encodeObject:_expiryDate forKey:@"expiryDate"];
+    [aCoder encodeObject:_tokenType forKey:@"tokenType"];
+    [aCoder encodeObject:_scope forKey:@"scope"];
+}
+
 #pragma mark Motis Methods
 
 + (NSDictionary *)mts_mapping {