diff options
7 files changed, 8 insertions, 30 deletions
diff --git a/art/play_gif.svg b/art/play_gif.svg index 47f5cc24d..7315ba4f3 100644 --- a/art/play_gif.svg +++ b/art/play_gif.svg @@ -1,20 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="24" - height="24" - viewBox="0 0 24 24" - id="svg2" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="play_gif.svg"> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" viewBox="0 0 24 24" + id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="play_gif.svg"> <metadata id="metadata14"> <rdf:RDF> diff --git a/libs/android-transcoder/src/main/AndroidManifest.xml b/libs/android-transcoder/src/main/AndroidManifest.xml index 0bfa93402..8f4da3821 100644 --- a/libs/android-transcoder/src/main/AndroidManifest.xml +++ b/libs/android-transcoder/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="net.ypresto.androidtranscoder"> +<manifest package="net.ypresto.androidtranscoder"> <application /> diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 6cfef225b..f2f8a1ba5 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -49,11 +49,7 @@ import org.openintents.openpgp.util.OpenPgpServiceConnection; import java.io.FileDescriptor; import java.io.FileNotFoundException; -import java.io.IOException; import java.math.BigInteger; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketAddress; import java.net.URL; import java.security.SecureRandom; import java.security.cert.CertificateException; @@ -118,13 +114,12 @@ import de.pixart.messenger.utils.ConversationsFileObserver; import de.pixart.messenger.utils.CryptoHelper; import de.pixart.messenger.utils.ExceptionHelper; import de.pixart.messenger.utils.MimeUtils; +import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.utils.OnPhoneContactsLoadedListener; import de.pixart.messenger.utils.PRNGFixes; import de.pixart.messenger.utils.PhoneHelper; import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor; import de.pixart.messenger.utils.SerialSingleThreadExecutor; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.SocksSocketFactory; import de.pixart.messenger.utils.XmppUri; import de.pixart.messenger.xml.Element; import de.pixart.messenger.xmpp.OnBindListener; diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java index 666e3beba..1d24047de 100644 --- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java +++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java @@ -9,7 +9,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; -import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.ConnectivityManager; @@ -17,7 +16,6 @@ import android.net.NetworkInfo; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.support.v4.app.ActivityCompat; import android.util.Log; import android.view.WindowManager; @@ -33,7 +31,6 @@ import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.persistance.FileBackend; import de.pixart.messenger.services.UpdaterWebService; -import de.pixart.messenger.services.XmppConnectionService; public class UpdaterActivity extends Activity { diff --git a/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java b/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java index 0b4df771f..5ef8d2d25 100644 --- a/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java +++ b/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java @@ -1,8 +1,8 @@ package de.pixart.messenger.utils; import java.util.HashSet; -import java.util.Set; import java.util.List; +import java.util.Set; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.xmpp.jid.InvalidJidException; diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 9e9b6f752..d3132961f 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -68,9 +68,9 @@ import de.pixart.messenger.generator.IqGenerator; import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.ui.EditAccountActivity; import de.pixart.messenger.utils.DNSHelper; +import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.utils.SSLSocketHelper; import de.pixart.messenger.utils.SocksSocketFactory; -import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.xml.Element; import de.pixart.messenger.xml.Tag; import de.pixart.messenger.xml.TagWriter; diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 211f1a2e7..46db51078 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" |
