Merge branch 'develop_ios9' into ios9_come_back_full_screen_ipad

Author: javiergonzper

.gitignore

@@ -16,6 +16,7 @@ DerivedData
 .idea/
 *.hmap
 *.xccheckout
+*.pyc
 
 #CocoaPods
 Pods

.travis.yml

@@ -1,8 +1,8 @@
 language: objective-c
-osx_image: xcode6.4
+osx_image: xcode7
 xcode_project: Owncloud iOs Client.xcodeproj
 xcode_scheme: Owncloud iOs Client
 xcode_sdk: iphonesimulator
 
 before_install:
-  - brew update
+  - brew update; brew update

OCC2015_iOS_workshop.pdf

@@ -355,7 +355,7 @@ - (void) manageDistinctFileOnPreview {
         DLog(@"ide file: %ld",(long)_file.idFile);
 
         //Check if the file is in the device
-        if (([_file isDownload] == notDownload) && _typeOfFile != otherFileType) {
+        if ([_file isDownload] == notDownload) {
             //Download the file
             [self downloadTheFile];
         } else if (([_file isDownload] == downloading) || ([_file isDownload] == updating)) {

Owncloud iOs Client/Files/Preview/DetailView/DetailViewController.m

@@ -477,7 +477,7 @@ - (void)handleFile {
         DLog(@"is Donwloaded: %ld",(long)_file.isDownload);
 
         //Check if the file is in the device
-        if (([_file isDownload] == notDownload) && _typeOfFile != otherFileType) {
+        if ([_file isDownload] == notDownload) {
 
             //Download the file
             [self downloadTheFile];

Owncloud iOs Client/Files/Preview/FilePreview/FilePreviewViewController.m

@@ -3166,9 +3166,13 @@ - (void) didSelectMoreOptions {
         self.moreActionSheet = nil;
     }
 
+    NSString *title = [self.selectedFileDto.fileName stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    
     if(_selectedFileDto.isDirectory) {
 
-        self.moreActionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", nil) destructiveButtonTitle:nil otherButtonTitles:NSLocalizedString(@"rename_long_press", nil), NSLocalizedString(@"move_long_press", nil), nil];
+        title = [title substringToIndex:[title length]-1];
+        
+        self.moreActionSheet = [[UIActionSheet alloc] initWithTitle:title delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", nil) destructiveButtonTitle:nil otherButtonTitles:NSLocalizedString(@"rename_long_press", nil), NSLocalizedString(@"move_long_press", nil), nil];
         self.moreActionSheet.tag=200;
 
         if (IS_IPHONE) {
@@ -3191,7 +3195,7 @@ - (void) didSelectMoreOptions {
             favoriteOrUnfavoriteString = NSLocalizedString(@"favorite", nil);
         }
 
-        self.moreActionSheet = [[UIActionSheet alloc]initWithTitle:nil delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", nil) destructiveButtonTitle: nil otherButtonTitles:NSLocalizedString(@"open_with_label", nil), NSLocalizedString(@"rename_long_press", nil), NSLocalizedString(@"move_long_press", nil), favoriteOrUnfavoriteString, nil];
+        self.moreActionSheet = [[UIActionSheet alloc]initWithTitle:title delegate:self cancelButtonTitle:NSLocalizedString(@"cancel", nil) destructiveButtonTitle: nil otherButtonTitles:NSLocalizedString(@"open_with_label", nil), NSLocalizedString(@"rename_long_press", nil), NSLocalizedString(@"move_long_press", nil), favoriteOrUnfavoriteString, nil];
         self.moreActionSheet.tag=200;
 
         if (IS_IPHONE) {

Owncloud iOs Client/SupportingFiles/Images/ImageBranding/FilesViewScreen/doc_icon.png

@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+
+import time
+import os
+from time import sleep
+import constants as const
+import loginView
+import helpGuideView
+import filesView
+from appium import webdriver
+
+def getWebDriver():
+    wd = None
+    desired_caps = {}
+    desired_caps['appium-version'] = const.K_APPIUM_VER
+    desired_caps['platformName'] = const.K_APP_PLATFORM_NAME
+    desired_caps['platformVersion'] = const.K_APP_PLATFORM_VER
+    desired_caps['deviceName'] = const.K_DEVICE_NAME
+    desired_caps['app'] = os.path.dirname(os.path.realpath(__file__)) + const.K_APP_FILE_NAME
+    wd = webdriver.Remote(const.K_WD_REMOTE_URL, desired_caps)
+    wd.implicitly_wait(const.K_WD_EXPLICITY_WAIT)
+    return wd
+
+def doFirstLoginWith(self,server,user,password, ssl):
+    driver = self.driver
+
+    skipButtonInHelpGuide = driver.find_elements_by_class_name(helpGuideView.skipButton_class)[helpGuideView.skipButton_index]
+    self.assertEqual(skipButtonInHelpGuide.get_attribute("name"), helpGuideView.skipButton_name)
+    skipButtonInHelpGuide.click()
+
+    doLoginWith(self,server,user,password,ssl)
+
+def doLoginWith(self,server,user,password, ssl):
+    driver = self.driver
+
+    user_field = driver.find_elements_by_class_name(loginView.user_field_class)[loginView.user_field_index]
+    user_field.clear()
+    user_field.set_value(user)
+
+    pass_field = driver.find_elements_by_class_name(loginView.pass_field_class)[loginView.pass_field_index]
+    pass_field.clear()
+    pass_field.set_value(password)
+
+    url_field = driver.find_elements_by_class_name(loginView.url_field_class)[loginView.url_field_index]
+    url_field.clear()
+    url_field.set_value(server)
+
+    table_view = driver.find_elements_by_class_name(loginView.table_view_class)[loginView.table_view_index]
+    table_view.click()
+    sleep(3)
+
+    if ssl == True:
+        ok_button_alert_view =  driver.find_element_by_xpath(loginView.ok_button_alert_view_xpath)
+        ok_button_alert_view.click()
+        sleep(3) 
+    
+    if ssl == True:
+        text_to_check = loginView.secure_connection_name
+    else:
+        text_to_check = loginView.connection_name
+    time_out = 60
+    sleep_time = 1
+    class_to_check = loginView.connection_field_class
+    index_to_check = loginView.connection_field_index
+    wait_until(check_values_by_name, time_out, sleep_time, driver, class_to_check, index_to_check, text_to_check)
+    self.assertEqual(driver.find_elements_by_class_name(class_to_check)[index_to_check].get_attribute("name"), text_to_check)
+
+    login_button = driver.find_elements_by_class_name(loginView.login_button_class)[loginView.login_button_index]
+    login_button.click()
+
+def wait_until(some_method, timeout, period=0.25, *args, **kwargs):
+    mustend = time.time() + timeout
+    while time.time() < mustend:
+        if some_method(*args, **kwargs): return True
+    time.sleep(period)
+    return False
+
+def check_values_by_class_name(driver, class_name, exp_value):
+    number_of_classes = len(driver.find_elements_by_class_name(class_name))
+    if number_of_classes == exp_value: return True
+    return False
+
+def check_values_by_name(driver, class_name, index, exp_name):
+    if driver.find_elements_by_class_name(class_name)[index].get_attribute("name") == exp_name: return True
+    return False
+
+def assert_is_in_files_view(self):
+    sleep(1)
+
+    class_to_check = filesView.tabBar_class
+    time_out = 20
+    sleep_time = 1
+    expected_class_found = 1
+    wait_until(check_values_by_class_name, time_out, sleep_time, self.driver, class_to_check, expected_class_found)
+
+    self.assertTrue(check_values_by_class_name(self.driver, class_to_check, expected_class_found))
+
+def assert_is_not_in_files_view(self):
+    sleep(1)
+
+    class_to_check = filesView.tabBar_class
+    time_out = 20
+    sleep_time = 1
+    expected_class_found = 0
+    wait_until(check_values_by_class_name, time_out, sleep_time, self.driver, class_to_check, expected_class_found)
+
+    self.assertTrue(check_values_by_class_name(self.driver, class_to_check, expected_class_found))
+

Owncloud iOs Client/SupportingFiles/Images/ImageBranding/FilesViewScreen/doc_icon@2x.png

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+#author : ownCloud, Inc.
+#description: description
+#copyright :Copyright (C) 2015, ownCloud, Inc. This code is covered by the GNU Public License Version 3. For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/ You should have received a copy of this license along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>.
+#version 1.0
+
+[nosetests]
+verbosity = 2
+#Used to display print statements on console
+nocapture = 1
+#test only some modules with comma seperated values
+tests = loginTest.py,createFolderTest,

Owncloud iOs Client/SupportingFiles/Images/ImageBranding/FilesViewScreen/doc_icon@2x~ipad.png

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+
+import os
+from datetime import datetime
+
+#--Generic Variables for use through Appium connection
+K_APP_FILE_NAME = '/../../ownCloud.app'
+K_APPIUM_VER = '1.4.1'
+K_APP_PLATFORM_NAME = 'iOS'
+K_APP_PLATFORM_VER = '8.4'
+K_DEVICE_NAME = 'iPhone 6'
+
+#--Webdriver property 
+K_WD_EXPLICITY_WAIT = 20
+K_WD_REMOTE_URL = 'http://0.0.0.0:4723/wd/hub'
+
+#--Result Files
+K_RST_FILE = '/Result/test.txt'
+K_RST_FILE_PATH = os.path.dirname(os.path.realpath(__file__)) + K_RST_FILE
+K_RST_HTML_FILE = '/result.html'
+K_RST_HTML_FILE_PATH = os.path.dirname(os.path.realpath(__file__)) + K_RST_HTML_FILE
+K_RST_PDF_FILE = 'Report'
+
+#--Execption/Fails 
+K_FILE_NOT_FOUND = 'File not found for given path %s'
+
+#Login
+K_URL_1 = 'serverName1'
+K_USER_1 = 'userName1'
+K_PASSWORD_1 = 'passName1'
+K_PASSWORD_WRONG_1 = 'pass_wrong'
+K_SELF_SIGNED_1 = True
+
+K_URL_2 = 'serverName2'
+K_USER_2 = 'userName2'
+K_PASSWORD_2 = 'passName2'
+K_SELF_SIGNED_2 = True
+
+#Create Folder
+K_FOLDER_NAME = 'Test Folder ß'
+
+class utility_functions():
+
+    #--Common utils for Apending string in test.txt file.
+    def write_comment_in_file(self,text):
+        f = open(K_RST_FILE_PATH, "a")
+        f.write('Time: %s ' % datetime.now())
+        f.write(text)
+        f.close()
+        return True