Merge pull request #492 from mikeh/2.1.1-dev

MOBILE-3355
Alfresco · Jun 17, 2015 · ee42618 · ee42618
2 parents 6d29f47 + de9825c
commit ee42618
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/AlfrescoApp/Supporting Files/AlfrescoApp-Info.plist b/AlfrescoApp/Supporting Files/AlfrescoApp-Info.plist
@@ -56,7 +56,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>2.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/AlfrescoApp/Supporting Files/Settings.bundle/Root.plist b/AlfrescoApp/Supporting Files/Settings.bundle/Root.plist
@@ -14,7 +14,7 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-			<string>2.1 (dev)</string>
+			<string>2.1.1 (dev)</string>
 			<key>Key</key>
 			<string>Prefs_AppVersion</string>
 			<key>Title</key>

diff --git a/AlfrescoApp/Utils/Utility.m b/AlfrescoApp/Utils/Utility.m
@@ -629,6 +629,12 @@ + (NSString *)serverURLStringFromAccount:(UserAccount *)account
     formatter.numberStyle = NSNumberFormatterDecimalStyle;
     url.port = [formatter numberFromString:account.serverPort];
     url.path = account.serviceDocument;
+
+    // iOS 7 support
+    if (![url respondsToSelector:@selector(string)])
+    {
+        return [[url URL] absoluteString];
+    }
 
     return [url string];
 }

diff --git a/AlfrescoDocumentPicker/Info.plist b/AlfrescoDocumentPicker/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>2.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/AlfrescoDocumentPickerFileProvider/Info.plist b/AlfrescoDocumentPickerFileProvider/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>2.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>