Fix MKNetwork issues

Author: bjtitus

RSOAuthEngine/RSOAuthEngine.h

@@ -23,6 +23,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#import "MKNetworkEngine.h"
+
 typedef enum _RSOAuthTokenType
 {
     RSOAuthRequestToken,

RSOAuthEngine/RSOAuthEngine.m

@@ -164,8 +164,8 @@ - (NSString *)signatureBaseStringForURL:(NSString *)url method:(NSString *)metho
     [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
         if ([key hasPrefix:@"oauth_"]  && ![key isEqualToString:@"oauth_signature"] && obj && ![obj isEqualToString:@""]) {
             [parameters addObject:@{
-                @"key": [key mk_urlEncodedString],
-                @"value": [obj mk_urlEncodedString]
+                @"key": [key urlEncodedString],
+                @"value": [obj urlEncodedString]
             }];
         }
     }];
@@ -187,8 +187,8 @@ - (NSString *)signatureBaseStringForURL:(NSString *)url method:(NSString *)metho
     // Create the signature base string
     NSString *signatureBaseString = [NSString stringWithFormat:@"%@&%@&%@",
                                      [method uppercaseString],
-                                     [url mk_urlEncodedString],
-                                     [[normalizedParameters componentsJoinedByString:@"&"] mk_urlEncodedString]];
+                                     [url urlEncodedString],
+                                     [[normalizedParameters componentsJoinedByString:@"&"] urlEncodedString]];
 
     return signatureBaseString;
 }
@@ -220,12 +220,12 @@ - (NSString *)signatureBaseStringForRequest:(MKNetworkOperation *)request
             [request.readonlyPostDictionary enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
                 if([obj isKindOfClass:[NSString class]]) {
                     [parameters addObject:@{
-                        @"key": [key mk_urlEncodedString],
-                        @"value": [obj mk_urlEncodedString]
+                        @"key": [key urlEncodedString],
+                        @"value": [obj urlEncodedString]
                      }];
                 } else {
                     [parameters addObject:@{
-                        @"key": [key mk_urlEncodedString],
+                        @"key": [key urlEncodedString],
                         @"value": [NSString stringWithFormat:@"%@", obj]
                      }];
                 }
@@ -239,8 +239,8 @@ - (NSString *)signatureBaseStringForRequest:(MKNetworkOperation *)request
 - (NSString *)generatePlaintextSignatureFor:(NSString *)baseString
 {
     return [NSString stringWithFormat:@"%@&%@", 
-            self.consumerSecret != nil ? [self.consumerSecret mk_urlEncodedString] : @"", 
-            self.tokenSecret != nil ? [self.tokenSecret mk_urlEncodedString] : @""];
+            self.consumerSecret != nil ? [self.consumerSecret urlEncodedString] : @"", 
+            self.tokenSecret != nil ? [self.tokenSecret urlEncodedString] : @""];
 }
 
 - (NSString *)generateHMAC_SHA1SignatureFor:(NSString *)baseString
@@ -384,7 +384,7 @@ - (void)signRequest:(MKNetworkOperation *)request
 
         [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
             if (obj && ![obj isEqualToString:@""]) {
-                [oauthHeaders addObject:[NSString stringWithFormat:@"%@=\"%@\"", [key mk_urlEncodedString], [obj mk_urlEncodedString]]];
+                [oauthHeaders addObject:[NSString stringWithFormat:@"%@=\"%@\"", [key urlEncodedString], [obj urlEncodedString]]];
             }
         }];
 
@@ -405,7 +405,7 @@ - (void)signRequest:(MKNetworkOperation *)request
         // Fill the authorization header array
         [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
             if (obj && ![obj isEqualToString:@""]) {
-                [oauthParams addObject:[NSString stringWithFormat:@"%@=%@", [key mk_urlEncodedString], [obj mk_urlEncodedString]]];
+                [oauthParams addObject:[NSString stringWithFormat:@"%@=%@", [key urlEncodedString], [obj urlEncodedString]]];
             }
         }];        
 
@@ -449,7 +449,7 @@ - (NSString *)generateXOAuthStringForURL:(NSString *)url method:(NSString *)meth
     // Fill the authorization header array
     [_oAuthValues enumerateKeysAndObjectsUsingBlock:^(id key, NSString *obj, BOOL *stop) {
         if (obj && ![obj isEqualToString:@""]) {
-            [oauthHeaders addObject:[NSString stringWithFormat:@"%@=\"%@\"", [key mk_urlEncodedString], [obj mk_urlEncodedString]]];
+            [oauthHeaders addObject:[NSString stringWithFormat:@"%@=\"%@\"", [key urlEncodedString], [obj urlEncodedString]]];
         }
     }];