narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

UP: null check transport verification

Browse source
This commit is contained in:
Daniel Gultsch 2023-01-10 17:22:48 +01:00
parent 0923440936
commit 41cd96e37b
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/services/UnifiedPushBroker.java
View file

@ -6,19 +6,10 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
@ -29,6 +20,12 @@ import eu.siacs.conversations.xml.Namespace;
import eu.siacs.conversations.xmpp.Jid; import eu.siacs.conversations.xmpp.Jid;
import eu.siacs.conversations.xmpp.stanzas.IqPacket; import eu.siacs.conversations.xmpp.stanzas.IqPacket;
import eu.siacs.conversations.xmpp.stanzas.PresencePacket; import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
public class UnifiedPushBroker { public class UnifiedPushBroker {
@ -278,6 +275,9 @@ public class UnifiedPushBroker {
final Jid transport, final Jid transport,
final String application, final String application,
final String instance) { final String instance) {
if (transport == null || application == null || instance == null) {
return Optional.absent();
}
final String uuid = account.getUuid(); final String uuid = account.getUuid();
final List<UnifiedPushDatabase.PushTarget> pushTargets = final List<UnifiedPushDatabase.PushTarget> pushTargets =
UnifiedPushDatabase.getInstance(service) UnifiedPushDatabase.getInstance(service)