Merge pull request #4963 from wordpress-mobile/issue/3d-touch-crash

Issue/3d touch crash
wordpress-mobile · Mar 15, 2016 · 01f0401 · 01f0401
2 parents f263100 + b6416c6
commit 01f0401
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/WordPress/Classes/System/3DTouch/WP3DTouchShortcutCreator.swift b/WordPress/Classes/System/3DTouch/WP3DTouchShortcutCreator.swift
@@ -32,7 +32,11 @@ public class WP3DTouchShortcutCreator: NSObject
         }
 
         if loggedIn {
-            createLoggedInShortcuts()
+            if hasBlog() {
+                createLoggedInShortcuts()
+            } else {
+                clearShortcuts()
+            }
         } else {
             createLoggedOutShortcuts()
         }
@@ -99,6 +103,10 @@ public class WP3DTouchShortcutCreator: NSObject
         application.shortcutItems = visibleShortcutArray
     }
 
+    private func clearShortcuts() {
+        application.shortcutItems = nil
+    }
+
     private func createLoggedOutShortcuts() {
         application.shortcutItems = loggedOutShortcutArray()
     }
@@ -122,4 +130,8 @@ public class WP3DTouchShortcutCreator: NSObject
 
         return hasWordPressComAccount() && currentBlog.supports(BlogFeature.Stats)
     }
+
+    private func hasBlog() -> Bool {
+        return blogService.blogCountForAllAccounts() > 0
+    }
 }