Merge pull request #369 from RyanRory/PN-fix-step-1

Fix PNs Part 1

src/org/thoughtcrime/securesms/loki/api/BackgroundPollJob.kt

@@ -50,6 +50,8 @@ class BackgroundPollJob private constructor(parameters: Parameters) : BaseJob(pa
             Log.d("Loki", "Performing background poll.")
             val userPublicKey = TextSecurePreferences.getLocalNumber(context)
             val promises = mutableListOf<Promise<Unit, Exception>>()
+            if (!TextSecurePreferences.isUsingFCM(context)) {
+                Log.d("Loki", "Not using FCM, poll for contacts and closed groups.")
                 val promise = SnodeAPI.shared.getMessages(userPublicKey).map { envelopes ->
                     envelopes.forEach {
                         PushContentReceiveJob(context).processEnvelope(SignalServiceEnvelope(it), false)
@@ -57,6 +59,7 @@ class BackgroundPollJob private constructor(parameters: Parameters) : BaseJob(pa
                 }
                 promises.add(promise)
                 promises.addAll(ClosedGroupPoller.shared.pollOnce())
+            }
             val openGroups = DatabaseFactory.getLokiThreadDatabase(context).getAllPublicChats().map { it.value }
             for (openGroup in openGroups) {
                 val poller = PublicChatPoller(context, openGroup)