[Libreoffice-commits] online.git: Mobile/Mobile
Mobile/Mobile/Info.plist.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 11c5c9f997e9b627566647810bd1106577643eda Author: Tor Lillqvist AuthorDate: Sat Nov 17 10:57:21 2018 +0200 Commit: Tor Lillqvist CommitDate: Sat Nov 17 10:58:12 2018 +0200 Bump CFBundleVersion to 7 Change-Id: I5ff12e12183b7e86553f6bdc183de2d33ab52ab4 diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in index 271e3c652..71fdfddeb 100644 --- a/Mobile/Mobile/Info.plist.in +++ b/Mobile/Mobile/Info.plist.in @@ -177,7 +177,7 @@ CFBundleShortVersionString 0.1 CFBundleVersion -6 +7 LSRequiresIPhoneOS UIFileSharingEnabled ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Mobile/Mobile
Mobile/Mobile/Info.plist.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f76671ca6016a5e26bda3230de299322c9abc097 Author: Tor Lillqvist AuthorDate: Wed Nov 14 20:08:55 2018 +0200 Commit: Tor Lillqvist CommitDate: Wed Nov 14 20:08:55 2018 +0200 Bump CFBundleVersion to 6 Change-Id: Icd829475ab451a0bef8d17bc572fc6b2cb200342 diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in index cf878cdf3..271e3c652 100644 --- a/Mobile/Mobile/Info.plist.in +++ b/Mobile/Mobile/Info.plist.in @@ -177,7 +177,7 @@ CFBundleShortVersionString 0.1 CFBundleVersion -5 +6 LSRequiresIPhoneOS UIFileSharingEnabled ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Mobile/Mobile
Mobile/Mobile/Info.plist.in | 14 ++ 1 file changed, 14 insertions(+) New commits: commit 44e639a5fd7839c0c69f05f16c44b17037169cf9 Author: Tor Lillqvist AuthorDate: Fri Nov 2 17:11:03 2018 +0200 Commit: Tor Lillqvist CommitDate: Fri Nov 2 17:11:03 2018 +0200 Add .ppt Change-Id: Ifc399ce956b3fc915083f3306e315b4e006497db diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in index 83b375963..0ad318ea3 100644 --- a/Mobile/Mobile/Info.plist.in +++ b/Mobile/Mobile/Info.plist.in @@ -136,6 +136,20 @@ org.openxmlformats.presentationml.presentation + +CFBundleTypeIconFiles + +CFBundleTypeName +Microsoft PowerPoint Presentation +CFBundleTypeRole +Editor +LSHandlerRank +Alternate +LSItemContentTypes + +com.microsoft.powerpoint.ppt + + CFBundleExecutable $(EXECUTABLE_NAME) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Mobile/Mobile
Mobile/Mobile/Info.plist.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit ac18a7cd9dcc82872f7c07e633eb81f4c2216488 Author: Tor Lillqvist AuthorDate: Wed Oct 31 18:31:00 2018 +0200 Commit: Tor Lillqvist CommitDate: Wed Oct 31 18:35:59 2018 +0200 Add NSCameraUsageDescription so that the taking/using a photo doesn't crash (Such a crash is intentionally caused by the system, in case an app attempts to access the photo library or the camera without explicitly declaring that intent in the Info.plist.) The photo doesn't show up in the document, though, in fact the UI kinda freezes... but that is another problem. Change-Id: Ib998bdc2c2c3708f69f066522ade54c36dd5f551 diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in index 0baf5a047..dc078a396 100644 --- a/Mobile/Mobile/Info.plist.in +++ b/Mobile/Mobile/Info.plist.in @@ -164,5 +164,7 @@ UTImportedTypeDeclarations + NSCameraUsageDescription + $(PRODUCT_NAME) camera use ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Mobile/Mobile
Mobile/Mobile/Info.plist | 168 --- 1 file changed, 168 deletions(-) New commits: commit 143527b4c80d3a28a04b1b54bc9121199802c362 Author: Tor Lillqvist AuthorDate: Tue Oct 30 12:18:47 2018 +0200 Commit: Tor Lillqvist CommitDate: Tue Oct 30 12:18:47 2018 +0200 Delete this file that is now created by the configure script Change-Id: Idfec149bd5f7c5b7fb24659d185b322190e7935a diff --git a/Mobile/Mobile/Info.plist b/Mobile/Mobile/Info.plist deleted file mode 100644 index f8401cede..0 --- a/Mobile/Mobile/Info.plist +++ /dev/null @@ -1,168 +0,0 @@ - -http://www.apple.com/DTDs/PropertyList-1.0.dtd;> - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Collabora Office Mobile - CFBundleDocumentTypes - - - CFBundleTypeName - OpenDocument Flat Text - LSHandlerRank - Default - LSItemContentTypes - - com.collabora.office.uti.fodt - - - - CFBundleTypeIconFiles - - CFBundleTypeName - Plain Text - CFBundleTypeRole - Editor - LSHandlerRank - Alternate - LSItemContentTypes - - public.text - - - - CFBundleTypeName - OpenDocument Text - LSHandlerRank - Owner - LSItemContentTypes - - org.oasis-open.opendocument.text - - - - CFBundleTypeIconFiles - - CFBundleTypeName - Microsoft Word Document - CFBundleTypeRole - Editor - LSHandlerRank - Alternate - LSItemContentTypes - - com.microsoft.word.doc - - - - CFBundleTypeIconFiles - - CFBundleTypeName - OpenDocument Spreadsheet - CFBundleTypeRole - Editor - LSHandlerRank - Owner - LSItemContentTypes - - org.oasis-open.opendocument.spreadsheet - - - - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIFileSharingEnabled - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportsDocumentBrowser - - UTExportedTypeDeclarations - - - UTTypeConformsTo - - public.data - - UTTypeIdentifier - com.collabora.office.uti.fodt - UTTypeTagSpecification - - public.filename-extension - fodt - - - - UTTypeConformsTo - - public.data - - UTTypeDescription - OpenDocument Text - UTTypeIconFiles - - UTTypeIdentifier -
[Libreoffice-commits] online.git: Mobile/Mobile
Mobile/Mobile/AppDelegate.mm| 15 ---
Mobile/Mobile/DocumentViewController.mm |5 +++--
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit c701e875f6118d24ff0b9a7c3823f8f6c9570db0
Author: Tor Lillqvist
AuthorDate: Tue Oct 16 00:01:04 2018 +0300
Commit: Tor Lillqvist
CommitDate: Tue Oct 16 02:00:47 2018 +0300
iOS app work in progress on closing and re-opening a document
diff --git a/Mobile/Mobile/AppDelegate.mm b/Mobile/Mobile/AppDelegate.mm
index 6fbd25d75..eab0054f6 100644
--- a/Mobile/Mobile/AppDelegate.mm
+++ b/Mobile/Mobile/AppDelegate.mm
@@ -40,16 +40,17 @@ static LOOLWSD *loolwsd = nullptr;
dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT,
0),
^{
- if (loolwsd == nullptr)
- {
- loolwsd = new LOOLWSD();
- Util::setThreadName("app");
- }
+ assert(loolwsd == nullptr);
char *argv[2];
argv[0] = strdup([[NSBundle mainBundle].executablePath
UTF8String]);
argv[1] = nullptr;
- loolwsd->run(1, argv);
- assert(false && "? LOOLWSD::main() returned?");
+ Util::setThreadName("app");
+ while (true) {
+ loolwsd = new LOOLWSD();
+ loolwsd->run(1, argv);
+ delete loolwsd;
+ NSLog(@"One run of LOOLWSD completed");
+ }
});
return YES;
}
diff --git a/Mobile/Mobile/DocumentViewController.mm
b/Mobile/Mobile/DocumentViewController.mm
index fc7f2deee..3d5e92c99 100644
--- a/Mobile/Mobile/DocumentViewController.mm
+++ b/Mobile/Mobile/DocumentViewController.mm
@@ -177,7 +177,7 @@
// the other end too just for
cleanliness, even if a
// FakeSocket as such is not a
system resource so nothing
// is saved by closing it.
-
fakeSocketClose(self->closeNotificationPipeForForwardingThread[0]);
+
fakeSocketClose(self->closeNotificationPipeForForwardingThread[1]);
// Close our end of the fake socket
connection to the
// ClientSession thread, so that it
terminates
@@ -210,11 +210,12 @@
return;
} else if ([message.body isEqualToString:@"BYE"]) {
-NSLog(@"document window closed! Closing our end of the socket?");
+NSLog(@"document window terminating on JavaScript side. Closing
our end of the socket.");
// Close one end of the socket pair, that will wake up the
forwarding thread above
fakeSocketClose(closeNotificationPipeForForwardingThread[0]);
+[self dismissDocumentViewController];
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
