Merge branch 'milestone/12.2' into feature/url-shortcuts

# Conflicts:
#	ios-sdk
#	ownCloud.xcodeproj/project.pbxproj
#	ownCloud/AppDelegate.swift
#	ownCloud/Resources/en.lproj/Localizable.strings

Author: felix-schwarz

doc/CONFIGURATION.json

@@ -41,6 +41,10 @@
         "description" : "Delete",
         "value" : "com.owncloud.action.delete"
       },
+      {
+        "description" : "Close Window",
+        "value" : "com.owncloud.action.discardscene"
+      },
       {
         "description" : "Duplicate",
         "value" : "com.owncloud.action.duplicate"
@@ -65,6 +69,10 @@
         "description" : "Open in",
         "value" : "com.owncloud.action.openin"
       },
+      {
+        "description" : "Open in a new Window",
+        "value" : "com.owncloud.action.openscene"
+      },
       {
         "description" : "Go to page",
         "value" : "com.owncloud.action.pdfpage"
@@ -175,6 +183,10 @@
         "description" : "Delete",
         "value" : "com.owncloud.action.delete"
       },
+      {
+        "description" : "Close Window",
+        "value" : "com.owncloud.action.discardscene"
+      },
       {
         "description" : "Duplicate",
         "value" : "com.owncloud.action.duplicate"
@@ -199,6 +211,10 @@
         "description" : "Open in",
         "value" : "com.owncloud.action.openin"
       },
+      {
+        "description" : "Open in a new Window",
+        "value" : "com.owncloud.action.openscene"
+      },
       {
         "description" : "Go to page",
         "value" : "com.owncloud.action.pdfpage"
@@ -298,6 +314,38 @@
     "status" : "advanced",
     "type" : "stringArray"
   },
+  {
+    "autoExpansion" : "none",
+    "category" : "Actions",
+    "categoryTag" : "actions",
+    "classIdentifier" : "action",
+    "className" : "ownCloudAppShared.Action",
+    "defaultValue" : "auto",
+    "description" : "Determines how to open a document in a web app.",
+    "flatIdentifier" : "action.open-in-web-app-mode",
+    "key" : "open-in-web-app-mode",
+    "label" : "Open In WebApp mode",
+    "possibleValues" : [
+      {
+        "description" : "Open using `in-app-with-default-browser-option`, unless the respective endpoint is not available - in which case `default-browser` is used instead. If no endpoint to open the document is available, an error message is shown.",
+        "value" : "auto"
+      },
+      {
+        "description" : "Open in default browser app. May require user to sign in.",
+        "value" : "default-browser"
+      },
+      {
+        "description" : "Open inline in an in-app browser.",
+        "value" : "in-app"
+      },
+      {
+        "description" : "Open inline in an in-app browser, but provide a button to open the document in the default browser (may require the user to sign in).",
+        "value" : "in-app-with-default-browser-option"
+      }
+    ],
+    "status" : "advanced",
+    "type" : "string"
+  },
   {
     "autoExpansion" : "none",
     "category" : "App",
@@ -1701,6 +1749,10 @@
         "description" : "Extension with the identifier com.owncloud.action.delete.",
         "value" : "com.owncloud.action.delete"
       },
+      {
+        "description" : "Extension with the identifier com.owncloud.action.discardscene.",
+        "value" : "com.owncloud.action.discardscene"
+      },
       {
         "description" : "Extension with the identifier com.owncloud.action.duplicate.",
         "value" : "com.owncloud.action.duplicate"
@@ -1729,6 +1781,10 @@
         "description" : "Extension with the identifier com.owncloud.action.openin.",
         "value" : "com.owncloud.action.openin"
       },
+      {
+        "description" : "Extension with the identifier com.owncloud.action.openscene.",
+        "value" : "com.owncloud.action.openscene"
+      },
       {
         "description" : "Extension with the identifier com.owncloud.action.pdfpage.",
         "value" : "com.owncloud.action.pdfpage"
@@ -1929,6 +1985,30 @@
     "status" : "debugOnly",
     "type" : "stringArray"
   },
+  {
+    "autoExpansion" : "none",
+    "category" : "Connection",
+    "categoryTag" : "connection",
+    "classIdentifier" : "http",
+    "className" : "OCHTTPPipeline",
+    "defaultValue" : "json",
+    "description" : "If request and response logging is enabled, the format to use.",
+    "flatIdentifier" : "http.traffic-log-format",
+    "key" : "traffic-log-format",
+    "label" : "http.traffic-log-format",
+    "possibleValues" : [
+      {
+        "description" : "JSON",
+        "value" : "json"
+      },
+      {
+        "description" : "Plain text",
+        "value" : "plain"
+      }
+    ],
+    "status" : "supported",
+    "type" : "string"
+  },
   {
     "autoExpansion" : "none",
     "category" : "Connection",

doc/configuration.adoc

@@ -38,6 +38,9 @@ tag::actions[]
 ! `com.owncloud.action.delete`
 ! Delete
 
+! `com.owncloud.action.discardscene`
+! Close Window
+
 ! `com.owncloud.action.duplicate`
 ! Duplicate
 
@@ -56,6 +59,9 @@ tag::actions[]
 ! `com.owncloud.action.openin`
 ! Open in
 
+! `com.owncloud.action.openscene`
+! Open in a new Window
+
 ! `com.owncloud.action.pdfpage`
 ! Go to page
 
@@ -139,6 +145,9 @@ action.create-document-mode
 ! `com.owncloud.action.delete`
 ! Delete
 
+! `com.owncloud.action.discardscene`
+! Close Window
+
 ! `com.owncloud.action.duplicate`
 ! Duplicate
 
@@ -157,6 +166,9 @@ action.create-document-mode
 ! `com.owncloud.action.openin`
 ! Open in
 
+! `com.owncloud.action.openscene`
+! Open in a new Window
+
 ! `com.owncloud.action.pdfpage`
 ! Go to page
 
@@ -233,6 +245,32 @@ action.create-document-mode
 
 |advanced `candidate`
 
+|**Open In WebApp mode** +
+ +
+action.open-in-web-app-mode
+|string
+|`auto`
+|Determines how to open a document in a web app.
+[cols="1,1"]
+!===
+! Value
+! Description
+! `auto`
+! Open using `in-app-with-default-browser-option`, unless the respective endpoint is not available - in which case `default-browser` is used instead. If no endpoint to open the document is available, an error message is shown.
+
+! `default-browser`
+! Open in default browser app. May require user to sign in.
+
+! `in-app`
+! Open inline in an in-app browser.
+
+! `in-app-with-default-browser-option`
+! Open inline in an in-app browser, but provide a button to open the document in the default browser (may require the user to sign in).
+
+!===
+
+|advanced `candidate`
+
 |===
 end::actions[]
 
@@ -713,6 +751,24 @@ tag::connection[]
 |Enable or disable per-process, in-memory cookie storage.
 |supported `candidate`
 
+|http.traffic-log-format
+|string
+|`json`
+|If request and response logging is enabled, the format to use.
+[cols="1,1"]
+!===
+! Value
+! Description
+! `json`
+! JSON
+
+! `plain`
+! Plain text
+
+!===
+
+|supported `candidate`
+
 |http.user-agent
 |string
 |`ownCloudApp/{{app.version}} ({{app.part}}/{{app.build}}; {{os.name}}/{{os.version}}; {{device.model}})`
@@ -1045,6 +1101,9 @@ tag::extensions[]
 ! `com.owncloud.action.delete`
 ! Extension with the identifier com.owncloud.action.delete.
 
+! `com.owncloud.action.discardscene`
+! Extension with the identifier com.owncloud.action.discardscene.
+
 ! `com.owncloud.action.duplicate`
 ! Extension with the identifier com.owncloud.action.duplicate.
 
@@ -1066,6 +1125,9 @@ tag::extensions[]
 ! `com.owncloud.action.openin`
 ! Extension with the identifier com.owncloud.action.openin.
 
+! `com.owncloud.action.openscene`
+! Extension with the identifier com.owncloud.action.openscene.
+
 ! `com.owncloud.action.pdfpage`
 ! Extension with the identifier com.owncloud.action.pdfpage.
 

ownCloud Share Extension/ShareExtensionViewController.swift

@@ -344,6 +344,13 @@ class ShareExtensionViewController: EmbeddingViewController, Themeable {
 				// Show location picker
 				showLocationPicker()
 			}
+
+			// Log in to first account if there's only one
+			let bookmarks = OCBookmarkManager.shared.bookmarks
+
+			if bookmarks.count == 1, let onlyBookmark = bookmarks.first {
+				AccountConnectionPool.shared.connection(for: onlyBookmark)?.connect()
+			}
 		}
 	}