fixed some r8 warnings
This commit is contained in:
parent
8a1bdd97e8
commit
2018ae8ba0
|
@ -15,6 +15,8 @@ signing.properties
|
||||||
# Ignore Gradle GUI config
|
# Ignore Gradle GUI config
|
||||||
gradle-app.setting
|
gradle-app.setting
|
||||||
|
|
||||||
|
libs/*.aar
|
||||||
|
|
||||||
# https://github.com/github/gitignore/blob/master/Android.gitignore
|
# https://github.com/github/gitignore/blob/master/Android.gitignore
|
||||||
# Built application files
|
# Built application files
|
||||||
*.apk
|
*.apk
|
||||||
|
|
|
@ -59,7 +59,6 @@ import java.io.Serializable;
|
||||||
* @author Christian Schudt
|
* @author Christian Schudt
|
||||||
* @see <a href="https://tools.ietf.org/html/rfc7622">RFC 7622 - Extensible Messaging and Presence Protocol (XMPP): Address Format</a>
|
* @see <a href="https://tools.ietf.org/html/rfc7622">RFC 7622 - Extensible Messaging and Presence Protocol (XMPP): Address Format</a>
|
||||||
*/
|
*/
|
||||||
@XmlJavaTypeAdapter(JidAdapter.class)
|
|
||||||
public interface Jid extends Comparable<Jid>, Serializable, CharSequence {
|
public interface Jid extends Comparable<Jid>, Serializable, CharSequence {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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<String, Jid> {
|
|
||||||
|
|
||||||
@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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -13,6 +13,10 @@
|
||||||
-keep class org.openintents.openpgp.*
|
-keep class org.openintents.openpgp.*
|
||||||
-keep class org.webrtc.** { *; }
|
-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.mail.**
|
||||||
-dontwarn org.bouncycastle.x509.util.LDAPStoreHelper
|
-dontwarn org.bouncycastle.x509.util.LDAPStoreHelper
|
||||||
-dontwarn org.bouncycastle.jce.provider.X509LDAPCertStoreSpi
|
-dontwarn org.bouncycastle.jce.provider.X509LDAPCertStoreSpi
|
||||||
|
|
Loading…
Reference in New Issue