From 2018ae8ba0c0ee32c87dc092bfbde4dd1d3e0a3a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 3 May 2020 22:09:31 +0200 Subject: [PATCH] fixed some r8 warnings --- .gitignore | 2 + .../src/main/java/rocks/xmpp/addr/Jid.java | 1 - .../main/java/rocks/xmpp/addr/JidAdapter.java | 53 ------------------- proguard-rules.pro | 4 ++ 4 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 libs/xmpp-addr/src/main/java/rocks/xmpp/addr/JidAdapter.java diff --git a/.gitignore b/.gitignore index 61b8d5fa3..81a24e7f4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ signing.properties # Ignore Gradle GUI config gradle-app.setting +libs/*.aar + # https://github.com/github/gitignore/blob/master/Android.gitignore # Built application files *.apk diff --git a/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/Jid.java b/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/Jid.java index 34c33d93a..4f4b041e7 100644 --- a/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/Jid.java +++ b/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/Jid.java @@ -59,7 +59,6 @@ import java.io.Serializable; * @author Christian Schudt * @see RFC 7622 - Extensible Messaging and Presence Protocol (XMPP): Address Format */ -@XmlJavaTypeAdapter(JidAdapter.class) public interface Jid extends Comparable, Serializable, CharSequence { /** diff --git a/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/JidAdapter.java b/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/JidAdapter.java deleted file mode 100644 index dcd981e68..000000000 --- a/libs/xmpp-addr/src/main/java/rocks/xmpp/addr/JidAdapter.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2014-2016 Christian Schudt - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package rocks.xmpp.addr; - -import javax.xml.bind.annotation.adapters.XmlAdapter; - -/** - * Converts a String representation of a JID to JID object and vice a versa. - */ -final class JidAdapter extends XmlAdapter { - - @Override - public Jid unmarshal(String v) { - if (v != null) { - try { - return Jid.ofEscaped(v); - } catch (Exception e) { - return MalformedJid.of(v, e); - } - } - return null; - } - - @Override - public String marshal(Jid v) { - if (v != null) { - return v.toEscapedString(); - } - return null; - } -} diff --git a/proguard-rules.pro b/proguard-rules.pro index d3ac8f30a..c8b4089c5 100644 --- a/proguard-rules.pro +++ b/proguard-rules.pro @@ -13,6 +13,10 @@ -keep class org.openintents.openpgp.* -keep class org.webrtc.** { *; } +-dontwarn javax.mail.internet.MimeMessage +-dontwarn javax.mail.internet.MimeBodyPart +-dontwarn javax.mail.internet.SharedInputStream +-dontwarn javax.activation.DataContentHandler -dontwarn org.bouncycastle.mail.** -dontwarn org.bouncycastle.x509.util.LDAPStoreHelper -dontwarn org.bouncycastle.jce.provider.X509LDAPCertStoreSpi