Merge tag '2.18.0.7'

8 years ago · 4037e2ee39
parent ef80b53ff8 6037477c46
commit 4037e2ee39
2 changed files with 2 additions and 2 deletions
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@ -55,7 +55,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.18.0.6</string>
+	<string>2.18.0.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>
--- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
+++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
@ -421,7 +421,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
        // Do progressive search after a delay.
        progressiveSearchTimer?.invalidate()
        progressiveSearchTimer = nil
-        let kProgressiveSearchDelaySeconds = 2.0
+        let kProgressiveSearchDelaySeconds = 1.0
        progressiveSearchTimer = WeakTimer.scheduledTimer(timeInterval: kProgressiveSearchDelaySeconds, target: self, userInfo: nil, repeats: true) { [weak self] _ in
            guard let strongSelf = self else {
                return