Merge branch 'feature/Push' into develop

Author: RealBonus

Adamant/AppDelegate.swift

@@ -19,6 +19,10 @@ extension String.adamantLocalized {
 		static let chats = NSLocalizedString("Tabs.Chats", comment: "Main tab bar: Chats page")
 		static let settings = NSLocalizedString("Tabs.Settings", comment: "Main tab bar: Settings page")
 	}
+	
+	struct application {
+		static let deviceTokenSendFailed = NSLocalizedString("Application.deviceTokenErrorFormat", comment: "Application: Failed to send deviceToken to ANS error format. %@ for error description")
+	}
 }
 
 extension StoreKey {
@@ -44,6 +48,10 @@ struct AdamantResources {
 
 	static let iosAppSupportEmail = "ios@adamant.im"
 
+	// ANS Contact
+	static let ansAddress = "U10629337621822775991"
+	static let ansPublicKey = "188b24bd116a556ac8ba905bbbdaa16e237dfb14269f5a4f9a26be77537d977c"
+	
 	private init() {}
 }
 
@@ -209,6 +217,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 // MARK: - Remote notifications
 extension AppDelegate {
+	private struct RegistrationPayload: Codable {
+		let token: String
+		
+		#if DEBUG
+			let provider: String = "apns-sandbox"
+		#else
+			let provider: String = "apns"
+		#endif
+	}
+	
 	func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
 		guard let address = accountService.account?.address, let keypair = accountService.keypair else {
 			print("Trying to register with no user logged")
@@ -218,7 +236,7 @@ extension AppDelegate {
 
 		let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
 
-		// Checking, if device token had not changed
+		// MARK: 1. Checking, if device token had not changed
 		guard let securedStore = container.resolve(SecuredStore.self) else {
 			fatalError("can't get secured store to get device token hash")
 		}
@@ -231,19 +249,48 @@ extension AppDelegate {
 			securedStore.set(tokenHash, for: StoreKey.application.deviceTokenHash)
 		}
 
-		// Storing new token in blockchain
+		// MARK: 2. Preparing message
+		guard let adamantCore = container.resolve(AdamantCore.self) else {
+			fatalError("Can't get AdamantCore to register device token")
+		}
+		
+		let payload: String
+		do {
+			let data = try JSONEncoder().encode(RegistrationPayload(token: token))
+			payload = String(data: data, encoding: String.Encoding.utf8)!
+		} catch {
+			dialogService.showError(withMessage: "Failed to prepare ANS signal payload", error: error)
+			return
+		}
+		
+		guard let encodedPayload = adamantCore.encodeMessage(payload, recipientPublicKey: AdamantResources.ansPublicKey, privateKey: keypair.privateKey) else {
+			dialogService.showError(withMessage: "Failed to encode ANS signal. Payload: \(payload)", error: nil)
+			return
+		}
+		
+		// MARK: 3. Send signal to ANS
 		guard let apiService = container.resolve(ApiService.self) else {
 			fatalError("can't get api service to register device token")
 		}
 
-		apiService.store(key: "deviceToken", value: token, type: StateType.keyValue, sender: address, keypair: keypair) { [weak self] result in
+		apiService.sendMessage(senderId: address, recipientId: AdamantResources.ansAddress, keypair: keypair, message: encodedPayload.message, type: ChatType.signal, nonce: encodedPayload.nonce) { [unowned self] result in
 			switch result {
 			case .success:
 				return
 
 			case .failure(let error):
-				print("Failed to store device token: \(error)")
-				self?.notificationService?.setNotificationsMode(.disabled, completion: nil)
+				self.notificationService?.setNotificationsMode(.disabled, completion: nil)
+				
+				switch error {
+				case .networkError, .notLogged:
+					self.dialogService.showWarning(withMessage: String.localizedStringWithFormat(String.adamantLocalized.application.deviceTokenSendFailed, error.localized))
+					
+				case .accountNotFound, .serverError:
+					self.dialogService.showError(withMessage: String.localizedStringWithFormat(String.adamantLocalized.application.deviceTokenSendFailed, error.localized), error: error)
+					 
+				case .internalError(let message, _):
+					self.dialogService.showError(withMessage: String.localizedStringWithFormat(String.adamantLocalized.application.deviceTokenSendFailed, message), error: error)
+				}
 			}
 		}
 	}

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

@@ -1,3 +1,6 @@
+/* System accounts: ADAMANT Tokens */
+"Accounts.AdamantTokens" = "ADAMANT Tokens";
+
 /* AccountsProvider: Address not valid error, %@ for address */
 "AccountsProvider.Error.AddressNotValidFormat" = "Ungültige Adresse: %@";
 
@@ -61,8 +64,8 @@
 /* Product name */
 "ADAMANT" = "ADAMANT";
 
-/* ApiService: No connection message. Generally bad network. */
-"ApiService.Error.NoConnection" = "Keine Internetverbindung";
+/* Application: Failed to send deviceToken to ANS error format. %@ for error description */
+"Application.deviceTokenErrorFormat" = "Failed to reginser in ANS: %@";
 
 /* Serious internal error: Failed to build endpoint url */
 "ApiService.InternalError.EndpointBuildFailed" = "Endpoint Build fehlgeschlagen. Bericht senden";
@@ -244,6 +247,9 @@
 /* NodesList: 'Node url' plaseholder */
 "NodesList.NodeUrl" = "Node-URL";
 
+/* Notifications: scene title */
+"Notifications.Title" = "Benachrichtigungen";
+
 /* Notifications: Modes description. Markdown supported. */
 "Notifications.ModesDescription" = "#### Benachrichtigungsmodi\n\n#### Deaktiviert\nKeine Benachrichtigungen.\n\n#### Hintergrundaktualisierung\nIhr Gerät erhält neue Nachrichteninformationen automatisch. Keine externen Aufrufe. Die Hintergrundaktualisierung wird von iOS verwaltet, die Zeit wird vom Betriebssystem bestimmt und ist von vielen Faktoren wie Akkustand, Netzwerkauslastung, Nutzungsmuster abhängig und kann nicht vorhergesagt werden. Es können 20 Minuten, 6 Stunden, oder ein Tag sein. Sie können die App trotzdem öffnen und nachschauen, ob eine Nachricht angekommen ist.\n\n#### Push\nBenachrichtigungen werden auf Ihr Gerät vom ADAMANT Benachrichtigungsservice gesendet. Sie erhalten eine Benachrichtigung umgehend, nachdem die Nachricht versendet und von der Blockchain bestätigt wurde - mit einer kleinen Verzögerung. Jedoch erfordert dieser Modus, dass der Gerätetoken Ihres Geräts in der Servicedatenbank registriert ist. Gerätetokens sind sicher, und diese Option ist zu empfehlen.\n\nSie können mehr über die Geräteregistrierung auf der ADAMANTs Github-Seite nachlesen.";
 

Adamant/Assets/l18n/en.lproj/Localizable.strings

@@ -64,8 +64,8 @@
 /* Product name */
 "ADAMANT" = "ADAMANT";
 
-/* ApiService: No connection message. Generally bad network. */
-"ApiService.Error.NoConnection" = "No connection to the Internet";
+/* Application: Failed to send deviceToken to ANS error format. %@ for error description */
+"Application.deviceTokenErrorFormat" = "Failed to reginser in ANS: %@";
 
 /* Serious internal error: Failed to build endpoint url */
 "ApiService.InternalError.EndpointBuildFailed" = "Endpoint build failed. Report a bug";

Adamant/Assets/l18n/ru.lproj/Localizable.strings

@@ -64,8 +64,8 @@
 /* Product name */
 "ADAMANT" = "АДАМАНТ";
 
-/* ApiService: No connection message. Generally bad network. */
-"ApiService.Error.NoConnection" = "Нет соединения с сетью";
+/* Application: Failed to send deviceToken to ANS error format. %@ for error description */
+"Application.deviceTokenErrorFormat" = "Ошибка регистрации в ANS: %@";
 
 /* Serious internal error: Failed to build endpoint url */
 "ApiService.InternalError.EndpointBuildFailed" = "Ошибка взаимодействия с блокчейном. Сообщите разработчикам";
@@ -337,21 +337,6 @@
 /* Notifications: User has disabled notifications. Head him into settings */
 "NotificationsService.NotificationsDisabled" = "Уведомления отключены. Вы можете включить их в Настройках";
 
-/* Notifications: New message notification title */
-"NotificationsService.NewMessage.Title" = "Новое сообщение";
-
-/* Notifications: New single message notification body */
-"NotificationsService.NewMessage.BodySingle" = "Новое сообщение";
-
-/* Notifications: New transfer transaction title */
-"NotificationsService.NewTransfer.Title" = "Новый перевод";
-
-/* Notifications: New single transfer transaction body */
-"NotificationsService.NewTransfer.BodySingle" = "Новый перевод";
-
-/* Notifications: User has disabled notifications. Head him into settings */
-"NotificationsService.NotificationsDisabled" = "Уведомления отключены. Вы можете включить их в Настройках";
-
 /* Pinpad: Ask user to create new pin */
 "Pinpad.EnterNewPin" = "Введите новый PIN-код";
 

Adamant/Helpers/String+localized.swift

@@ -52,7 +52,7 @@ extension String {
 			}
 
 			static func remoteServerError(message: String) -> String {
-				return String.localizedStringWithFormat(NSLocalizedString("Error.RemoteErrorFormat", comment: "Shared error: Remote error format, %@ for message"), message)
+				return String.localizedStringWithFormat(NSLocalizedString("Error.RemoteServerErrorFormat", comment: "Shared error: Remote error format, %@ for message"), message)
 			}
 		}
 

Adamant/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.12</string>
+	<string>0.4</string>
 	<key>CFBundleVersion</key>
-	<string>32</string>
+	<string>34</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

Adamant/ServiceProtocols/ApiService.swift

@@ -28,8 +28,8 @@ enum ApiServiceError: Error {
 		case .accountNotFound:
 			return String.adamantLocalized.sharedErrors.accountNotFound
 
-		case .serverError(error: let error):
-			return String.localizedStringWithFormat(NSLocalizedString("ApiService.Error.RemoteServerErrorFormat", comment: "ApiService: Remote server returned an error. Using %@ for error description"), error)
+		case .serverError(let error):
+			return String.adamantLocalized.sharedErrors.remoteServerError(message: error)
 
 		case .internalError(let msg, let error):
 			let message: String
@@ -109,5 +109,5 @@ protocol ApiService: class {
 
 	/// Send text message
 	///   - completion: Contains processed transactionId, if success, or AdamantError, if fails.
-	func sendMessage(senderId: String, recipientId: String, keypair: Keypair, message: String, nonce: String, completion: @escaping (ApiServiceResult<UInt64>) -> Void)
+	func sendMessage(senderId: String, recipientId: String, keypair: Keypair, message: String, type: ChatType, nonce: String, completion: @escaping (ApiServiceResult<UInt64>) -> Void)
 }

Adamant/Services/AdamantNotificationService.swift

@@ -89,21 +89,7 @@ extension AdamantNotificationsService {
 			completion?(.success)
 			return
 
-		case .backgroundFetch:
-			authorizeNotifications { [weak self] (success, error) in
-				guard success else {
-					completion?(.denied(error: error))
-					return
-				}
-				
-				AdamantNotificationsService.configureUIApplicationFor(mode: mode)
-				self?.securedStore.set(mode.toRaw(), for: StoreKey.notificationsService.notificationsMode)
-				self?.notificationsMode = mode
-				NotificationCenter.default.post(name: Notification.Name.AdamantNotificationService.notificationsModeChanged, object: self)
-				completion?(.success)
-			}
-			
-		case .push:
+		case .backgroundFetch, .push:
 			authorizeNotifications { [weak self] (success, error) in
 				guard success else {
 					completion?(.denied(error: error))

Adamant/Services/ApiService/AdamantApi+Chats.swift

@@ -52,7 +52,7 @@ extension AdamantApiService {
 		}
 	}
 
-	func sendMessage(senderId: String, recipientId: String, keypair: Keypair, message: String, nonce: String, completion: @escaping (ApiServiceResult<UInt64>) -> Void) {
+	func sendMessage(senderId: String, recipientId: String, keypair: Keypair, message: String, type: ChatType, nonce: String, completion: @escaping (ApiServiceResult<UInt64>) -> Void) {
 		// MARK: 1. Prepare params
 		let params: [String : Any] = [
 			"type": TransactionType.chatMessage.rawValue,
@@ -61,7 +61,7 @@ extension AdamantApiService {
 			"publicKey": keypair.publicKey,
 			"message": message,
 			"own_message": nonce,
-			"message_type": ChatType.message.rawValue
+			"message_type": type.rawValue
 		]
 
 		let headers = [
@@ -112,7 +112,7 @@ extension AdamantApiService {
 						"chat": [
 							"message": message,
 							"own_message": nonce,
-							"type": ChatType.message.rawValue
+							"type": type.rawValue
 						]
 					]
 				]

Adamant/Services/DataProviders/AdamantChatsProvider.swift

@@ -329,11 +329,12 @@ extension AdamantChatsProvider {
 
 
 		// MARK: 3. Create chat transaction
+		let type = ChatType.message
 		let transaction = MessageTransaction(entity: MessageTransaction.entity(), insertInto: privateContext)
 		transaction.date = Date() as NSDate
 		transaction.recipientId = recipientId
 		transaction.senderId = senderId
-		transaction.type = Int16(ChatType.message.rawValue)
+		transaction.type = Int16(type.rawValue)
 		transaction.isOutgoing = true
 		transaction.message = text
 
@@ -368,7 +369,7 @@ extension AdamantChatsProvider {
 
 
 		// MARK: 6. Send
-		sendTransaction(transaction, keypair: keypair, recipientPublicKey: recipientPublicKey) { result in
+		sendTransaction(transaction, type: type, keypair: keypair, recipientPublicKey: recipientPublicKey) { result in
 			switch result {
 			case .success:
 				do {
@@ -436,7 +437,7 @@ extension AdamantChatsProvider {
 
 
 		// MARK: 3. Send
-		sendTransaction(transaction, keypair: keypair, recipientPublicKey: recipientPublicKey) { result in
+		sendTransaction(transaction, type: .message, keypair: keypair, recipientPublicKey: recipientPublicKey) { result in
 			switch result {
 			case .success:
 				do {
@@ -488,7 +489,7 @@ extension AdamantChatsProvider {
 	///
 	/// If success - update transaction's id and add it to unconfirmed transactions.
 	/// If fails - set transaction status to .failed
-	private func sendTransaction(_ transaction: MessageTransaction, keypair: Keypair, recipientPublicKey: String, completion: @escaping (ChatsProviderResult) -> Void) {
+	private func sendTransaction(_ transaction: MessageTransaction, type: ChatType, keypair: Keypair, recipientPublicKey: String, completion: @escaping (ChatsProviderResult) -> Void) {
 		// MARK: 0. Prepare
 		guard let senderId = transaction.senderId,
 			let recipientId = transaction.recipientId else {
@@ -503,7 +504,7 @@ extension AdamantChatsProvider {
 		}
 
 		// MARK: 2. Send
-		apiService.sendMessage(senderId: senderId, recipientId: recipientId, keypair: keypair, message: encodedMessage.message, nonce: encodedMessage.nonce) { result in
+		apiService.sendMessage(senderId: senderId, recipientId: recipientId, keypair: keypair, message: encodedMessage.message, type: type, nonce: encodedMessage.nonce) { result in
 			switch result {
 			case .success(let id):
 				// Update ID with recieved, add to unconfirmed transactions.