From 45a07ba68084605341ba52fad9a3ea381467554c Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Tue, 16 Jun 2015 17:52:59 +0100
Subject: [PATCH 1/2] Update project versions to 2.1.1

---
 AlfrescoApp/Supporting Files/AlfrescoApp-Info.plist     | 2 +-
 AlfrescoApp/Supporting Files/Settings.bundle/Root.plist | 2 +-
 AlfrescoDocumentPicker/Info.plist                       | 2 +-
 AlfrescoDocumentPickerFileProvider/Info.plist           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AlfrescoApp/Supporting Files/AlfrescoApp-Info.plist b/AlfrescoApp/Supporting Files/AlfrescoApp-Info.plist
index 8819b75c0..3e14d2157 100644
--- 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
index bf2ff98c4..cebc2c5aa 100644
--- 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/AlfrescoDocumentPicker/Info.plist b/AlfrescoDocumentPicker/Info.plist
index b91bc819c..84ed847fe 100644
--- 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
index 0ec5fb03c..44919836b 100644
--- 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>

From de9825cd89bd236347b8f8d9cbb3699b5b2d5ff3 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Tue, 16 Jun 2015 17:53:23 +0100
Subject: [PATCH 2/2] MOBILE-3355: Crash when connecting an account on iOS 7
 devices

---
 AlfrescoApp/Utils/Utility.m | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AlfrescoApp/Utils/Utility.m b/AlfrescoApp/Utils/Utility.m
index 35cd59632..58da65379 100644
--- 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];
 }