cleanup, better colors, proper backup progress

Pods/Pods.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -236,12 +236,12 @@
 		22DC09B4ECAD6C3666EDA379CBB073A6 /* srp.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = srp.h; path = opensslIncludes/openssl/srp.h; sourceTree = "<group>"; };
 		24E6D101227D093B4E6D52600040E3AC /* ssl2.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ssl2.h; path = opensslIncludes/openssl/ssl2.h; sourceTree = "<group>"; };
 		25C7E3E19A11AC46699A63488B0691E3 /* MediaItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MediaItem.swift; path = Sources/Protocols/MediaItem.swift; sourceTree = "<group>"; };
-		2767B903A54FD0FC85B89C3A4520BD3D /* JGProgressHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = JGProgressHUD.framework; path = JGProgressHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		2767B903A54FD0FC85B89C3A4520BD3D /* JGProgressHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JGProgressHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		279483D3BA99FB2AC31E5FD237B4B81D /* InputBarButtonItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InputBarButtonItem.swift; path = Sources/Controls/InputBarButtonItem.swift; sourceTree = "<group>"; };
 		2BD4E8B5B02FC14714C2D72E1A306537 /* Icon.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Icon.swift; path = Source/Model/Icon.swift; sourceTree = "<group>"; };
 		2C54A26554AFB815DA50590218570EE6 /* MessageContainerView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessageContainerView.swift; path = Sources/Views/MessageContainerView.swift; sourceTree = "<group>"; };
 		2D1A65181A99918834985E21A0CDBE0B /* Pods-deltachat-ios-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-deltachat-ios-dummy.m"; sourceTree = "<group>"; };
-		2F51124FA5EE1CCBBB95414046F1153D /* MessageKitAssets.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = MessageKitAssets.bundle; path = "MessageKit-MessageKitAssets.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2F51124FA5EE1CCBBB95414046F1153D /* MessageKitAssets.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessageKitAssets.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		2F55F452AC8FBC7A9CB6FA18C0B20364 /* JGProgressHUDSuccessIndicatorView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JGProgressHUDSuccessIndicatorView.m; path = JGProgressHUD/JGProgressHUD/JGProgressHUDSuccessIndicatorView.m; sourceTree = "<group>"; };
 		2FB94B59AE871766B251A77E6A1DFB88 /* InsetLabel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InsetLabel.swift; path = Sources/Views/InsetLabel.swift; sourceTree = "<group>"; };
 		314607E7B9AE5997ABC78925ACB69398 /* MessageLabel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessageLabel.swift; path = Sources/Views/MessageLabel.swift; sourceTree = "<group>"; };
@@ -262,7 +262,7 @@
 		40113184E489C15AAEC174A645546FEA /* x509.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = x509.h; path = opensslIncludes/openssl/x509.h; sourceTree = "<group>"; };
 		403C28B1244DBC894070666C8EFEC7D0 /* x509_vfy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = x509_vfy.h; path = opensslIncludes/openssl/x509_vfy.h; sourceTree = "<group>"; };
 		40E4E91ECDB25750E60C29E352AC073A /* MessagesViewController+Keyboard.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "MessagesViewController+Keyboard.swift"; path = "Sources/Controllers/MessagesViewController+Keyboard.swift"; sourceTree = "<group>"; };
-		40F27E8AA56567716BB6BD4EE7EE8B97 /* MessageInputBar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MessageInputBar.framework; path = MessageInputBar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		40F27E8AA56567716BB6BD4EE7EE8B97 /* MessageInputBar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MessageInputBar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		43E27BB39BA17FFF822ACFF34B0D039D /* ebcdic.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ebcdic.h; path = opensslIncludes/openssl/ebcdic.h; sourceTree = "<group>"; };
 		440E8B5D7626015EF9851D6286DA8B69 /* QuickTableViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTableViewController.swift; path = Source/QuickTableViewController.swift; sourceTree = "<group>"; };
 		442BAACC76EB390A0F15E491372ED647 /* sha.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = sha.h; path = opensslIncludes/openssl/sha.h; sourceTree = "<group>"; };
@@ -304,7 +304,7 @@
 		6DF4C12D00180DAAC8A9D588A9A9B60A /* LabelAlignment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LabelAlignment.swift; path = Sources/Models/LabelAlignment.swift; sourceTree = "<group>"; };
 		6EDD45A83202F8484952079FEF4781C0 /* ssl3.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ssl3.h; path = opensslIncludes/openssl/ssl3.h; sourceTree = "<group>"; };
 		6FB772803E015CC7A4F2F9ABF6E54619 /* ReachabilitySwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ReachabilitySwift-prefix.pch"; sourceTree = "<group>"; };
-		7216131435396F621EC7AEE9D68D24CF /* JGProgressHUD.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = JGProgressHUD.bundle; path = "JGProgressHUD-JGProgressHUD.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7216131435396F621EC7AEE9D68D24CF /* JGProgressHUD.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JGProgressHUD.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		72CD54E424F565FE3C244A33A6FAE1D9 /* stack.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = stack.h; path = opensslIncludes/openssl/stack.h; sourceTree = "<group>"; };
 		73542F0349F46DD96331E8C846488D71 /* InputStackView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InputStackView.swift; path = Sources/Views/InputStackView.swift; sourceTree = "<group>"; };
 		73B37C38FC447C651860F79B86ECE23D /* jg_hud_error.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = jg_hud_error.png; path = JGProgressHUD/Resources/jg_hud_error.png; sourceTree = "<group>"; };
@@ -341,7 +341,7 @@
 		9211BF0AE6F14C66C769627661EB2181 /* MessageInputBar-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MessageInputBar-prefix.pch"; sourceTree = "<group>"; };
 		922BCC7FA7901A509F242D0149B03617 /* JGProgressHUDIndeterminateIndicatorView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JGProgressHUDIndeterminateIndicatorView.h; path = JGProgressHUD/JGProgressHUD/JGProgressHUDIndeterminateIndicatorView.h; sourceTree = "<group>"; };
 		93823A00A7D4B941DDDB9C2A8A3B81F4 /* MessagesCollectionViewLayoutAttributes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessagesCollectionViewLayoutAttributes.swift; path = Sources/Layout/MessagesCollectionViewLayoutAttributes.swift; sourceTree = "<group>"; };
-		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		9416FE32A89DDD016A12A6640BC3B147 /* MessagesDisplayDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessagesDisplayDelegate.swift; path = Sources/Protocols/MessagesDisplayDelegate.swift; sourceTree = "<group>"; };
 		94AB3260662685738D34949620DE6E02 /* ecdsa.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ecdsa.h; path = opensslIncludes/openssl/ecdsa.h; sourceTree = "<group>"; };
 		95AE83A6A1B1538DADBB930075712E96 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -360,7 +360,7 @@
 		A64EF2BCC6058F6F4D663394D7A2AD77 /* opensslconf.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = opensslconf.h; path = opensslIncludes/openssl/opensslconf.h; sourceTree = "<group>"; };
 		A847C34FEFFB231A540AE47EF84B1CBA /* hmac.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = opensslIncludes/openssl/hmac.h; sourceTree = "<group>"; };
 		A8A1D25ED025DF7C9E3F22C00AFB4F9F /* MessageKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MessageKit.xcconfig; sourceTree = "<group>"; };
-		AA9B74D8FF80D826812E581CD14EBD98 /* Reachability.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Reachability.framework; path = ReachabilitySwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		AA9B74D8FF80D826812E581CD14EBD98 /* Reachability.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Reachability.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AAE251D11913BC7344B23000891EAF7A /* dsa.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = dsa.h; path = opensslIncludes/openssl/dsa.h; sourceTree = "<group>"; };
 		AC4A1650557A41C691622FFCCF39E2B0 /* ossl_typ.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ossl_typ.h; path = opensslIncludes/openssl/ossl_typ.h; sourceTree = "<group>"; };
 		ACB5E5DB420C15F109706BE81AC87E6B /* MessageSizeCalculator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessageSizeCalculator.swift; path = Sources/Layout/MessageSizeCalculator.swift; sourceTree = "<group>"; };
@@ -368,7 +368,7 @@
 		AF5396BBE1228775BA30B512E81108F7 /* ripemd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = ripemd.h; path = opensslIncludes/openssl/ripemd.h; sourceTree = "<group>"; };
 		B103A03D8F9E7635EC06C3475D8846F1 /* crypto.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = crypto.h; path = opensslIncludes/openssl/crypto.h; sourceTree = "<group>"; };
 		B1B0EBFC7D8C29D7932A02E496E92858 /* md4.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = md4.h; path = opensslIncludes/openssl/md4.h; sourceTree = "<group>"; };
-		B1E2F618508A3ABAC6FC34156A349F84 /* QuickTableViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = QuickTableViewController.framework; path = QuickTableViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B1E2F618508A3ABAC6FC34156A349F84 /* QuickTableViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = QuickTableViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3A2C8815ECBBE7D7DCA6E643D231226 /* seed.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = seed.h; path = opensslIncludes/openssl/seed.h; sourceTree = "<group>"; };
 		B3C05C3C9ECD9F9DDE1C3F02B84AB15A /* jg_hud_success.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = jg_hud_success.png; path = JGProgressHUD/Resources/jg_hud_success.png; sourceTree = "<group>"; };
 		B466A23C8C3B38E708066673276117AB /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.0.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
@@ -377,7 +377,7 @@
 		B8184C24E6F105C05119CFEB15F15FCA /* MessageLabelDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessageLabelDelegate.swift; path = Sources/Protocols/MessageLabelDelegate.swift; sourceTree = "<group>"; };
 		BAD1758AD88C5FB764CAA9E0395F8139 /* Pods-deltachat-ios-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-deltachat-ios-acknowledgements.plist"; sourceTree = "<group>"; };
 		BB56B539926D5A4F49991DF6801EA411 /* JGProgressHUD-Defines.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "JGProgressHUD-Defines.h"; path = "JGProgressHUD/JGProgressHUD/JGProgressHUD-Defines.h"; sourceTree = "<group>"; };
-		BCB9671F7010E57C4DE53C4B1104DE1E /* Pods_deltachat_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_deltachat_ios.framework; path = "Pods-deltachat-ios.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BCB9671F7010E57C4DE53C4B1104DE1E /* Pods_deltachat_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEC8A00B45C904E9A80F31594DB34931 /* MessageKitError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessageKitError.swift; path = Sources/Models/MessageKitError.swift; sourceTree = "<group>"; };
 		BF74D3E154520441EFFD23703815DB61 /* Pods-deltachat-ios-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-deltachat-ios-resources.sh"; sourceTree = "<group>"; };
 		BFEC289C13D00C361FE726540C769F0B /* NSConstraintLayoutSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NSConstraintLayoutSet.swift; path = Sources/Models/NSConstraintLayoutSet.swift; sourceTree = "<group>"; };
@@ -407,7 +407,7 @@
 		D613185B2085ABD11122B430291510B5 /* MessagesCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MessagesCollectionViewFlowLayout.swift; path = Sources/Layout/MessagesCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
 		D9855EADF792FFE0A2681DE90CE3ED8A /* UIView+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIView+Extensions.swift"; path = "Sources/Extensions/UIView+Extensions.swift"; sourceTree = "<group>"; };
 		D9D3BE44E5E410C89F22D6F01F3F410D /* JGProgressHUDFadeZoomAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JGProgressHUDFadeZoomAnimation.h; path = JGProgressHUD/JGProgressHUD/JGProgressHUDFadeZoomAnimation.h; sourceTree = "<group>"; };
-		DB83E650DA9C64FA7DFD582405AAEBA9 /* Images */ = {isa = PBXFileReference; includeInIndex = 1; name = Images; path = Assets/MessageKitAssets.bundle/Images; sourceTree = "<group>"; };
+		DB83E650DA9C64FA7DFD582405AAEBA9 /* Images */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = Images; path = Assets/MessageKitAssets.bundle/Images; sourceTree = "<group>"; };
 		DD08740AFAF72AB27117C711557929C6 /* objects.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = objects.h; path = opensslIncludes/openssl/objects.h; sourceTree = "<group>"; };
 		DD805A70DFF7A3A7CE3833A77F97994C /* UIColor+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIColor+Extensions.swift"; path = "Sources/Extensions/UIColor+Extensions.swift"; sourceTree = "<group>"; };
 		DDC434B17F702799DBE4D7AA4A571E57 /* JGProgressHUDImageIndicatorView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JGProgressHUDImageIndicatorView.h; path = JGProgressHUD/JGProgressHUD/JGProgressHUDImageIndicatorView.h; sourceTree = "<group>"; };
@@ -422,7 +422,7 @@
 		E5E9986FF31EE9A95CF02C8CF4F82831 /* aes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = aes.h; path = opensslIncludes/openssl/aes.h; sourceTree = "<group>"; };
 		E795CBB9AD69A884991D786ED2BAFEC1 /* MessageKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MessageKit-umbrella.h"; sourceTree = "<group>"; };
 		E7F8EA1D080CCF6B8DFE6CF1C2FA9C53 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
-		EB8825015BED9F6FBBCEFE830B785018 /* MessageKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MessageKit.framework; path = MessageKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EB8825015BED9F6FBBCEFE830B785018 /* MessageKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MessageKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EDE8FB3AA4C02472C6E4E4B63B0C5730 /* JGProgressHUDErrorIndicatorView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JGProgressHUDErrorIndicatorView.h; path = JGProgressHUD/JGProgressHUD/JGProgressHUDErrorIndicatorView.h; sourceTree = "<group>"; };
 		EE5B61F68FBA157A0253E0497F2A7202 /* dtls1.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = dtls1.h; path = opensslIncludes/openssl/dtls1.h; sourceTree = "<group>"; };
 		EE9C2E9F5A9823F553CF5DF3199ADAB8 /* MessageInputBar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MessageInputBar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -546,7 +546,6 @@
 				1EE55B0AC7ABB48A0ECF61125BC34F0E /* TapActionRow.swift */,
 				DC15237B0F762C4D51B29E1AC8167497 /* Support Files */,
 			);
-			name = QuickTableViewController;
 			path = QuickTableViewController;
 			sourceTree = "<group>";
 		};
@@ -616,7 +615,6 @@
 				FE6AD536B2A1D3368A4E9D844021EED2 /* Resources */,
 				C62BEC1D9EA5D3A06F9A7ECCC428BEEA /* Support Files */,
 			);
-			name = MessageKit;
 			path = MessageKit;
 			sourceTree = "<group>";
 		};
@@ -626,7 +624,6 @@
 				C39B72BD69393E81E9B5CA69454F2881 /* Core */,
 				D858E40AD6CD623E01F854246D6225F1 /* Support Files */,
 			);
-			name = MessageInputBar;
 			path = MessageInputBar;
 			sourceTree = "<group>";
 		};
@@ -756,7 +753,6 @@
 				444E39FFBCA0262B7FA3A066BD75378E /* x509v3.h */,
 				FCA4393E7057821A69ED8080F975E0C4 /* Frameworks */,
 			);
-			name = "openssl-ios-bitcode";
 			path = "openssl-ios-bitcode";
 			sourceTree = "<group>";
 		};
@@ -766,7 +762,6 @@
 				35BC32FD6B986E63C0EAF500F885209D /* Reachability.swift */,
 				83361F7291F04F70F088B93F6430BABB /* Support Files */,
 			);
-			name = ReachabilitySwift;
 			path = ReachabilitySwift;
 			sourceTree = "<group>";
 		};
@@ -834,7 +829,6 @@
 				E5A8E2ADC49EFDB1459AE108B78219CF /* Resources */,
 				EE92CD0D2F629E92E7DA686B90022D62 /* Support Files */,
 			);
-			name = JGProgressHUD;
 			path = JGProgressHUD;
 			sourceTree = "<group>";
 		};
@@ -1169,6 +1163,11 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
 				LastUpgradeCheck = 0930;
+				TargetAttributes = {
+					4603EBF6E0565CF8BC8C4267C5070834 = {
+						LastSwiftMigration = 1010;
+					};
+				};
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1808,8 +1807,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 4.2;
 				SYMROOT = "${SRCROOT}/../build";
 			};

deltachat-ios.xcodeproj/project.pbxproj

@@ -92,7 +92,6 @@
 		AE0D26FD1FB1FE88002FAFCE /* ChatListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */; };
 		AEACE2DD1FB323CA00DCDD78 /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEACE2DC1FB323CA00DCDD78 /* ChatViewController.swift */; };
 		AEACE2DF1FB3246400DCDD78 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEACE2DE1FB3246400DCDD78 /* Message.swift */; };
-		AEACE2E11FB3271700DCDD78 /* SampleData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEACE2E01FB3271700DCDD78 /* SampleData.swift */; };
 		AEACE2E31FB32B5C00DCDD78 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEACE2E21FB32B5C00DCDD78 /* Constants.swift */; };
 		AEACE2E51FB32E1900DCDD78 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEACE2E41FB32E1900DCDD78 /* Utils.swift */; };
 /* End PBXBuildFile section */
@@ -249,7 +248,6 @@
 		AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListController.swift; sourceTree = "<group>"; };
 		AEACE2DC1FB323CA00DCDD78 /* ChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
 		AEACE2DE1FB3246400DCDD78 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
-		AEACE2E01FB3271700DCDD78 /* SampleData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleData.swift; sourceTree = "<group>"; };
 		AEACE2E21FB32B5C00DCDD78 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		AEACE2E41FB32E1900DCDD78 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -268,6 +266,25 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		78ED838A21D5570700243125 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				78E45E4321D3F14A00D4B15E /* UIImage+Extension.swift */,
+				78E45E4121D3DB4000D4B15E /* UIViewController+Extension.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
+		78ED838B21D56BAA00243125 /* TopViews */ = {
+			isa = PBXGroup;
+			children = (
+				78E45E3F21D3D70700D4B15E /* ContactListController.swift */,
+				AEACE2DC1FB323CA00DCDD78 /* ChatViewController.swift */,
+				78E45E3921D3CFBC00D4B15E /* SettingsController.swift */,
+			);
+			name = TopViews;
+			sourceTree = "<group>";
+		};
 		7A451D9B1FB1F4BF00177250 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -389,7 +406,6 @@
 				7A451DAF1FB1F84900177250 /* AppCoordinator.swift */,
 				78E45E4B21D404AE00D4B15E /* CustomCell.swift */,
 				7A9FB14A1FB061E2001FEA36 /* Assets.xcassets */,
-				78E45E4321D3F14A00D4B15E /* UIImage+Extension.swift */,
 				7A9FB14C1FB061E2001FEA36 /* LaunchScreen.storyboard */,
 				7A9FB14F1FB061E2001FEA36 /* Info.plist */,
 				7A9FB1561FB06540001FEA36 /* deltachat-ios-Bridging-Header.h */,
@@ -399,20 +415,17 @@
 				70B8882D2091B8550074812E /* ContactCell.swift */,
 				7032FF8E2149C1DB00B7EC83 /* BaseController.swift */,
 				AE0D26FC1FB1FE88002FAFCE /* ChatListController.swift */,
+				78ED838B21D56BAA00243125 /* TopViews */,
 				78E45E3221D3CBC000D4B15E /* AppTabBarController.swift */,
 				78E45E3D21D3D28C00D4B15E /* NavigationController.swift */,
 				7A0052A01FBC50C40048C3BF /* CredentialsController.swift */,
-				78E45E3921D3CFBC00D4B15E /* SettingsController.swift */,
 				7092474020B3869500AF8799 /* ContactProfileViewController.swift */,
 				7A0052C71FBE6CB40048C3BF /* NewContactController.swift */,
-				AEACE2DC1FB323CA00DCDD78 /* ChatViewController.swift */,
-				78E45E4121D3DB4000D4B15E /* UIViewController+Extension.swift */,
+				78ED838A21D5570700243125 /* Extensions */,
 				7AE0A5481FC42F65005ECB4B /* NewChatViewController.swift */,
 				7070FB3C20FDD9FE000DC258 /* NewGroupViewController.swift */,
-				78E45E3F21D3D70700D4B15E /* ContactListController.swift */,
 				70B08FCC21073B910097D3EA /* NewGroupMemberChoiceController.swift */,
 				7070FB9A2101ECBB000DC258 /* GroupNameController.swift */,
-				AEACE2E01FB3271700DCDD78 /* SampleData.swift */,
 				AEACE2E21FB32B5C00DCDD78 /* Constants.swift */,
 				AEACE2E41FB32E1900DCDD78 /* Utils.swift */,
 				78E45E3B21D3D03700D4B15E /* TableViewCell.swift */,
@@ -548,7 +561,7 @@
 								enabled = 1;
 							};
 							com.apple.Push = {
-								enabled = 1;
+								enabled = 0;
 							};
 						};
 					};
@@ -699,7 +712,6 @@
 				70B08FCD21073B910097D3EA /* NewGroupMemberChoiceController.swift in Sources */,
 				78E45E3E21D3D28C00D4B15E /* NavigationController.swift in Sources */,
 				7A7923751FB0A2C800BC2DE5 /* validate.c in Sources */,
-				AEACE2E11FB3271700DCDD78 /* SampleData.swift in Sources */,
 				78E45E4021D3D70700D4B15E /* ContactListController.swift in Sources */,
 				7070FB6A20FF345F000DC258 /* dc_saxparser.c in Sources */,
 				7070FB8A20FF4118000DC258 /* dc_log.c in Sources */,

deltachat-ios/AppDelegate.swift

@@ -12,9 +12,12 @@ import UserNotifications
 import Reachability
 
 var mailboxPointer:UnsafeMutablePointer<dc_context_t>!
+
 let dc_notificationChanged = Notification.Name(rawValue:"MrEventMsgsChanged")
 let dc_notificationStateChanged = Notification.Name(rawValue:"MrEventStateChanged")
 let dc_notificationIncoming = Notification.Name(rawValue:"MrEventIncomingMsg")
+let dc_notificationBackupProgress = Notification.Name(rawValue:"MrEventBackupProgress")
+
 
 @_silgen_name("callbackSwift")
 
@@ -81,7 +84,6 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                     object: nil,
                     userInfo: ["state": "offline"])
         }
-        return nil
     case DC_EVENT_IMAP_CONNECTED, DC_EVENT_SMTP_CONNECTED:
         print("connected")
         let nc = NotificationCenter.default
@@ -90,7 +92,6 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                     object: nil,
                     userInfo: ["state": "online"])
         }
-        return nil
     case DC_EVENT_MSGS_CHANGED, DC_EVENT_MSG_READ, DC_EVENT_MSG_DELIVERED:
         // TODO: reload all views
         // e.g. when message appears that is not new, i.e. no need
@@ -107,7 +108,6 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                         "date": Date()
                     ])
         }
-
     case DC_EVENT_INCOMING_MSG:
         // TODO: reload all views + set notification / badge
         // mrmailbox_get_fresh_msgs
@@ -126,18 +126,26 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                         "date": Date()
                     ])
         }
-    case DC_EVENT_GET_STRING:
-        break
     case DC_EVENT_SMTP_MESSAGE_SENT:
         print("smtp message sent", data2String)
     case DC_EVENT_MSG_DELIVERED:
         print("message delivered", data1, data2)
     case DC_EVENT_IMEX_PROGRESS:
-        print("backup progress")
+        let nc = NotificationCenter.default
+        DispatchQueue.main.async {
+            nc.post(
+                name: dc_notificationBackupProgress,
+                object: nil,
+                userInfo: [
+                    "progress": Int(data1),
+                    "error": Int(data1) == 0,
+                    "done": Int(data1) == 1000
+            ])
+        }
     case DC_EVENT_IMEX_FILE_WRITTEN:
-        print("finished creating backup")
+        print("backup file written", String(cString: data1String))
     default:
-        print("unknown event", event, data1String, data2String)
+        print("unknown event", event)
     }
 
     return nil

deltachat-ios/ChatListController.swift

@@ -96,9 +96,10 @@ class ChatListController: UIViewController {
         
         chatTable.rowHeight = 80
         
-        let newImage:UIImage = UIImage(named: "create_new")!
+        let newImage = UIImage(named: "create_new")!
         newButton = UIBarButtonItem(image: newImage, landscapeImagePhone: nil, style: .plain, target: self, action: #selector(didPressNewChat))
     
+        newButton.tintColor = Constants.primaryColor
         navigationItem.rightBarButtonItem = newButton
     }
     

deltachat-ios/ChatViewController.swift

@@ -318,7 +318,13 @@ extension ChatViewController: MessagesDataSource {
     }
     
     func avatar(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> Avatar {
-        return SampleData.shared.getAvatarFor(sender: message.sender)
+        if let id = Int(messageList[indexPath.section].messageId) {
+            let message = MRMessage(id: id)
+            let contact = message.fromContact
+            return Avatar(image: contact.profileImage, initials: Utils.getInitials(inputName: contact.name))
+        }
+        
+        return Avatar(image: nil, initials: "?")
     }
     
     func cellTopLabelAttributedText(for message: MessageType, at indexPath: IndexPath) -> NSAttributedString? {

deltachat-ios/NavigationController.swift

@@ -17,19 +17,13 @@ final class NavigationController: UINavigationController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        navigationBar.isTranslucent = false
-        navigationBar.tintColor = .white
-        
-        navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white]
        
         if #available(iOS 11.0, *) {
             navigationBar.prefersLargeTitles = true
-            navigationBar.largeTitleTextAttributes = [.foregroundColor: UIColor.white]
-            navigationBar.barTintColor = Constants.primaryColor
         } else {
             navigationBar.setBackgroundImage(UIImage(), for: .default)
         }
-        view.backgroundColor = Constants.primaryColor
+
         self.setShadow(nil)
         
         let nc = NotificationCenter.default
@@ -63,26 +57,4 @@ final class NavigationController: UINavigationController {
             nc.removeObserver(stateChangedObserver)
         }
     }
-    
-    func setAppearanceStyle(to style: UIStatusBarStyle) {
-        self.setShadow(nil)
-        
-        if style == .default {
-            navigationBar.tintColor = .white
-            navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white]
-            if #available(iOS 11.0, *) {
-                navigationBar.prefersLargeTitles = true
-                navigationBar.largeTitleTextAttributes = [.foregroundColor: UIColor.white]
-                navigationBar.barTintColor = Constants.primaryColor
-            }
-        } else if style == .lightContent {
-            navigationBar.tintColor = UIColor(red: 0, green: 0.5, blue: 1, alpha: 1)
-            navigationBar.titleTextAttributes = [.foregroundColor: UIColor.black]
-            if #available(iOS 11.0, *) {
-                navigationBar.prefersLargeTitles = true
-                navigationBar.largeTitleTextAttributes = [.foregroundColor: UIColor.black]
-                navigationBar.barTintColor = .white
-            }
-        }
-    }
 }

deltachat-ios/SampleData.swift

@@ -1,200 +0,0 @@
-/*
- MIT License
- 
- Copyright (c) 2017 MessageKit
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
- */
-
-import MessageKit
-import CoreLocation
-
-final class SampleData {
-    
-    static let shared = SampleData()
-    
-    private init() {}
-    
-    let messageTextValues = [
-        "Ok",
-        "k",
-        "lol",
-        "1-800-555-0000",
-        "One Infinite Loop Cupertino, CA 95014 This is some extra text that should not be detected.",
-        "This is an example of the date detector 11/11/2017. April 1st is April Fools Day. Next Friday is not Friday the 13th.",
-        "https://github.com/SD10",
-        "Check out this awesome UI library for Chat",
-        "My favorite things in life don’t cost any money. It’s really clear that the most precious resource we all have is time.",
-        """
-            You know, this iPhone, as a matter of fact, the engine in here is made in America.
-            And not only are the engines in here made in America, but engines are made in America and are exported.
-            The glass on this phone is made in Kentucky. And so we've been working for years on doing more and more in the United States.
-            """,
-        """
-            Remembering that I'll be dead soon is the most important tool I've ever encountered to help me make the big choices in life.
-            Because almost everything - all external expectations, all pride, all fear of embarrassment or failure -
-            these things just fall away in the face of death, leaving only what is truly important.
-            """,
-        "I think if you do something and it turns out pretty good, then you should go do something else wonderful, not dwell on it for too long. Just figure out what’s next.",
-        "Price is rarely the most important thing. A cheap product might sell some units. Somebody gets it home and they feel great when they pay the money, but then they get it home and use it and the joy is gone."
-    ]
-    
-    let dan = Sender(id: "123456", displayName: "Dan Leonard")
-    let steven = Sender(id: "654321", displayName: "Steven")
-    let jobs = Sender(id: "000001", displayName: "Steve Jobs")
-    let cook = Sender(id: "656361", displayName: "Tim Cook")
-    
-    lazy var senders = [dan, steven, jobs, cook]
-    
-    var currentSender: Sender {
-        return steven
-    }
-    
-    let messageImages: [UIImage] = [#imageLiteral(resourceName: "ic_block_36pt")]
-    
-    var now = Date()
-    
-    let messageTypes = ["Text", "Text", "Text", "AttributedText", "Photo", "Video", "Location", "Emoji"]
-    
-    let attributes = ["Font1", "Font2", "Font3", "Font4", "Color", "Combo"]
-    
-    let locations: [CLLocation] = [
-        CLLocation(latitude: 37.3118, longitude: -122.0312),
-        CLLocation(latitude: 33.6318, longitude: -100.0386),
-        CLLocation(latitude: 29.3358, longitude: -108.8311),
-        CLLocation(latitude: 39.3218, longitude: -127.4312),
-        CLLocation(latitude: 35.3218, longitude: -127.4314),
-        CLLocation(latitude: 39.3218, longitude: -113.3317)
-    ]
-    
-    let emojis = [
-        "👍",
-        "👋",
-        "👋👋👋",
-        "😱😱",
-        "🎈",
-        "🇧🇷"
-    ]
-    
-    func attributedString(with text: String) -> NSAttributedString {
-        let nsString = NSString(string: text)
-        var mutableAttributedString = NSMutableAttributedString(string: text)
-        let randomAttribute = Int(arc4random_uniform(UInt32(attributes.count)))
-        let range = NSRange(location: 0, length: nsString.length)
-        
-        switch attributes[randomAttribute] {
-        case "Font1":
-            mutableAttributedString.addAttribute(NSAttributedString.Key.font, value: UIFont.preferredFont(forTextStyle: .body), range: range)
-        case "Font2":
-            mutableAttributedString.addAttributes([NSAttributedString.Key.font: UIFont.monospacedDigitSystemFont(ofSize: UIFont.systemFontSize, weight: UIFont.Weight.bold)], range: range)
-        case "Font3":
-            mutableAttributedString.addAttributes([NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize)], range: range)
-        case "Font4":
-            mutableAttributedString.addAttributes([NSAttributedString.Key.font: UIFont.italicSystemFont(ofSize: UIFont.systemFontSize)], range: range)
-        case "Color":
-            mutableAttributedString.addAttributes([NSAttributedString.Key.foregroundColor: UIColor.red], range: range)
-        case "Combo":
-            let msg9String = "Use .attributedText() to add bold, italic, colored text and more..."
-            let msg9Text = NSString(string: msg9String)
-            let msg9AttributedText = NSMutableAttributedString(string: String(msg9Text))
-            
-            msg9AttributedText.addAttribute(NSAttributedString.Key.font, value: UIFont.preferredFont(forTextStyle: .body), range: NSRange(location: 0, length: msg9Text.length))
-            msg9AttributedText.addAttributes([NSAttributedString.Key.font: UIFont.monospacedDigitSystemFont(ofSize: UIFont.systemFontSize, weight: UIFont.Weight.bold)], range: msg9Text.range(of: ".attributedText()"))
-            msg9AttributedText.addAttributes([NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize)], range: msg9Text.range(of: "bold"))
-            msg9AttributedText.addAttributes([NSAttributedString.Key.font: UIFont.italicSystemFont(ofSize: UIFont.systemFontSize)], range: msg9Text.range(of: "italic"))
-            msg9AttributedText.addAttributes([NSAttributedString.Key.foregroundColor: UIColor.red], range: msg9Text.range(of: "colored"))
-            mutableAttributedString = msg9AttributedText
-        default:
-            fatalError("Unrecognized attribute for mock message")
-        }
-        
-        return NSAttributedString(attributedString: mutableAttributedString)
-    }
-    
-    func dateAddingRandomTime() -> Date {
-        let randomNumber = Int(arc4random_uniform(UInt32(10)))
-        if randomNumber % 2 == 0 {
-            let date = Calendar.current.date(byAdding: .hour, value: randomNumber, to: now)!
-            now = date
-            return date
-        } else {
-            let randomMinute = Int(arc4random_uniform(UInt32(59)))
-            let date = Calendar.current.date(byAdding: .minute, value: randomMinute, to: now)!
-            now = date
-            return date
-        }
-    }
-    
-    func randomMessage() -> Message {
-        let randomNumberSender = Int(arc4random_uniform(UInt32(senders.count)))
-        let randomNumberText = Int(arc4random_uniform(UInt32(messageTextValues.count)))
-        let randomNumberImage = Int(arc4random_uniform(UInt32(messageImages.count)))
-        let randomMessageType = Int(arc4random_uniform(UInt32(messageTypes.count)))
-        let randomNumberLocation = Int(arc4random_uniform(UInt32(locations.count)))
-        let randomNumberEmoji = Int(arc4random_uniform(UInt32(emojis.count)))
-        let uniqueID = NSUUID().uuidString
-        let sender = senders[randomNumberSender]
-        let date = dateAddingRandomTime()
-        
-        switch messageTypes[randomMessageType] {
-        case "Text":
-            return Message(text: messageTextValues[randomNumberText], sender: sender, messageId: uniqueID, date: date)
-        case "AttributedText":
-            let attributedText = attributedString(with: messageTextValues[randomNumberText])
-            return Message(attributedText: attributedText, sender: senders[randomNumberSender], messageId: uniqueID, date: date)
-        case "Photo":
-            let image = messageImages[randomNumberImage]
-            return Message(image: image, sender: sender, messageId: uniqueID, date: date)
-        case "Video":
-            let image = messageImages[randomNumberImage]
-            return Message(thumbnail: image, sender: sender, messageId: uniqueID, date: date)
-        case "Location":
-            return Message(location: locations[randomNumberLocation], sender: sender, messageId: uniqueID, date: date)
-        case "Emoji":
-            return Message(emoji: emojis[randomNumberEmoji], sender: sender, messageId: uniqueID, date: date)
-        default:
-            fatalError("Unrecognized mock message type")
-        }
-    }
-    
-    func getMessages(count: Int, completion: ([Message]) -> Void) {
-        var messages: [Message] = []
-        for _ in 0..<count {
-            messages.append(randomMessage())
-        }
-        completion(messages)
-    }
-    
-    func getAvatarFor(sender: Sender) -> Avatar {
-        switch sender {
-        case dan:
-            return Avatar(image: #imageLiteral(resourceName: "ic_people_36pt").withRenderingMode(.alwaysTemplate), initials: "DL")
-        case steven:
-            return Avatar(initials: "S")
-        case jobs:
-            return Avatar(image: #imageLiteral(resourceName: "ic_people_36pt").withRenderingMode(.alwaysTemplate), initials: "SJ")
-        case cook:
-            return Avatar(image: #imageLiteral(resourceName: "ic_people_36pt").withRenderingMode(.alwaysTemplate))
-        default:
-            return Avatar()
-        }
-    }
-    
-}
-

deltachat-ios/SettingsController.swift

@@ -14,6 +14,8 @@ import JGProgressHUD
 
 final internal class SettingsViewController: QuickTableViewController {
     let documentInteractionController = UIDocumentInteractionController()
+    var backupProgressObserver: Any?
+    var backupHud: JGProgressHUD?
 
     // MARK: - Properties
 
@@ -28,9 +30,85 @@ final internal class SettingsViewController: QuickTableViewController {
         title = "Settings"
 
         documentInteractionController.delegate = self as? UIDocumentInteractionControllerDelegate
+        
+        
         setTable()
     }
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        let nc = NotificationCenter.default
+        backupProgressObserver = nc.addObserver(
+            forName: dc_notificationBackupProgress,
+            object: nil,
+            queue: nil) {
+                notification in
+                if let ui = notification.userInfo {
+                    if ui["error"] as! Bool {
+                        self.setHudError()
+                    } else if ui["done"] as! Bool {
+                        self.setHudDone()
+                    } else {
+                        self.setHudProgress(ui["progress"] as! Int)
+                    }
+                }
+            }
+    }
 
+    private func setHudError() {
+        if let hud = self.backupHud {
+            DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(500)) {
+                UIView.animate(withDuration: 0.1, animations: {
+                    hud.textLabel.text = "Error"
+                    hud.detailTextLabel.text = nil
+                    hud.indicatorView = JGProgressHUDErrorIndicatorView()
+                })
+                
+                hud.dismiss(afterDelay: 1.0)
+            }
+        }
+    }
+    
+    private func setHudDone() {
+        if let hud = self.backupHud {
+            DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(500)) {
+                UIView.animate(withDuration: 0.1, animations: {
+                    hud.textLabel.text = "Success"
+                    hud.detailTextLabel.text = nil
+                        hud.indicatorView = JGProgressHUDSuccessIndicatorView()
+                })
+
+                hud.dismiss(afterDelay: 1.0)
+            }
+        }
+    }
+    
+    private func setHudProgress(_ progress: Int) {
+        if let hud = self.backupHud {
+            hud.progress = Float(progress)/1000.0
+            hud.detailTextLabel.text = "\(progress/10)% Complete"
+        }
+    }
+    
+    private func showBackupHud() {
+        let hud = JGProgressHUD(style: .dark)
+        hud.vibrancyEnabled = true
+        hud.indicatorView = JGProgressHUDPieIndicatorView()
+
+        hud.detailTextLabel.text = "0% Complete"
+        hud.textLabel.text = "Creating Backup"
+        hud.show(in: self.view)
+        
+        backupHud = hud
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        
+        let nc = NotificationCenter.default
+        if let backupProgressObserver = self.backupProgressObserver {
+            nc.removeObserver(backupProgressObserver)
+        }
+    }
     private func setTable() {
         tableContents = [
           Section(
@@ -189,13 +267,7 @@ final internal class SettingsViewController: QuickTableViewController {
         if let documents = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.delta.chat.ios")?.path {
             print("create backup in", documents)
             dc_imex(mailboxPointer, DC_IMEX_EXPORT_BACKUP, documents, nil)
-
-            let hud = JGProgressHUD(style: .dark)
-            hud.textLabel.text = "Creating Backup"
-            hud.show(in: self.view)
-
-            // TODO: dismiss when actually done
-            hud.dismiss(afterDelay: 2.0)
+            showBackupHud()
         }
     }
 
@@ -211,15 +283,14 @@ final internal class SettingsViewController: QuickTableViewController {
                 guard mailboxPointer != nil else {
                     fatalError("Error: dc_context_new returned nil")
                 }
-
-                dc_imex(mailboxPointer, DC_IMEX_IMPORT_BACKUP, file, nil)
-
+                
                 let hud = JGProgressHUD(style: .dark)
                 hud.textLabel.text = "Restoring Backup"
                 hud.show(in: self.view)
+                
+                dc_imex(mailboxPointer, DC_IMEX_IMPORT_BACKUP, file, nil)
 
-                // TODO: dismiss when actually done
-                hud.dismiss(afterDelay: 2.0)
+                hud.dismiss(afterDelay: 1.0)
             } else {
                 let alert = UIAlertController(title: "Can not restore", message: "No Backup found", preferredStyle: .alert)
                 self.present(alert, animated: true, completion: nil)

deltachat-ios/deltachat-ios.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>development</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.delta.chat.ios</string>