Merge pull request #71 from SUPLA/develop

v2.3.3
SUPLA · Nov 11, 2019 · a75478f · a75478f
2 parents 841f370 + acb2078
commit a75478f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/SUPLA.xcodeproj/project.pbxproj b/SUPLA.xcodeproj/project.pbxproj
@@ -2527,7 +2527,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEFINES_MODULE = YES;
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				INFOPLIST_FILE = SUPLA/Info.plist;
@@ -2537,7 +2537,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SUPLA/lib",
 				);
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsoftware.ios.supla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SUPLA/SUPLA-Bridging-Header.h";
@@ -2554,7 +2554,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEFINES_MODULE = YES;
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				INFOPLIST_FILE = SUPLA/Info.plist;
@@ -2564,7 +2564,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SUPLA/lib",
 				);
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsoftware.ios.supla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SUPLA/SUPLA-Bridging-Header.h";

diff --git a/SUPLA/SAClassHelper.m b/SUPLA/SAClassHelper.m
@@ -21,7 +21,12 @@
 @implementation NSDictionary (SUPLA)
 
 -(NSString *)urlEncode:(id)obj {
-    return [[NSString stringWithFormat:@"%@", obj] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+    NSMutableCharacterSet *allowed = [NSMutableCharacterSet
+                                      alphanumericCharacterSet];
+    [allowed addCharactersInString:@"-._*"];
+
+    return [[NSString stringWithFormat:@"%@", obj]
+            stringByAddingPercentEncodingWithAllowedCharacters: allowed];
 }
 
 -(NSString*) urlEncodedString {

diff --git a/SuplaApp.m b/SuplaApp.m
@@ -129,7 +129,7 @@ -(BOOL) getRandom:(char*)key size:(int)size forPrefKey:(NSString*)pref_key {
 
             keychainStored = NO;
             data = newRandomData;
-        };
+        }
 
         if ( data && [data length] == size ) {
             [data getBytes:key length:size];