Merge pull request owncloud#479 from owncloud/modify_share_link

Modify share link

Author: nasli

OCCommunicationLib

@@ -29,6 +29,7 @@
 #import "UtilsUrls.h"
 #import "OCSharedDto.h"
 
+#define server_version_with_new_shared_schema 8
 #define password_alert_view_tag 600
 
 
@@ -80,9 +81,24 @@ - (void) showShareActionSheetForFile:(FileDto *)file {
  * @param token -> NSString
  *
  */
-- (void) presentShareActionSheetForToken:(NSString *)token withPassword:(BOOL) isPasswordSet{
+- (void) presentShareActionSheetForToken:(NSString *)sharedLink withPassword:(BOOL) isPasswordSet{
 
-    NSString *sharedLink = [NSString stringWithFormat:@"%@%@%@",APP_DELEGATE.activeUser.url,k_share_link_middle_part_url,token];
+    NSString *url = nil;
+    // From ownCloud server 8.2 the url field is always set for public shares
+    if ([sharedLink hasPrefix:@"http://"] || [sharedLink hasPrefix:@"https://"])
+    {
+        url = sharedLink;
+    }else{
+        //Token
+        NSString *firstNumber = [[AppDelegate sharedOCCommunication].getCurrentServerVersion substringToIndex:1];
+        
+        if (firstNumber.integerValue >= server_version_with_new_shared_schema) {
+            // From ownCloud server version 8 on, a different share link scheme is used.
+            url = [NSString stringWithFormat:@"%@%@%@", APP_DELEGATE.activeUser.url, k_share_link_middle_part_url_after_version_8, sharedLink];
+        }else{
+            url = [NSString stringWithFormat:@"%@%@%@", APP_DELEGATE.activeUser.url, k_share_link_middle_part_url_before_version_8, sharedLink];
+        }
+    }
 
     UIActivityItemProvider *activityProvider = [[UIActivityItemProvider alloc] initWithPlaceholderItem:[NSURL URLWithString:sharedLink]];
     NSArray *items = @[activityProvider, sharedLink];
@@ -192,7 +208,6 @@ - (void) actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSIntege
  * @param isFile -> BOOL. Distinct between is fileDto or shareDto
  */
 - (void) clickOnShareLinkFromFileDto:(BOOL)isFileDto {
-    DLog(@"Click on Share Link");
 
     AppDelegate *app = (AppDelegate *)[[UIApplication sharedApplication]delegate];
 
@@ -278,7 +293,7 @@ - (void) clickOnShareLinkFromFileDto:(BOOL)isFileDto {
                 [[AppDelegate sharedOCCommunication] setUserAgent:[UtilsUrls getUserAgent]];
 
                 //Checking the Shared files and folders
-                [[AppDelegate sharedOCCommunication] shareFileOrFolderByServer:app.activeUser.url andFileOrFolderPath:filePath onCommunication:[AppDelegate sharedOCCommunication] successRequest:^(NSHTTPURLResponse *response, NSString *token, NSString *redirectedServer) {
+                [[AppDelegate sharedOCCommunication] shareFileOrFolderByServer:app.activeUser.url andFileOrFolderPath:filePath onCommunication:[AppDelegate sharedOCCommunication] successRequest:^(NSHTTPURLResponse *response, NSString *shareLink, NSString *redirectedServer) {
 
                     BOOL isSamlCredentialsError=NO;
 
@@ -300,7 +315,7 @@ - (void) clickOnShareLinkFromFileDto:(BOOL)isFileDto {
                         [self endLoading];
 
                         //Present
-                        [self presentShareActionSheetForToken:token withPassword:false];
+                        [self presentShareActionSheetForToken:shareLink withPassword:false];
                     }
 
                 } failureRequest:^(NSHTTPURLResponse *response, NSError *error) {

Owncloud iOs Client/Tabs/FileTab/Share/ShareFileOrFolder.m

@@ -40,7 +40,8 @@
 #define k_percent_for_check_the_uploads 0.1
 
 //Share link middle part url
-#define k_share_link_middle_part_url @"public.php?service=files&t="
+#define k_share_link_middle_part_url_before_version_8 @"public.php?service=files&t="
+#define k_share_link_middle_part_url_after_version_8 @"index.php/s/"
 
 //Alert view tags
 #define k_alertview_for_login 1