[Libreoffice-commits] online.git: 2 commits - configure.ac ios/Mobile

[Libreoffice Gerrit user]

 configure.ac              |   10 ++++++++++
 ios/Mobile/AppDelegate.mm |   10 ----------
 ios/Mobile/Info.plist.in  |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 73ad6c300a25f42106cd0e4f1b645e9409f65cdd
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 25 09:07:44 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Feb 25 09:14:14 2019 +0200

    Bin some boilerplate comments
    
    Change-Id: Ida0a8279f081d5b9c5d963d7d721e4c7c01f3a9e

diff --git a/ios/Mobile/AppDelegate.mm b/ios/Mobile/AppDelegate.mm
index 787a8a140..001f0f5c7 100644
--- a/ios/Mobile/AppDelegate.mm
+++ b/ios/Mobile/AppDelegate.mm
@@ -212,25 +212,18 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
 }
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)inputURL options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
@@ -243,7 +236,6 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
     DocumentBrowserViewController *documentBrowserViewController = (DocumentBrowserViewController *)self.window.rootViewController;
     [documentBrowserViewController revealDocumentAtURL:inputURL importIfNeeded:YES completion:^(NSURL * _Nullable revealedDocumentURL, NSError * _Nullable error) {
         if (error) {
-            // Handle the error appropriately
             LOG_ERR("Failed to reveal the document at URL " << [[inputURL description] UTF8String] << " with error: " << [[error description] UTF8String]);
             return;
         }
@@ -254,8 +246,6 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
     return YES;
 }
 
-// NSURLSessionDataDelegate methods
-
 @end
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
commit ce53efd8805d52ead6d739f5aef68db1d56e1fe6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun Feb 24 14:44:06 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Feb 25 09:14:14 2019 +0200

    Keep the iOS app bundle version in a file in the build folder, not in git
    
    When you want to build a new version for distribution, bump the
    build number in the BUNDLE-VERSION file.
    
    Change-Id: I1e7e55528aef6d3526ce14d070ae96abc5931f38

diff --git a/configure.ac b/configure.ac
index dc8560e67..b99020a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,16 +322,26 @@ AC_SUBST(LOKIT_PATH)
 
 ENABLE_IOSAPP=
 MOBILE_APP_NAME="Mobile"
+IOSAPP_BUNDLE_VERSION=
 
 if test "$enable_iosapp" = "yes"; then
    ENABLE_IOSAPP=true
    if test -n "$with_iosapp_name"; then
       MOBILE_APP_NAME="$with_iosapp_name"
    fi
+
+   if test -f BUNDLE-VERSION; then
+       IOSAPP_BUNDLE_VERSION=$(cat BUNDLE-VERSION)
+   else
+       IOSAPP_BUNDLE_VERSION=1
+   fi
+   echo $IOSAPP_BUNDLE_VERSION >BUNDLE-VERSION
 fi
+
 AC_SUBST(ENABLE_IOSAPP)
 AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
 AC_SUBST(MOBILE_APP_NAME)
+AC_SUBST(IOSAPP_BUNDLE_VERSION)
 
 ENABLE_GTKAPP=
 if test "$enable_gtkapp" = "yes"; then
diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index d0f0e76f9..5dd1931e1 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -197,7 +197,7 @@
     <key>CFBundleShortVersionString</key>
     <string>0.1</string>
     <key>CFBundleVersion</key>
-    <string>16</string>
+    <string>@IOSAPP_BUNDLE_VERSION@</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>UIFileSharingEnabled</key>