diff options
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/utils')
3 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java index 7e4a4fc5..663ea5b5 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java @@ -26,6 +26,7 @@ import de.thedevstack.conversationsplus.R; import de.thedevstack.conversationsplus.entities.Message; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; public final class CryptoHelper { public static final String FILETRANSFER = "?FILETRANSFERv1:"; @@ -150,7 +151,7 @@ public final class CryptoHelper { } String name = IETFUtils.valueToString(x500name.getRDNs(BCStyle.CN)[0].getFirst().getValue()); if (emails.size() >= 1) { - return new Pair<>(Jid.fromString(emails.get(0)), name); + return new Pair<>(JidUtil.fromString(emails.get(0)), name); } else { return null; } diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java index 907e7fd7..ac160960 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java @@ -25,7 +25,7 @@ import de.thedevstack.conversationsplus.entities.Message; import de.thedevstack.conversationsplus.services.XmppConnectionService; import de.thedevstack.conversationsplus.ui.ConversationActivity; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; public class ExceptionHelper { public static void init(Context context) { @@ -92,7 +92,7 @@ public class ExceptionHelper { Conversation conversation = null; try { conversation = service.findOrCreateConversation(finalAccount, - Jid.fromString(activity.getString(R.string.cplus_bugreport_jabberid)), false); + JidUtil.fromString(activity.getString(R.string.cplus_bugreport_jabberid)), false); } catch (final InvalidJidException ignored) { } Message message = MessageUtil.createOutgoingMessage(conversation, report.toString()); diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java index 5d3a2694..8d5967b6 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java @@ -7,6 +7,7 @@ import java.net.URLDecoder; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.JidUtil; public class XmppUri { @@ -19,7 +20,7 @@ public class XmppUri { parse(Uri.parse(uri)); } catch (IllegalArgumentException e) { try { - jid = Jid.fromString(uri).toBareJid().toString(); + jid = JidUtil.fromString(uri).toBareJid().toString(); } catch (InvalidJidException e2) { jid = null; } @@ -50,7 +51,7 @@ public class XmppUri { } } else { try { - jid = Jid.fromString(uri.toString()).toBareJid().toString(); + jid = JidUtil.fromString(uri.toString()).toBareJid().toString(); } catch (final InvalidJidException ignored) { jid = null; } @@ -73,7 +74,7 @@ public class XmppUri { public Jid getJid() { try { - return this.jid == null ? null :Jid.fromString(this.jid.toLowerCase()); + return this.jid == null ? null : JidUtil.fromString(this.jid.toLowerCase()); } catch (InvalidJidException e) { return null; } |