Merge branch 'master' of https://github.com/mozilla/firefox-ios

mozilla-mobile · Mar 18, 2015 · e1297e7 · e1297e7
2 parents e0ae07c + 6954410
commit e1297e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Client/Application/AppDelegate.swift b/Client/Application/AppDelegate.swift
@@ -68,11 +68,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             UIApplicationUserDidTakeScreenshotNotification,
             object: nil,
             queue: NSOperationQueue.mainQueue()) { (notification) -> Void in
-                // Render the entire screen into a snapshot to attach to the email
-                let mainScreen = UIScreen.mainScreen()
-                let snapshot = mainScreen.snapshotViewAfterScreenUpdates(true)
-                UIGraphicsBeginImageContext(mainScreen.bounds.size)
-                snapshot.layer.renderInContext(UIGraphicsGetCurrentContext())
+                UIGraphicsBeginImageContext(self.window.bounds.size)
+                self.window.drawViewHierarchyInRect(self.window.bounds, afterScreenUpdates: true)
                 let image = UIGraphicsGetImageFromCurrentImageContext()
                 UIGraphicsEndImageContext()
 

diff --git a/Client/Info.plist b/Client/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationWhenInUseUsageDescription</key>