Merge pull request #477 from jorgeblacio/release_1_1_19

Hirobreak · web-flow · commit 1f2e0cd22fd0 · 2019-08-26T21:01:59.000-05:00
Landscape mode in iPad, also sending device info on contact support links.
diff --git a/NotificationExtension/Info.plist b/NotificationExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.18</string>
+	<string>1.1.19</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/ShareExtension/Info.plist b/ShareExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.18</string>
+	<string>1.1.19</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/iOS-Email-Client/Controllers/Login/NewLoginViewController.swift b/iOS-Email-Client/Controllers/Login/NewLoginViewController.swift
@@ -45,6 +45,11 @@ class NewLoginViewController: UIViewController{
         }
     }
     
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        self.view.setNeedsDisplay()
+    }
+    
     @objc func hideKeyboard(){
         self.usernameTextField.endEditing(true)
     }
@@ -289,7 +294,8 @@ class NewLoginViewController: UIViewController{
     }
     
     @IBAction func didPressContactSupport(sender: Any) {
-        goToUrl(url: "https://criptext.com/\(Env.language)/contact")
+        let appVersionString: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
+        goToUrl(url: "https://criptext.com/\(Env.language)/contact?version=\(appVersionString.trimmed)&device=\(UIDevice.modelName)&os=\(UIDevice.current.systemVersion)".addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
     }
     
     @IBAction func didPressClose(sender: Any) {
diff --git a/iOS-Email-Client/Controllers/Login/SignUpViewController.swift b/iOS-Email-Client/Controllers/Login/SignUpViewController.swift
@@ -81,6 +81,11 @@ class SignUpViewController: UIViewController{
         emailTextField.keyboardToolbar.doneBarButton.setTarget(self, action: #selector(onDonePress(_:)))
     }
     
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        self.view.setNeedsDisplay()
+    }
+    
     func supportButtonInit(){
         let boldText  = String.localize("CONTACT_SUPPORT")
         let attrs = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 17), NSAttributedString.Key.foregroundColor : UIColor.white]
@@ -139,7 +144,8 @@ class SignUpViewController: UIViewController{
     }
     
     @IBAction func didPressContactSupport(sender: Any) {
-        goToUrl(url: "https://criptext.com/\(Env.language)/contact")
+        let appVersionString: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
+        goToUrl(url: "https://criptext.com/\(Env.language)/contact?version=\(appVersionString)&device=\(UIDevice.modelName)&os=\(UIDevice.current.systemVersion)".addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)
     }
     
     @IBAction func didPressTermsAndConditions(sender: Any) {
diff --git a/iOS-Email-Client/Info.plist b/iOS-Email-Client/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.18</string>
+	<string>1.1.19</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -94,6 +94,8 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
diff --git a/iOS-Email-Client/Managers/DBManager.swift b/iOS-Email-Client/Managers/DBManager.swift
@@ -768,6 +768,13 @@ class DBManager: SharedDB {
                 guard let email = realm.objects(Email.self).filter("key == \(key)").first else {
                     continue
                 }
+                if(addedLabelNames.contains(SystemLabel.spam.nameId)){
+                    let predicate = NSPredicate(format: "email == '\(email.fromContact.email)'")
+                    let contact = realm.objects(Contact.self).filter(predicate).first
+                    if(contact != nil){
+                        contact?.spamScore += 1
+                    }
+                }
                 self.addRemoveLabels(realm: realm, email: email, addedLabelNames: addedLabelNames, removedLabelNames: removedLabelNames)
             }
         }
@@ -781,6 +788,13 @@ class DBManager: SharedDB {
                 let predicate = NSPredicate(format: "threadId == %@", threadId)
                 let emails = realm.objects(Email.self).filter(predicate)
                 for email in emails {
+                    if(addedLabelNames.contains(SystemLabel.spam.nameId)){
+                        let predicate = NSPredicate(format: "email == '\(email.fromContact.email)'")
+                        let contact = realm.objects(Contact.self).filter(predicate).first
+                        if(contact != nil){
+                            contact?.spamScore += 1
+                        }
+                    }
                     self.addRemoveLabels(realm: realm, email: email, addedLabelNames: addedLabelNames, removedLabelNames: removedLabelNames)
                 }
             }
diff --git a/iOS-Email-Client/Shared/NewEmailHandler.swift b/iOS-Email-Client/Shared/NewEmailHandler.swift
@@ -162,6 +162,13 @@ class NewEmailHandler {
                 from = (from.isEmpty ? ContactUtils.parseFromContact(contact: $0, account: myAccount) : "\(from), \(ContactUtils.parseFromContact(contact: $0, account: myAccount))")
             }
             email.fromAddress = from
+            let fromContact = self.database.getContact(ContactUtils.parseContact(from, account: myAccount).email)
+            if(fromContact != nil){
+                if(fromContact?.spamScore ?? 0 >= 2){
+                    let spamLabel = SharedDB.getLabel(SystemLabel.spam.id)
+                    email.labels.append(spamLabel!)
+                }
+            }
             guard self.database.store(email) else {
                 completion(Result(success: true))
                 return
diff --git a/iOS-Email-Client/Snackbar/CriptextSnackbarController.swift b/iOS-Email-Client/Snackbar/CriptextSnackbarController.swift
@@ -72,6 +72,7 @@ class CriptextSnackbarController : SnackbarController {
     }
     
     override func reload() {
+        super.reload()
         customSnackbar.frame.origin.x = snackbarEdgeInsets.left
         customSnackbar.frame.size.width = view.bounds.width - snackbarEdgeInsets.left - snackbarEdgeInsets.right
         rootViewController.view.frame = view.bounds

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ class NewLoginViewController: UIViewController{`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {`
	`49`	`+ super.viewWillTransition(to: size, with: coordinator)`
	`50`	`+ self.view.setNeedsDisplay()`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`@objc func hideKeyboard(){`
`49`	`54`	`self.usernameTextField.endEditing(true)`
`50`	`55`	`}`
`@@ -289,7 +294,8 @@ class NewLoginViewController: UIViewController{`
`289`	`294`	`}`
`290`	`295`
`291`	`296`	`@IBAction func didPressContactSupport(sender: Any) {`
`292`		`- goToUrl(url: "https://criptext.com/\(Env.language)/contact")`
	`297`	`+ let appVersionString: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String`
	`298`	`+ goToUrl(url: "https://criptext.com/\(Env.language)/contact?version=\(appVersionString.trimmed)&device=\(UIDevice.modelName)&os=\(UIDevice.current.systemVersion)".addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)`
`293`	`299`	`}`
`294`	`300`
`295`	`301`	`@IBAction func didPressClose(sender: Any) {`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,11 @@ class SignUpViewController: UIViewController{`
`81`	`81`	`emailTextField.keyboardToolbar.doneBarButton.setTarget(self, action: #selector(onDonePress(_:)))`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {`
	`85`	`+ super.viewWillTransition(to: size, with: coordinator)`
	`86`	`+ self.view.setNeedsDisplay()`
	`87`	`+ }`
	`88`	`+`
`84`	`89`	`func supportButtonInit(){`
`85`	`90`	`let boldText = String.localize("CONTACT_SUPPORT")`
`86`	`91`	`let attrs = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 17), NSAttributedString.Key.foregroundColor : UIColor.white]`
`@@ -139,7 +144,8 @@ class SignUpViewController: UIViewController{`
`139`	`144`	`}`
`140`	`145`
`141`	`146`	`@IBAction func didPressContactSupport(sender: Any) {`
`142`		`- goToUrl(url: "https://criptext.com/\(Env.language)/contact")`
	`147`	`+ let appVersionString: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String`
	`148`	`+ goToUrl(url: "https://criptext.com/\(Env.language)/contact?version=\(appVersionString)&device=\(UIDevice.modelName)&os=\(UIDevice.current.systemVersion)".addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)`
`143`	`149`	`}`
`144`	`150`
`145`	`151`	`@IBAction func didPressTermsAndConditions(sender: Any) {`
Original file line number	Diff line number	Diff line change
`@@ -768,6 +768,13 @@ class DBManager: SharedDB {`
`768`	`768`	`guard let email = realm.objects(Email.self).filter("key == \(key)").first else {`
`769`	`769`	`continue`
`770`	`770`	`}`
	`771`	`+ if(addedLabelNames.contains(SystemLabel.spam.nameId)){`
	`772`	`+ let predicate = NSPredicate(format: "email == '\(email.fromContact.email)'")`
	`773`	`+ let contact = realm.objects(Contact.self).filter(predicate).first`
	`774`	`+ if(contact != nil){`
	`775`	`+ contact?.spamScore += 1`
	`776`	`+ }`
	`777`	`+ }`
`771`	`778`	`self.addRemoveLabels(realm: realm, email: email, addedLabelNames: addedLabelNames, removedLabelNames: removedLabelNames)`
`772`	`779`	`}`
`773`	`780`	`}`
`@@ -781,6 +788,13 @@ class DBManager: SharedDB {`
`781`	`788`	`let predicate = NSPredicate(format: "threadId == %@", threadId)`
`782`	`789`	`let emails = realm.objects(Email.self).filter(predicate)`
`783`	`790`	`for email in emails {`
	`791`	`+ if(addedLabelNames.contains(SystemLabel.spam.nameId)){`
	`792`	`+ let predicate = NSPredicate(format: "email == '\(email.fromContact.email)'")`
	`793`	`+ let contact = realm.objects(Contact.self).filter(predicate).first`
	`794`	`+ if(contact != nil){`
	`795`	`+ contact?.spamScore += 1`
	`796`	`+ }`
	`797`	`+ }`
`784`	`798`	`self.addRemoveLabels(realm: realm, email: email, addedLabelNames: addedLabelNames, removedLabelNames: removedLabelNames)`
`785`	`799`	`}`
`786`	`800`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ class CriptextSnackbarController : SnackbarController {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`override func reload() {`
	`75`	`+ super.reload()`
`75`	`76`	`customSnackbar.frame.origin.x = snackbarEdgeInsets.left`
`76`	`77`	`customSnackbar.frame.size.width = view.bounds.width - snackbarEdgeInsets.left - snackbarEdgeInsets.right`
`77`	`78`	`rootViewController.view.frame = view.bounds`