[Libreoffice-commits] online.git: 2 commits - ios/Mobile ios/Mobile.xcodeproj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu May 30 08:50:22 UTC 2019
ios/Mobile.xcodeproj/project.pbxproj | 28 ++++++++++++++++++++++++++++
ios/Mobile/AppDelegate.mm | 16 +++++++++++++++-
ios/Mobile/Mobile.plist | 8 ++++++++
3 files changed, 51 insertions(+), 1 deletion(-)
New commits:
commit ae88fc10520784ef5ede7e2b6df4a33e0fc7f2be
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu May 30 11:29:28 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu May 30 11:45:02 2019 +0300
tdf#124930: Look for settings also in the managed configuration thing
Could not test whether it works, but it is not complicated, so
hopefully yes. Followed the examples from
https://developer.apple.com/videos/play/wwdc2013/301/ and
https://developer.apple.com/library/archive/samplecode/sc2279/Introduction/Intro.html .
The Mobile.plist file is a sample only.
Note that here in the master branch there is no on-disk tile cache, so
no setting for emptying that or not.
Change-Id: I0b8cf8d35930cdf60808d14361378f050cf41037
diff --git a/ios/Mobile/AppDelegate.mm b/ios/Mobile/AppDelegate.mm
index 5cbc51da3..227c895eb 100644
--- a/ios/Mobile/AppDelegate.mm
+++ b/ios/Mobile/AppDelegate.mm
@@ -27,6 +27,7 @@
static LOOLWSD *loolwsd = nullptr;
NSString *app_locale;
+BOOL empty_tile_cache;
static void download(NSURL *source, NSURL *destination) {
[[[NSURLSession sharedSession] downloadTaskWithURL:source
@@ -199,7 +200,20 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
// Look for the setting indicating the URL for a file containing a list of URLs for template
// documents to download. If set, start a task to download it, and then to download the listed
// templates.
- NSString *templateListURL = [[NSUserDefaults standardUserDefaults] stringForKey:@"templateListURL"];
+
+ NSString *templateListURL = nil;
+
+ // First check managed configuration, if present
+ NSDictionary *managedConfig = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"com.apple.configuration.managed"];
+ if (managedConfig != nil) {
+ templateListURL = managedConfig[@"templateListURL"];
+ if (templateListURL != nil && ![templateListURL isKindOfClass:[NSString class]])
+ templateListURL = nil;
+ }
+
+ if (templateListURL == nil)
+ templateListURL = [[NSUserDefaults standardUserDefaults] stringForKey:@"templateListURL"];
+
if (templateListURL != nil) {
NSURL *url = [NSURL URLWithString:templateListURL];
if (url != nil) {
diff --git a/ios/Mobile/Mobile.plist b/ios/Mobile/Mobile.plist
new file mode 100644
index 000000000..50d31599e
--- /dev/null
+++ b/ios/Mobile/Mobile.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: nXML; tab-width: 4; indent-tabs-mode: nil; nxml-child-indent:4 -*- -->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>templateListURL</key>
+ <string>https://foo.bar/template.list</string>
+ </dict>
+</plist>
commit 2474166351f845f00a8f29bafb2bfd35e98b1773
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu May 30 11:41:34 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu May 30 11:41:38 2019 +0300
Add core source files from vcl/ios
Change-Id: I1ca8d3fbf7a63b1965abd6799642854e03c4952d
diff --git a/ios/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
index daff0fa1a..3a9aeaac4 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -419,6 +419,16 @@
BE5EB5DB2140480B00E0826C /* ICU.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = ICU.dat; path = ../../../ICU.dat; sourceTree = "<group>"; };
BE636210215101D000F4237E /* WebSocketHandler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = WebSocketHandler.hpp; sourceTree = "<group>"; };
BE6362C12153B5B500F4237E /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ BE7E6807229D374500DE73C8 /* clipboard.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = clipboard.hxx; path = "../../ios-device/vcl/ios/clipboard.hxx"; sourceTree = "<group>"; };
+ BE7E6808229D374500DE73C8 /* iosinst.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = iosinst.cxx; path = "../../ios-device/vcl/ios/iosinst.cxx"; sourceTree = "<group>"; };
+ BE7E6809229D374500DE73C8 /* dummies.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dummies.cxx; path = "../../ios-device/vcl/ios/dummies.cxx"; sourceTree = "<group>"; };
+ BE7E680A229D374500DE73C8 /* HtmlFmtFlt.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = HtmlFmtFlt.hxx; path = "../../ios-device/vcl/ios/HtmlFmtFlt.hxx"; sourceTree = "<group>"; };
+ BE7E680B229D374500DE73C8 /* clipboard.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipboard.cxx; path = "../../ios-device/vcl/ios/clipboard.cxx"; sourceTree = "<group>"; };
+ BE7E680C229D374500DE73C8 /* iOSTransferable.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = iOSTransferable.cxx; path = "../../ios-device/vcl/ios/iOSTransferable.cxx"; sourceTree = "<group>"; };
+ BE7E680D229D374500DE73C8 /* DataFlavorMapping.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = DataFlavorMapping.hxx; path = "../../ios-device/vcl/ios/DataFlavorMapping.hxx"; sourceTree = "<group>"; };
+ BE7E680E229D374500DE73C8 /* iOSTransferable.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = iOSTransferable.hxx; path = "../../ios-device/vcl/ios/iOSTransferable.hxx"; sourceTree = "<group>"; };
+ BE7E680F229D374500DE73C8 /* DataFlavorMapping.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DataFlavorMapping.cxx; path = "../../ios-device/vcl/ios/DataFlavorMapping.cxx"; sourceTree = "<group>"; };
+ BE7E6810229D374500DE73C8 /* HtmlFmtFlt.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HtmlFmtFlt.cxx; path = "../../ios-device/vcl/ios/HtmlFmtFlt.cxx"; sourceTree = "<group>"; };
BE80E43121AD92F600859C97 /* Fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Fonts; path = Mobile/Fonts; sourceTree = SOURCE_ROOT; };
BE80E43421B562F500859C97 /* servicemanager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = servicemanager.cxx; path = "../../ios-device/cppuhelper/source/servicemanager.cxx"; sourceTree = "<group>"; };
BE80E43521B562F500859C97 /* component_context.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = component_context.cxx; path = "../../ios-device/cppuhelper/source/component_context.cxx"; sourceTree = "<group>"; };
@@ -1304,6 +1314,23 @@
name = Core;
sourceTree = "<group>";
};
+ BE7E6806229D371B00DE73C8 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ BE7E680B229D374500DE73C8 /* clipboard.cxx */,
+ BE7E6807229D374500DE73C8 /* clipboard.hxx */,
+ BE7E680F229D374500DE73C8 /* DataFlavorMapping.cxx */,
+ BE7E680D229D374500DE73C8 /* DataFlavorMapping.hxx */,
+ BE7E6809229D374500DE73C8 /* dummies.cxx */,
+ BE7E6810229D374500DE73C8 /* HtmlFmtFlt.cxx */,
+ BE7E680A229D374500DE73C8 /* HtmlFmtFlt.hxx */,
+ BE7E6808229D374500DE73C8 /* iosinst.cxx */,
+ BE7E680C229D374500DE73C8 /* iOSTransferable.cxx */,
+ BE7E680E229D374500DE73C8 /* iOSTransferable.hxx */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
BE80E43321B5629300859C97 /* cppuhelper */ = {
isa = PBXGroup;
children = (
@@ -1501,6 +1528,7 @@
BE93D421216CAA59007A39F4 /* app */,
BEB0E5DA21CA7C330085A0CF /* filter */,
BE58E1312187938700249358 /* headless */,
+ BE7E6806229D371B00DE73C8 /* ios */,
BEB0E5E721D642420085A0CF /* outdev */,
BEB0E5DF21CA9DA20085A0CF /* quartz */,
BE34D140218CF87D00815297 /* window */,
More information about the Libreoffice-commits
mailing list