Skip to content

Commit 436612b

Browse files
javiergonzperjaviergonzper
committed
Merge branch 'release_3.4.0'
2 parents 498756a + 3ac46f9 commit 436612b

File tree

156 files changed

+9061
-2170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+9061
-2170
lines changed

‎.gitmodules

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
[submodule "OCCommunicationLib"]
22
path = OCCommunicationLib
3-
url = git@github.com:owncloud/ios-library.git
3+
url = https://github.com/owncloud/ios-library.git
4+
[submodule "ocdoc"]
5+
path = user_manual/ocdoc
6+
url = https://github.com/owncloud/documentation
7+
branch = master

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ xcode_scheme: Owncloud iOs Client
44
xcode_sdk: iphonesimulator
55

66
before_install:
7-
- brew update
7+
- brew update

‎.tx/config

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[main]
2+
host = https://www.transifex.com
3+
4+
[owncloud.mobile-ios]
5+
file_filter = Owncloud iOs Client/SupportingFiles/Languages/<lang>.lproj/Localizable.strings
6+
source_file = Owncloud iOs Client/SupportingFiles/Languages/en.lproj/Localizable.strings
7+
source_lang = en
8+
type = STRINGS
9+
10+

‎OCCommunicationLib

‎Owncloud iOs Client.xcodeproj/project.pbxproj

+607-28
Large diffs are not rendered by default.

‎Owncloud iOs Client.xcodeproj/xcshareddata/xcschemes/Owncloud iOs Client.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0500"
3+
LastUpgradeVersion = "0610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Owncloud iOs Client.xcodeproj/xcshareddata/xcschemes/ownCloudExtApp.xcscheme

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0610"
4+
wasCreatedForAppExtension = "YES"
5+
version = "1.3">
6+
<BuildAction
7+
parallelizeBuildables = "YES"
8+
buildImplicitDependencies = "YES">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "EAB0AB3119ED356A00764C31"
19+
BuildableName = "ownCloudExtApp.appex"
20+
BlueprintName = "ownCloudExtApp"
21+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
<BuildActionEntry
25+
buildForTesting = "YES"
26+
buildForRunning = "YES"
27+
buildForProfiling = "YES"
28+
buildForArchiving = "YES"
29+
buildForAnalyzing = "YES">
30+
<BuildableReference
31+
BuildableIdentifier = "primary"
32+
BlueprintIdentifier = "1324297715ADBB3700DF823E"
33+
BuildableName = "Owncloud iOs Client.app"
34+
BlueprintName = "Owncloud iOs Client"
35+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
36+
</BuildableReference>
37+
</BuildActionEntry>
38+
</BuildActionEntries>
39+
</BuildAction>
40+
<TestAction
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
buildConfiguration = "Debug">
45+
<Testables>
46+
</Testables>
47+
<MacroExpansion>
48+
<BuildableReference
49+
BuildableIdentifier = "primary"
50+
BlueprintIdentifier = "EAB0AB3119ED356A00764C31"
51+
BuildableName = "ownCloudExtApp.appex"
52+
BlueprintName = "ownCloudExtApp"
53+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
54+
</BuildableReference>
55+
</MacroExpansion>
56+
</TestAction>
57+
<LaunchAction
58+
selectedDebuggerIdentifier = ""
59+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
60+
launchStyle = "0"
61+
askForAppToLaunch = "Yes"
62+
useCustomWorkingDirectory = "NO"
63+
buildConfiguration = "Debug"
64+
ignoresPersistentStateOnLaunch = "NO"
65+
debugDocumentVersioning = "YES"
66+
allowLocationSimulation = "YES">
67+
<IDERemoteRunnable
68+
RemotePath = "/var/mobile/Containers/Bundle/Application/AD91BEBE-7611-4589-809F-0F4697C2BCCA/Documents.app"
69+
BundleIdentifier = "/var/mobile/Containers/Bundle/Application/AD91BEBE-7611-4589-809F-0F4697C2BCCA/Documents.app">
70+
</IDERemoteRunnable>
71+
<MacroExpansion>
72+
<BuildableReference
73+
BuildableIdentifier = "primary"
74+
BlueprintIdentifier = "1324297715ADBB3700DF823E"
75+
BuildableName = "Owncloud iOs Client.app"
76+
BlueprintName = "Owncloud iOs Client"
77+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
78+
</BuildableReference>
79+
</MacroExpansion>
80+
<AdditionalOptions>
81+
</AdditionalOptions>
82+
</LaunchAction>
83+
<ProfileAction
84+
shouldUseLaunchSchemeArgsEnv = "YES"
85+
savedToolIdentifier = ""
86+
useCustomWorkingDirectory = "NO"
87+
buildConfiguration = "Release"
88+
debugDocumentVersioning = "YES"
89+
askForAppToLaunch = "Yes">
90+
<BuildableProductRunnable>
91+
<BuildableReference
92+
BuildableIdentifier = "primary"
93+
BlueprintIdentifier = "1324297715ADBB3700DF823E"
94+
BuildableName = "Owncloud iOs Client.app"
95+
BlueprintName = "Owncloud iOs Client"
96+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
97+
</BuildableReference>
98+
</BuildableProductRunnable>
99+
</ProfileAction>
100+
<AnalyzeAction
101+
buildConfiguration = "Debug">
102+
</AnalyzeAction>
103+
<ArchiveAction
104+
buildConfiguration = "Release"
105+
revealArchiveInOrganizer = "YES">
106+
</ArchiveAction>
107+
</Scheme>

‎Owncloud iOs Client.xcodeproj/xcshareddata/xcschemes/ownCloudExtAppFileProvider.xcscheme

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0610"
4+
wasCreatedForAppExtension = "YES"
5+
version = "1.3">
6+
<BuildAction
7+
parallelizeBuildables = "YES"
8+
buildImplicitDependencies = "YES">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "EAB0AB3F19ED356A00764C31"
19+
BuildableName = "ownCloudExtAppFileProvider.appex"
20+
BlueprintName = "ownCloudExtAppFileProvider"
21+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
<BuildActionEntry
25+
buildForTesting = "YES"
26+
buildForRunning = "YES"
27+
buildForProfiling = "YES"
28+
buildForArchiving = "YES"
29+
buildForAnalyzing = "YES">
30+
<BuildableReference
31+
BuildableIdentifier = "primary"
32+
BlueprintIdentifier = "1324297715ADBB3700DF823E"
33+
BuildableName = "Owncloud iOs Client.app"
34+
BlueprintName = "Owncloud iOs Client"
35+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
36+
</BuildableReference>
37+
</BuildActionEntry>
38+
</BuildActionEntries>
39+
</BuildAction>
40+
<TestAction
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
buildConfiguration = "Debug">
45+
<Testables>
46+
</Testables>
47+
<MacroExpansion>
48+
<BuildableReference
49+
BuildableIdentifier = "primary"
50+
BlueprintIdentifier = "EAB0AB3F19ED356A00764C31"
51+
BuildableName = "ownCloudExtAppFileProvider.appex"
52+
BlueprintName = "ownCloudExtAppFileProvider"
53+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
54+
</BuildableReference>
55+
</MacroExpansion>
56+
</TestAction>
57+
<LaunchAction
58+
selectedDebuggerIdentifier = ""
59+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
60+
launchStyle = "0"
61+
askForAppToLaunch = "Yes"
62+
useCustomWorkingDirectory = "NO"
63+
buildConfiguration = "Debug"
64+
ignoresPersistentStateOnLaunch = "NO"
65+
debugDocumentVersioning = "YES"
66+
allowLocationSimulation = "YES">
67+
<IDERemoteRunnable
68+
RemotePath = "/var/mobile/Containers/Bundle/Application/7DD9596B-1381-4F88-9F5C-A130B17DEEF6/Documents.app"
69+
BundleIdentifier = "/var/mobile/Containers/Bundle/Application/7DD9596B-1381-4F88-9F5C-A130B17DEEF6/Documents.app">
70+
</IDERemoteRunnable>
71+
<MacroExpansion>
72+
<BuildableReference
73+
BuildableIdentifier = "primary"
74+
BlueprintIdentifier = "1324297715ADBB3700DF823E"
75+
BuildableName = "Owncloud iOs Client.app"
76+
BlueprintName = "Owncloud iOs Client"
77+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
78+
</BuildableReference>
79+
</MacroExpansion>
80+
<AdditionalOptions>
81+
</AdditionalOptions>
82+
</LaunchAction>
83+
<ProfileAction
84+
shouldUseLaunchSchemeArgsEnv = "YES"
85+
savedToolIdentifier = ""
86+
useCustomWorkingDirectory = "NO"
87+
buildConfiguration = "Release"
88+
debugDocumentVersioning = "YES"
89+
askForAppToLaunch = "Yes">
90+
<BuildableProductRunnable>
91+
<BuildableReference
92+
BuildableIdentifier = "primary"
93+
BlueprintIdentifier = "1324297715ADBB3700DF823E"
94+
BuildableName = "Owncloud iOs Client.app"
95+
BlueprintName = "Owncloud iOs Client"
96+
ReferencedContainer = "container:Owncloud iOs Client.xcodeproj">
97+
</BuildableReference>
98+
</BuildableProductRunnable>
99+
</ProfileAction>
100+
<AnalyzeAction
101+
buildConfiguration = "Debug">
102+
</AnalyzeAction>
103+
<ArchiveAction
104+
buildConfiguration = "Release"
105+
revealArchiveInOrganizer = "YES">
106+
</ArchiveAction>
107+
</Scheme>

‎Owncloud iOs Client/AppDelegate.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#define k_DB_version_9 9
4040
#define k_DB_version_10 10
4141
#define k_DB_version_11 11
42+
#define k_DB_version_12 12
4243

4344
@class MGSplitViewController;
4445
@class FilesViewController;
@@ -161,16 +162,13 @@ extern NSString * NotReachableNetworkForDownloadsNotification;
161162
//Method that cancel download of the detail view in iPad.
162163
- (void)cancelDonwloadInDetailView;
163164

164-
165165
- (void)errorLogin;
166166

167167
/*
168168
* Method that receive a file to upload
169169
*/
170170
- (void)itemToUploadFromOtherAppWithName:(NSString*)name andPathName:(NSString*)pathName andRemoteFolder:(NSString*)remFolder andIsNotNeedCheck:(BOOL) isNotNecessaryCheckIfExist;
171171

172-
//Method to return the path of temp files when we upload files
173-
-(NSString *) getTempFolderForUploadFiles;
174172

175173
/*
176174
* Method that inform if the filePath its playing in media player.

0 commit comments

Comments
 (0)