- Avoid showing download progress indicator when viewing files that a…

…re already downloaded (issue (46) in #237)

- Fix bug in PDFViewerViewController where CoreGraphics would throw an error when using pdfView with zero size (before properly laying it out)

ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme

@@ -95,6 +95,11 @@
          </BuildableReference>
       </BuildableProductRunnable>
       <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CG_NUMERICS_SHOW_BACKTRACE"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "oc:app.show-beta-warning"
             value = "false"

ownCloud/Tools/DispatchQueueTools.swift

@@ -18,7 +18,14 @@
 
 import Foundation
 
-func OnMainThread(async: Bool = true, after: TimeInterval? = nil, _ block: @escaping () -> Void) {
+func OnMainThread(async: Bool = true, after: TimeInterval? = nil, inline: Bool = false, _ block: @escaping () -> Void) {
+	if inline {
+		if Thread.isMainThread {
+			block()
+			return
+		}
+	}
+
 	if let after = after {
 		DispatchQueue.main.asyncAfter(deadline: .now() + after, execute: block)
 	} else {

ownCloud/Viewer/DisplayViewController.swift

@@ -62,7 +62,7 @@ class DisplayViewController: UIViewController, OCQueryDelegate {
 
 	var source: URL? {
 		didSet {
-			OnMainThread {
+			OnMainThread(inline: true) {
 				self.iconImageView.isHidden = true
 				self.hideItemMetadataUIElements()
 				self.renderSpecificView()
@@ -72,7 +72,7 @@ class DisplayViewController: UIViewController, OCQueryDelegate {
 
 	private var state: DisplayViewState = .hasNetworkConnection {
 		didSet {
-			OnMainThread {
+			OnMainThread(inline: true) {
 				switch self.state {
 					case .downloading(let progress):
 						self.downloadProgress = progress
@@ -427,7 +427,13 @@ class DisplayViewController: UIViewController, OCQueryDelegate {
 				self.stopQuery()
 				self.startQuery()
 
-				self.downloadItem(sender: nil)
+				if core?.localCopy(of: item) == nil {
+					self.downloadItem(sender: nil)
+				} else {
+					if let core = core, let file = item.file(with: core) {
+						self.source = file.url
+					}
+				}
 
 				if let parent = parent {
 					parent.navigationItem.title = item.name

ownCloud/Viewer/PDFViewerViewController.swift

@@ -150,6 +150,8 @@ class PDFViewerViewController: DisplayViewController, DisplayExtension {
 
             setupConstraints()
 
+            self.view.layoutIfNeeded()
+
             pdfView.document = document
 
             pdfView.scaleFactor = pdfView.scaleFactorForSizeToFit