Merge branch 'release/0.3.11'

Author: RealBonus

Adamant.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		4411402421C8B290703B13EB /* Pods_Adamant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C107D5CB65B4D728B9D97C0F /* Pods_Adamant.framework */; };
+		64D059FF20D3116B003AD655 /* NodesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D059FE20D3116A003AD655 /* NodesListViewController.swift */; };
 		E905D39B2048A9BD00DDB504 /* KeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E905D39A2048A9BD00DDB504 /* KeychainStore.swift */; };
 		E905D39D204C13B900DDB504 /* SecuredStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E905D39C204C13B900DDB504 /* SecuredStore.swift */; };
 		E905D39F204C281400DDB504 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E905D39E204C281400DDB504 /* LoginViewController.swift */; };
@@ -179,6 +180,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		64D059FE20D3116A003AD655 /* NodesListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodesListViewController.swift; sourceTree = "<group>"; };
 		871009461457F6B7B47D99C5 /* Pods-Adamant.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Adamant.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Adamant/Pods-Adamant.debug.xcconfig"; sourceTree = "<group>"; };
 		903AC078A8A55175A05E42D4 /* Pods-Adamant.testing.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Adamant.testing.xcconfig"; path = "Pods/Target Support Files/Pods-Adamant/Pods-Adamant.testing.xcconfig"; sourceTree = "<group>"; };
 		C107D5CB65B4D728B9D97C0F /* Pods_Adamant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Adamant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -193,6 +195,9 @@
 		E90A4944204C5F60009F6A65 /* PassphraseCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PassphraseCell.xib; sourceTree = "<group>"; };
 		E90A494A204D9EB8009F6A65 /* AdamantAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantAuthentication.swift; sourceTree = "<group>"; };
 		E90A494C204DA932009F6A65 /* LocalAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAuthentication.swift; sourceTree = "<group>"; };
+		E91319F820CEC4E100192A18 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		E91319F920CEC4E200192A18 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E91319FA20CEC4E200192A18 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E913C8EE1FFFA51D001A83F7 /* Adamant.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Adamant.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E913C8F11FFFA51D001A83F7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E913C8F81FFFA51D001A83F7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -647,6 +652,7 @@
 				E982F69B20235B4D00566AC7 /* SettingsViewController.swift */,
 				E93D7AC12052EE21005D19DC /* SettingsViewController+StayIn.swift */,
 				E9942B7F203C058C00C163AF /* QRGeneratorViewController.swift */,
+				64D059FE20D3116A003AD655 /* NodesListViewController.swift */,
 				E91A0639209F05AA0018A102 /* NotificationsViewController.swift */,
 			);
 			path = Settings;
@@ -839,6 +845,7 @@
 			knownRegions = (
 				en,
 				ru,
+				de,
 			);
 			mainGroup = E913C8E51FFFA51D001A83F7;
 			productRefGroup = E913C8EF1FFFA51D001A83F7 /* Products */;
@@ -1086,6 +1093,7 @@
 				E91947AC20001A9A001362F8 /* ApiService.swift in Sources */,
 				E9150B9F2066DA210065A985 /* MessageTransaction+CoreDataClass.swift in Sources */,
 				E965A53020B594120041A3EA /* AdamantApi+States.swift in Sources */,
+				64D059FF20D3116B003AD655 /* NodesListViewController.swift in Sources */,
 				E9150B982066DA210065A985 /* CoreDataAccount+CoreDataProperties.swift in Sources */,
 				E9B3D3A1201FA26B0019EB36 /* AdamantAccountsProvider.swift in Sources */,
 				E9FAE5DA203DBFEF008D3A6B /* Comparable+clamped.swift in Sources */,
@@ -1154,6 +1162,7 @@
 			children = (
 				E95CB452205D77B200A7218E /* en */,
 				E95CB45A205D77DD00A7218E /* ru */,
+				E91319FA20CEC4E200192A18 /* de */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1163,6 +1172,7 @@
 			children = (
 				E95CB457205D77B500A7218E /* en */,
 				E95CB459205D77DC00A7218E /* ru */,
+				E91319F920CEC4E200192A18 /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1172,6 +1182,7 @@
 			children = (
 				E95CB45F205D7F9600A7218E /* en */,
 				E95CB461205D7FD000A7218E /* ru */,
+				E91319F820CEC4E100192A18 /* de */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";

Adamant/AppDelegate.swift

@@ -332,20 +332,20 @@ extension AppDelegate {
 		}
 
 		if let welcome = AdamantContacts.adamantBountyWallet.messages["chats.welcome_message"] {
-			chatProvider.fakeReceived(message: welcome,
+			chatProvider.fakeReceived(message: welcome.message,
 									  senderId: AdamantContacts.adamantBountyWallet.name,
 									  date: Date.adamantNullDate,
 									  unread: unread,
-									  silent: true,
+									  silent: welcome.silentNotification,
 									  completion: { _ in })
 		}
 
 		if let ico = AdamantContacts.adamantIco.messages["chats.ico_message"] {
-			chatProvider.fakeReceived(message: ico,
+			chatProvider.fakeReceived(message: ico.message,
 									  senderId: AdamantContacts.adamantIco.name,
 									  date: Date.adamantNullDate,
 									  unread: unread,
-									  silent: true,
+									  silent: ico.silentNotification,
 									  completion: { _ in })
 		}
 	}

Adamant/Assets/l18n/de.lproj/InfoPlist.strings

@@ -0,0 +1,18 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "Adamant";
+
+/* Bundle name */
+"CFBundleName" = "Adamant";
+
+/* Privacy - Camera Usage Description */
+"NSCameraUsageDescription" = "The camera needed to scan QR codes for addresses and passphrases";
+
+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "Sign In into your ADAMANT with Face ID";
+
+/* Privacy - Photo Library Additions Usage Description */
+"NSPhotoLibraryAddUsageDescription" = "Saving generated QR codes with passphrases and addresses";
+
+/* Privacy - Photo Library Usage Description */
+"NSPhotoLibraryUsageDescription" = "Reading QR codes with passphrases and addresses";
+