Kaynağa Gözat

Merge pull request #109 from deltachat/accountSetupFixes

Account setup fixes
nayooti 6 yıl önce
ebeveyn
işleme
431818edb9

+ 3 - 2
deltachat-ios/Controller/AccountSetupController.swift

@@ -332,6 +332,7 @@ class AccountSetupController: UITableViewController {
 		} else {
 			tableView.deleteRows(at: advancedIndexPaths, with: .fade)
 		}
+		tableView.reloadData() // to re-organize footer view (without that sometimes advanced section footer is still visible)
 	}
 
 	@objc private func loginButtonPressed() {
@@ -348,10 +349,12 @@ class AccountSetupController: UITableViewController {
 		}
 
 		let password = passwordCell.getText() ?? "" // empty passwords are ok -> for oauth there is no password needed
+
 		login(emailAddress: emailAddress, password: password)
 	}
 
 	private func login(emailAddress: String, password: String, skipAdvanceSetup: Bool = false) {
+		resignFirstResponderOnAllCells()	// this will resign focus from all textFieldCells so the keyboard wont pop up anymore
 		MRConfig.addr = emailAddress
 		MRConfig.mailPw = password
 
@@ -456,10 +459,8 @@ class AccountSetupController: UITableViewController {
 					// self.hudHandler.setHudError(ui["errorMessage"] as? String)
 				} else if ui["done"] as! Bool {
 					self.updateProgressHudSuccess(callback: self.handleLoginSuccess)
-					// self.hudHandler.setHudDone(callback: self.handleLoginSuccess)
 				} else {
 					self.updateProgressHudValue(value: ui["progress"] as! Int)
-					// self.hudHandler.setHudProgress(ui["progress"] as! Int)
 				}
 			}
 		}

+ 3 - 5
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -419,11 +419,9 @@ class ChatViewCoordinator: Coordinator {
 				DispatchQueue.global().async {
 					if let compressedImage = image?.dcCompress() {
 						// at this point image is compressed by 85% by default
-//						let pixelSize = compressedImage.imageSizeInPixel()
-//						let width = Int32(exactly: pixelSize.width)!
-//						let height =  Int32(exactly: pixelSize.height)!
-						let width = Int32(exactly: compressedImage.size.width)!
-						let height = Int32(exactly: compressedImage.size.height)!
+						let pixelSize = compressedImage.imageSizeInPixel()
+						let width = Int32(exactly: pixelSize.width)!
+						let height =  Int32(exactly: pixelSize.height)!
 						let path = Utils.saveImage(image: compressedImage)
 						let msg = dc_msg_new(mailboxPointer, DC_MSG_IMAGE)
 						dc_msg_set_file(msg, path, "image/jpeg")