Skip to content

Commit ea77ff3

Browse files
authored
- removed location background mode (which is currently not used) (#780)
- perform showing upload path in AutoUploadSettings on main thread - fixed resign script: now signing share extension too, adopted documentation - new build number
1 parent b6e58b0 commit ea77ff3

File tree

7 files changed

+24
-15
lines changed

7 files changed

+24
-15
lines changed

enterprise/resign/Provisioning Files/ad-hoc/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
- App.mobileprovision
44
- FileProvider.mobileprovision
55
- Intent.mobileprovision
6+
- ShareExtension.mobileprovision

enterprise/resign/Provisioning Files/app-store/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
- App.mobileprovision
44
- FileProvider.mobileprovision
5-
- Intent.mobileprovision
5+
- Intent.mobileprovision
6+
- ShareExtension.mobileprovision

enterprise/resign/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Decide if you want to sign the app for Ad-Hoc (`ad-hoc`) installation or for the
1313

1414
- `com.yourcompany.ios-app.ownCloud-Intent`
1515

16+
- `com.yourcompany.ios-app.ownCloud-Share-Extension`
17+
1618
1719

1820
This IDs must match with `Bundle Identifier` value for the related Xcode target.
@@ -46,6 +48,7 @@ Decide if you want to sign the app for Ad-Hoc (`ad-hoc`) installation or for the
4648
- `App.mobileprovision`
4749
- `FileProvider.mobileprovision`
4850
- `Intent.mobileprovision`
51+
- `ShareExtension.mobileprovision`
4952

5053
5. Execute the script
5154

enterprise/resign/resignOwncloudApp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ PROVISIONING_DIR="Provisioning Files"
6464
DISTRIBUTION_MOBILEPROVISION="$PROVISIONING_DIR/$METHOD/App.mobileprovision"
6565
FILEPROVIDER_MOBILEPROVISION="$PROVISIONING_DIR/$METHOD/FileProvider.mobileprovision"
6666
INTENT_MOBILEPROVISION="$PROVISIONING_DIR/$METHOD/Intent.mobileprovision"
67+
SHAREEXTENSION_MOBILEPROVISION="$PROVISIONING_DIR/$METHOD/ShareExtension.mobileprovision"
6768

68-
declare -a MOBILEPROVISIONS=( "$DISTRIBUTION_MOBILEPROVISION" "$FILEPROVIDER_MOBILEPROVISION" "$INTENT_MOBILEPROVISION" );
69-
declare -a ENTITLEMENTS=( "ownCloud.entitlements" "ownCloud_File_Provider.entitlements" "ownCloud_Intents.entitlements" );
70-
declare -a LOCATIONS=( "$APPDIR" "$APPDIR/PlugIns/ownCloud File Provider.appex" "$APPDIR/PlugIns/ownCloud Intents.appex" );
69+
declare -a MOBILEPROVISIONS=( "$DISTRIBUTION_MOBILEPROVISION" "$FILEPROVIDER_MOBILEPROVISION" "$INTENT_MOBILEPROVISION" "$SHAREEXTENSION_MOBILEPROVISION" );
70+
declare -a ENTITLEMENTS=( "ownCloud.entitlements" "ownCloud_File_Provider.entitlements" "ownCloud_Intents.entitlements" "ownCloud_Share_Extension.entitlements" );
71+
declare -a LOCATIONS=( "$APPDIR" "$APPDIR/PlugIns/ownCloud File Provider.appex" "$APPDIR/PlugIns/ownCloud Intents.appex" "$APPDIR/PlugIns/ownCloud Share Extension.appex" );
7172
declare -a BUNDLEIDS=();
7273

7374
# Delete previous temporal app folder if exist
@@ -92,7 +93,7 @@ do
9293
if [ ! -f "./$a" ]; then
9394
echo "${WARN}Error: can't find $a in the current directory${NC}"
9495
exit 1
95-
else
96+
else
9697
# Convert provisioning profile to plist
9798
security cms -D -i "$a" > "$APPTEMP/tmp.plist"
9899
# Get provisioning SHA-1
@@ -157,7 +158,7 @@ do
157158
PlistBuddy -x -c "print :Entitlements " /dev/stdin <<< $(security cms -D -i "./${MOBILEPROVISIONS[$i]}") > "${ENTITLEMENTS[$i]}.tmp"
158159
# Get all entitlements from app binary
159160
codesign -d --entitlements :- "${LOCATIONS[$i]}" > "${ENTITLEMENTS[$i]}"
160-
161+
161162
TEAMID=`PlistBuddy -c "print com.apple.developer.team-identifier " "${ENTITLEMENTS[$i]}.tmp"`
162163
echo "TeamId: ${INFO}$TEAMID${NC}"
163164
APPGROUP=`PlistBuddy -c "print com.apple.security.application-groups:0 " "${ENTITLEMENTS[$i]}.tmp"`

ownCloud.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4414,7 +4414,7 @@
44144414
buildSettings = {
44154415
ALWAYS_SEARCH_USER_PATHS = NO;
44164416
APP_SHORT_VERSION = 11.4;
4417-
APP_VERSION = 168;
4417+
APP_VERSION = 169;
44184418
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
44194419
CLANG_ANALYZER_NONNULL = YES;
44204420
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4477,7 +4477,7 @@
44774477
buildSettings = {
44784478
ALWAYS_SEARCH_USER_PATHS = NO;
44794479
APP_SHORT_VERSION = 11.4;
4480-
APP_VERSION = 168;
4480+
APP_VERSION = 169;
44814481
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
44824482
CLANG_ANALYZER_NONNULL = YES;
44834483
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4533,7 +4533,7 @@
45334533
buildSettings = {
45344534
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
45354535
APP_SHORT_VERSION = 11.4;
4536-
APP_VERSION = 168;
4536+
APP_VERSION = 169;
45374537
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
45384538
CODE_SIGN_ENTITLEMENTS = ownCloud/ownCloud.entitlements;
45394539
CODE_SIGN_IDENTITY = "Apple Development";
@@ -4565,7 +4565,7 @@
45654565
buildSettings = {
45664566
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
45674567
APP_SHORT_VERSION = 11.4;
4568-
APP_VERSION = 168;
4568+
APP_VERSION = 169;
45694569
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
45704570
CODE_SIGN_ENTITLEMENTS = ownCloud/ownCloud.entitlements;
45714571
CODE_SIGN_IDENTITY = "iPhone Developer";

ownCloud/Resources/Info.plist

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<array/>
1818
<key>CFBundleTypeName</key>
1919
<string>Import all file types</string>
20-
<key>LSHandlerRank</key>
21-
<string>Default</string>
2220
<key>CFBundleTypeRole</key>
2321
<string>Editor</string>
22+
<key>LSHandlerRank</key>
23+
<string>Default</string>
2424
<key>LSItemContentTypes</key>
2525
<array>
2626
<string>public.content</string>
@@ -133,7 +133,6 @@
133133
<array>
134134
<string>audio</string>
135135
<string>fetch</string>
136-
<string>location</string>
137136
</array>
138137
<key>UILaunchStoryboardName</key>
139138
<string>LaunchScreen</string>

ownCloud/Settings/AutoUploadSettingsSection.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,19 @@ class AutoUploadSettingsSection: SettingsSection {
167167
instantUploadPhotosRow = StaticTableViewRow(switchWithAction: { [weak self] (_, sender) in
168168
if let convertSwitch = sender as? UISwitch {
169169
self?.changeAndRequestPhotoLibraryAccessForOption(optionSwitch: convertSwitch, completion: { (switchState) in
170-
self?.setupPhotoAutoUpload(enabled: switchState)
170+
OnMainThread {
171+
self?.setupPhotoAutoUpload(enabled: switchState)
172+
}
171173
})
172174
}
173175
}, title: "Auto Upload Photos".localized, value: self.userDefaults.instantUploadPhotos, identifier: "auto-upload-photos")
174176

175177
instantUploadVideosRow = StaticTableViewRow(switchWithAction: { [weak self] (_, sender) in
176178
if let convertSwitch = sender as? UISwitch {
177179
self?.changeAndRequestPhotoLibraryAccessForOption(optionSwitch: convertSwitch, completion: { (switchState) in
178-
self?.setupVideoAutoUpload(enabled: switchState)
180+
OnMainThread {
181+
self?.setupVideoAutoUpload(enabled: switchState)
182+
}
179183
})
180184
}
181185
}, title: "Auto Upload Videos".localized, value: self.userDefaults.instantUploadVideos, identifier: "auto-upload-videos")

0 commit comments

Comments
 (0)