mirror of
https://codeberg.org/monocles/monocles_chat.git
synced 2025-01-15 14:12:21 +01:00
migrate AppID back to eu.siacs.conversations
In coordination with @iNPUTmice, the AppllicationID is set back to the original one. This restores compatibility for the exchange of commits between Conversations and Pix-Art Messenger. See also #160. Currently it's not possible to use the DirectShare feature. We will look for a possible fix.
This commit is contained in:
Christian Schneppe
parent
bcb16727e1
commit
f8e6ead13f
367 changed files with 2002 additions and 1998 deletions
3
proguard-rules.pro
vendored
3
proguard-rules.pro
vendored
|
|
@ -1,6 +1,7 @@
|
|||
-dontobfuscate
|
||||
|
||||
-keep class de.pixart.messenger.**
|
||||
-keep class eu.siacs.conversations.**
|
||||
-keep class org.whispersystems.**
|
||||
-keep class com.kyleduo.switchbutton.Configuration
|
||||
-keep class com.soundcloud.android.crop.**
|
||||
|
|
@ -24,7 +25,7 @@
|
|||
-dontwarn java.lang.**
|
||||
-dontwarn javax.lang.**
|
||||
|
||||
-keepclassmembers class de.pixart.messenger.http.services.** {
|
||||
-keepclassmembers class eu.siacs.conversations.http.services.** {
|
||||
!transient <fields>;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Build;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
|
||||
public class PushManagementService {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.ui.widget;
|
||||
package eu.siacs.conversations.ui.widget;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package de.pixart.messenger.utils;
|
||||
package eu.siacs.conversations.utils;
|
||||
|
||||
import de.pixart.messenger.ui.MagicCreateActivity;
|
||||
import de.pixart.messenger.ui.WelcomeActivity;
|
||||
import eu.siacs.conversations.ui.MagicCreateActivity;
|
||||
import eu.siacs.conversations.ui.WelcomeActivity;
|
||||
|
||||
public class InstallReferrerUtils {
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="de.pixart.messenger">
|
||||
package="eu.siacs.conversations">
|
||||
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
<receiver android:name=".services.AlarmReceiver"></receiver>
|
||||
|
||||
<activity
|
||||
android:name=".ui.StartUI"
|
||||
android:name="de.pixart.messenger.ui.StartUI"
|
||||
android:configChanges="orientation|screenSize"
|
||||
android:label="@string/app_name"
|
||||
android:launchMode="singleTask"
|
||||
|
|
|
|||
|
|
@ -16,9 +16,10 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.ui.util.IntroHelper;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.ui.ConversationsActivity;
|
||||
import eu.siacs.conversations.ui.util.IntroHelper;
|
||||
import pub.devrel.easypermissions.AfterPermissionGranted;
|
||||
import pub.devrel.easypermissions.EasyPermissions;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
package de.pixart.messenger.xmpp;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
|
||||
public interface OnBindListener {
|
||||
public void onBind(Account account);
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
package de.pixart.messenger.xmpp;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
|
||||
public interface OnIqPacketReceived extends PacketReceived {
|
||||
void onIqPacketReceived(Account account, IqPacket packet);
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
package de.pixart.messenger.xmpp.jingle;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xmpp.PacketReceived;
|
||||
import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
|
||||
|
||||
public interface OnJinglePacketReceived extends PacketReceived {
|
||||
void onJinglePacketReceived(Account account, JinglePacket packet);
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
package de.pixart.messenger.xmpp.jingle;
|
||||
|
||||
public enum Transport {
|
||||
SOCKS, IBB
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package de.pixart.messenger;
|
||||
package eu.siacs.conversations;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public final class Config {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.android;
|
||||
package eu.siacs.conversations.android;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.android;
|
||||
package eu.siacs.conversations.android;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.Context;
|
||||
|
|
@ -12,7 +12,7 @@ import java.util.Collections;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import eu.siacs.conversations.Config;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class JabberIdContact extends AbstractPhoneContact {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto;
|
||||
package eu.siacs.conversations.crypto;
|
||||
|
||||
import javax.net.ssl.HostnameVerifier;
|
||||
import javax.net.ssl.SSLSession;
|
||||
|
|
@ -26,15 +26,15 @@
|
|||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package de.pixart.messenger.crypto;
|
||||
package eu.siacs.conversations.crypto;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.preference.PreferenceManager;
|
||||
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.ui.SettingsActivity;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.ui.SettingsActivity;
|
||||
|
||||
public class OmemoSetting {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto;
|
||||
package eu.siacs.conversations.crypto;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -26,14 +26,14 @@ import java.security.spec.DSAPrivateKeySpec;
|
|||
import java.security.spec.DSAPublicKeySpec;
|
||||
import java.security.spec.InvalidKeySpecException;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.generator.MessageGenerator;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.xmpp.chatstate.ChatState;
|
||||
import de.pixart.messenger.xmpp.jid.OtrJidHelper;
|
||||
import de.pixart.messenger.xmpp.stanzas.MessagePacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.generator.MessageGenerator;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.jid.OtrJidHelper;
|
||||
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto;
|
||||
package eu.siacs.conversations.crypto;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.content.Intent;
|
||||
|
|
@ -19,13 +19,13 @@ import java.util.ArrayDeque;
|
|||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.http.HttpConnectionManager;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.MimeUtils;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.http.HttpConnectionManager;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.MimeUtils;
|
||||
|
||||
public class PgpDecryptionService {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto;
|
||||
package eu.siacs.conversations.crypto;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.content.Intent;
|
||||
|
|
@ -19,16 +19,16 @@ import java.io.IOException;
|
|||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.persistance.FileBackend;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.ui.UiCallback;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.ui.UiCallback;
|
||||
|
||||
public class PgpEngine {
|
||||
private OpenPgpApi api;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto;
|
||||
package eu.siacs.conversations.crypto;
|
||||
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.security.KeyChain;
|
||||
|
|
@ -39,21 +39,21 @@ import java.util.Random;
|
|||
import java.util.Set;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.parser.IqParser;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.SerialSingleThreadExecutor;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded;
|
||||
import de.pixart.messenger.xmpp.OnIqPacketReceived;
|
||||
import de.pixart.messenger.xmpp.pep.PublishOptions;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import de.pixart.messenger.xmpp.stanzas.MessagePacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.parser.IqParser;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded;
|
||||
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
|
||||
import eu.siacs.conversations.xmpp.pep.PublishOptions;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
import org.whispersystems.libsignal.SignalProtocolAddress;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
public class CryptoFailedException extends Exception {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
public class NoSessionsCreatedException extends Throwable {
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
public class NotEncryptedForThisDeviceException extends CryptoFailedException {
|
||||
public NotEncryptedForThisDeviceException() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
public interface OnMessageCreatedCallback {
|
||||
void run(XmppAxolotlMessage message);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
public class OutdatedSenderException extends CryptoFailedException {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
import android.util.Log;
|
||||
import android.util.LruCache;
|
||||
|
|
@ -20,10 +20,10 @@ import java.util.HashSet;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
|
||||
public class SQLiteAxolotlStore implements SignalProtocolStore {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
import android.util.Base64;
|
||||
import android.util.Log;
|
||||
|
|
@ -20,9 +20,9 @@ import javax.crypto.SecretKey;
|
|||
import javax.crypto.spec.IvParameterSpec;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class XmppAxolotlMessage {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.axolotl;
|
||||
package eu.siacs.conversations.crypto.axolotl;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -24,9 +24,9 @@ import org.whispersystems.libsignal.util.guava.Optional;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
|
||||
public class XmppAxolotlSession implements Comparable<XmppAxolotlSession> {
|
||||
private final SessionCipher cipher;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public class Anonymous extends SaslMechanism {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import android.util.Base64;
|
||||
|
||||
|
|
@ -7,9 +7,9 @@ import java.security.MessageDigest;
|
|||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public class DigestMd5 extends SaslMechanism {
|
||||
public DigestMd5(final TagWriter tagWriter, final Account account, final SecureRandom rng) {
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import android.util.Base64;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public class External extends SaslMechanism {
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import android.util.Base64;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public class Plain extends SaslMechanism {
|
||||
public Plain(final TagWriter tagWriter, final Account account) {
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public abstract class SaslMechanism {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
|
|
@ -14,9 +14,9 @@ import java.nio.charset.Charset;
|
|||
import java.security.InvalidKeyException;
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
|
||||
abstract class ScramMechanism extends SaslMechanism {
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import org.bouncycastle.crypto.digests.SHA1Digest;
|
||||
import org.bouncycastle.crypto.macs.HMac;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public class ScramSha1 extends ScramMechanism {
|
||||
static {
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import org.bouncycastle.crypto.digests.SHA256Digest;
|
||||
import org.bouncycastle.crypto.macs.HMac;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xml.TagWriter;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xml.TagWriter;
|
||||
|
||||
public class ScramSha256 extends ScramMechanism {
|
||||
static {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.crypto.sasl;
|
||||
package eu.siacs.conversations.crypto.sasl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -24,17 +24,17 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.concurrent.CopyOnWriteArraySet;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.crypto.OtrService;
|
||||
import de.pixart.messenger.crypto.PgpDecryptionService;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession;
|
||||
import de.pixart.messenger.services.AvatarService;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.utils.XmppUri;
|
||||
import de.pixart.messenger.xmpp.XmppConnection;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.OtrService;
|
||||
import eu.siacs.conversations.crypto.PgpDecryptionService;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
|
||||
import eu.siacs.conversations.services.AvatarService;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.utils.XmppUri;
|
||||
import eu.siacs.conversations.xmpp.XmppConnection;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class Account extends AbstractEntity implements AvatarService.Avatarable {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
|
|
@ -13,11 +13,11 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.utils.StringUtils;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.InvalidJid;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.utils.StringUtils;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.InvalidJid;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class Bookmark extends Element implements ListItem {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
|
|
@ -18,14 +18,14 @@ import java.util.HashSet;
|
|||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.android.AbstractPhoneContact;
|
||||
import de.pixart.messenger.services.QuickConversationsService;
|
||||
import de.pixart.messenger.utils.JidHelper;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.pep.Avatar;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.android.AbstractPhoneContact;
|
||||
import eu.siacs.conversations.services.QuickConversationsService;
|
||||
import eu.siacs.conversations.utils.JidHelper;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class Contact implements ListItem, Blockable {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -26,19 +26,19 @@ import java.util.ListIterator;
|
|||
import java.util.Locale;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.crypto.OmemoSetting;
|
||||
import de.pixart.messenger.crypto.PgpDecryptionService;
|
||||
import de.pixart.messenger.persistance.DatabaseBackend;
|
||||
import de.pixart.messenger.services.AvatarService;
|
||||
import de.pixart.messenger.services.QuickConversationsService;
|
||||
import de.pixart.messenger.utils.JidHelper;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.xmpp.chatstate.ChatState;
|
||||
import de.pixart.messenger.xmpp.mam.MamReference;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.crypto.OmemoSetting;
|
||||
import eu.siacs.conversations.crypto.PgpDecryptionService;
|
||||
import eu.siacs.conversations.persistance.DatabaseBackend;
|
||||
import eu.siacs.conversations.services.AvatarService;
|
||||
import eu.siacs.conversations.services.QuickConversationsService;
|
||||
import eu.siacs.conversations.utils.JidHelper;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.mam.MamReference;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
import static de.pixart.messenger.entities.Bookmark.printableValue;
|
||||
import static eu.siacs.conversations.entities.Bookmark.printableValue;
|
||||
|
||||
|
||||
public class Conversation extends AbstractEntity implements Blockable, Comparable<Conversation>, Conversational, AvatarService.Avatarable {
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.utils.MimeUtils;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.utils.MimeUtils;
|
||||
|
||||
public class DownloadableFile extends File {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
|
|
@ -26,13 +26,13 @@
|
|||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.database.Cursor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.ui.adapter.MessageAdapter;
|
||||
import eu.siacs.conversations.ui.adapter.MessageAdapter;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class IndividualMessage extends Message {
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.services.AvatarService;
|
||||
import eu.siacs.conversations.services.AvatarService;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public interface ListItem extends Comparable<ListItem>, AvatarService.Avatarable {
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
public class MTMDecision {
|
||||
public final static int DECISION_INVALID = 0;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -18,17 +18,17 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
|
||||
import de.pixart.messenger.services.AvatarService;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.Emoticons;
|
||||
import de.pixart.messenger.utils.GeoHelper;
|
||||
import de.pixart.messenger.utils.MessageUtils;
|
||||
import de.pixart.messenger.utils.MimeUtils;
|
||||
import de.pixart.messenger.utils.Patterns;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.utils.XmppUri;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
|
||||
import eu.siacs.conversations.services.AvatarService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.Emoticons;
|
||||
import eu.siacs.conversations.utils.GeoHelper;
|
||||
import eu.siacs.conversations.utils.MessageUtils;
|
||||
import eu.siacs.conversations.utils.MimeUtils;
|
||||
import eu.siacs.conversations.utils.Patterns;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.utils.XmppUri;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class Message extends AbstractEntity implements AvatarService.Avatarable {
|
||||
|
|
@ -83,8 +83,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
|
|||
public static final String MARKABLE = "markable";
|
||||
public static final String FILE_DELETED = "file_deleted";
|
||||
public static final String ME_COMMAND = "/me";
|
||||
public static final String ERROR_MESSAGE_CANCELLED = "de.pixart.messenger.cancelled";
|
||||
public static final String DELETED_MESSAGE_BODY = "de.pixart.messenger.message_deleted";
|
||||
public static final String ERROR_MESSAGE_CANCELLED = "eu.siacs.conversations.cancelled";
|
||||
public static final String DELETED_MESSAGE_BODY = "eu.siacs.conversations.message_deleted";
|
||||
|
||||
public boolean markable = false;
|
||||
protected String conversationUuid;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.text.TextUtils;
|
||||
|
|
@ -13,17 +13,17 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.services.AvatarService;
|
||||
import de.pixart.messenger.services.MessageArchiveService;
|
||||
import de.pixart.messenger.utils.JidHelper;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.xmpp.chatstate.ChatState;
|
||||
import de.pixart.messenger.xmpp.forms.Data;
|
||||
import de.pixart.messenger.xmpp.forms.Field;
|
||||
import de.pixart.messenger.xmpp.pep.Avatar;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.services.AvatarService;
|
||||
import eu.siacs.conversations.services.MessageArchiveService;
|
||||
import eu.siacs.conversations.utils.JidHelper;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.forms.Data;
|
||||
import eu.siacs.conversations.xmpp.forms.Field;
|
||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
@SuppressLint("DefaultLocale")
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
|
||||
public class Presence implements Comparable {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.util.Pair;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
|
|
@ -7,7 +7,7 @@ import java.util.Collections;
|
|||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class RawBlockable implements ListItem, Blockable {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.collect.ComparisonChain;
|
||||
|
||||
import de.pixart.messenger.services.AvatarService;
|
||||
import de.pixart.messenger.utils.LanguageUtils;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import eu.siacs.conversations.services.AvatarService;
|
||||
import eu.siacs.conversations.utils.LanguageUtils;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class Room implements AvatarService.Avatarable, Comparable<Room> {
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.android.AbstractPhoneContact;
|
||||
import eu.siacs.conversations.android.AbstractPhoneContact;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class Roster {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -17,11 +17,11 @@ import java.util.ArrayList;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.forms.Data;
|
||||
import de.pixart.messenger.xmpp.forms.Field;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.forms.Data;
|
||||
import eu.siacs.conversations.xmpp.forms.Field;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
|
||||
public class ServiceDiscoveryResult {
|
||||
public static final String TABLENAME = "discovery_results";
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.entities;
|
||||
package eu.siacs.conversations.entities;
|
||||
|
||||
public class TransferablePlaceholder implements Transferable {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.generator;
|
||||
package eu.siacs.conversations.generator;
|
||||
|
||||
import android.util.Base64;
|
||||
|
||||
|
|
@ -12,15 +12,15 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.utils.PhoneHelper;
|
||||
import de.pixart.messenger.xmpp.XmppConnection;
|
||||
import de.pixart.messenger.xmpp.jingle.stanzas.Content;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.utils.PhoneHelper;
|
||||
import eu.siacs.conversations.xmpp.XmppConnection;
|
||||
import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
|
||||
|
||||
public abstract class AbstractGenerator {
|
||||
private final String[] FEATURES = {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.generator;
|
||||
package eu.siacs.conversations.generator;
|
||||
|
||||
|
||||
import android.os.Bundle;
|
||||
|
|
@ -20,20 +20,20 @@ import java.util.Set;
|
|||
import java.util.TimeZone;
|
||||
import java.util.UUID;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Bookmark;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.services.MessageArchiveService;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.forms.Data;
|
||||
import de.pixart.messenger.xmpp.pep.Avatar;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Bookmark;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.services.MessageArchiveService;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.forms.Data;
|
||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class IqGenerator extends AbstractGenerator {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.generator;
|
||||
package eu.siacs.conversations.generator;
|
||||
|
||||
import net.java.otr4j.OtrException;
|
||||
import net.java.otr4j.session.Session;
|
||||
|
|
@ -10,18 +10,18 @@ import java.util.Date;
|
|||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.http.P1S3UrlStreamHandler;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.chatstate.ChatState;
|
||||
import de.pixart.messenger.xmpp.stanzas.MessagePacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.http.P1S3UrlStreamHandler;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class MessageGenerator extends AbstractGenerator {
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
package de.pixart.messenger.generator;
|
||||
package eu.siacs.conversations.generator;
|
||||
|
||||
import android.text.TextUtils;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.MucOptions;
|
||||
import de.pixart.messenger.entities.Presence;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.stanzas.PresencePacket;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.MucOptions;
|
||||
import eu.siacs.conversations.entities.Presence;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
|
||||
|
||||
public class PresenceGenerator extends AbstractGenerator {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import java.net.URLStreamHandler;
|
||||
import java.net.URLStreamHandlerFactory;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -19,12 +19,12 @@ import javax.net.ssl.HttpsURLConnection;
|
|||
import javax.net.ssl.SSLSocketFactory;
|
||||
import javax.net.ssl.X509TrustManager;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.services.AbstractConnectionManager;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.TLSSocketFactory;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.services.AbstractConnectionManager;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.TLSSocketFactory;
|
||||
|
||||
public class HttpConnectionManager extends AbstractConnectionManager {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import android.os.PowerManager;
|
||||
import android.util.Log;
|
||||
|
|
@ -23,19 +23,19 @@ import java.util.concurrent.CancellationException;
|
|||
import javax.net.ssl.HttpsURLConnection;
|
||||
import javax.net.ssl.SSLHandshakeException;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.entities.Transferable;
|
||||
import de.pixart.messenger.persistance.FileBackend;
|
||||
import de.pixart.messenger.services.AbstractConnectionManager;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.FileWriterException;
|
||||
import de.pixart.messenger.utils.WakeLockHelper;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.entities.Transferable;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.services.AbstractConnectionManager;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.FileWriterException;
|
||||
import eu.siacs.conversations.utils.WakeLockHelper;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class HttpDownloadConnection implements Transferable {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import android.os.PowerManager;
|
||||
import android.util.Log;
|
||||
|
|
@ -15,17 +15,17 @@ import java.util.Scanner;
|
|||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.entities.Transferable;
|
||||
import de.pixart.messenger.persistance.FileBackend;
|
||||
import de.pixart.messenger.services.AbstractConnectionManager;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Checksum;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.WakeLockHelper;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.entities.Transferable;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.services.AbstractConnectionManager;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Checksum;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.WakeLockHelper;
|
||||
|
||||
public class HttpUploadConnection implements Transferable {
|
||||
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.xmpp.XmppConnection;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.xmpp.XmppConnection;
|
||||
|
||||
public enum Method {
|
||||
P1_S3, HTTP_UPLOAD, HTTP_UPLOAD_LEGACY;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
/*Copyright 2015 Bhavit Singh Sengar
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
|
@ -27,14 +27,14 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLStreamHandler;
|
||||
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
|
||||
public class P1S3UrlStreamHandler extends URLStreamHandler {
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package de.pixart.messenger.http;
|
||||
package eu.siacs.conversations.http;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -35,14 +35,14 @@ import java.net.MalformedURLException;
|
|||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.parser.IqParser;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.parser.IqParser;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class SlotRequester {
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package de.pixart.messenger.http.services;
|
||||
package eu.siacs.conversations.http.services;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.entities.Room;
|
||||
import eu.siacs.conversations.entities.Room;
|
||||
import retrofit2.Call;
|
||||
import retrofit2.http.Body;
|
||||
import retrofit2.http.GET;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.parser;
|
||||
package eu.siacs.conversations.parser;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
|
@ -6,14 +6,14 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.MucOptions;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.InvalidJid;
|
||||
import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.MucOptions;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.InvalidJid;
|
||||
import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public abstract class AbstractParser {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.parser;
|
||||
package eu.siacs.conversations.parser;
|
||||
|
||||
import android.text.TextUtils;
|
||||
import android.util.Base64;
|
||||
|
|
@ -24,20 +24,20 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Room;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.InvalidJid;
|
||||
import de.pixart.messenger.xmpp.OnIqPacketReceived;
|
||||
import de.pixart.messenger.xmpp.OnUpdateBlocklist;
|
||||
import de.pixart.messenger.xmpp.forms.Data;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Room;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.InvalidJid;
|
||||
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
|
||||
import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
|
||||
import eu.siacs.conversations.xmpp.forms.Data;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.parser;
|
||||
package eu.siacs.conversations.parser;
|
||||
|
||||
import android.os.Build;
|
||||
import android.text.Html;
|
||||
|
|
@ -20,41 +20,41 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.crypto.OtrService;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.crypto.axolotl.BrokenSessionException;
|
||||
import de.pixart.messenger.crypto.axolotl.NotEncryptedForThisDeviceException;
|
||||
import de.pixart.messenger.crypto.axolotl.OutdatedSenderException;
|
||||
import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Bookmark;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Conversational;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.entities.MucOptions;
|
||||
import de.pixart.messenger.entities.Presence;
|
||||
import de.pixart.messenger.entities.ReadByMarker;
|
||||
import de.pixart.messenger.entities.ReceiptRequest;
|
||||
import de.pixart.messenger.entities.ServiceDiscoveryResult;
|
||||
import de.pixart.messenger.http.HttpConnectionManager;
|
||||
import de.pixart.messenger.http.P1S3UrlStreamHandler;
|
||||
import de.pixart.messenger.services.MessageArchiveService;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xml.LocalizedContent;
|
||||
import de.pixart.messenger.xmpp.InvalidJid;
|
||||
import de.pixart.messenger.xmpp.OnMessagePacketReceived;
|
||||
import de.pixart.messenger.xmpp.chatstate.ChatState;
|
||||
import de.pixart.messenger.xmpp.pep.Avatar;
|
||||
import de.pixart.messenger.xmpp.stanzas.MessagePacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.OtrService;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.crypto.axolotl.BrokenSessionException;
|
||||
import eu.siacs.conversations.crypto.axolotl.NotEncryptedForThisDeviceException;
|
||||
import eu.siacs.conversations.crypto.axolotl.OutdatedSenderException;
|
||||
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Bookmark;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Conversational;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.entities.MucOptions;
|
||||
import eu.siacs.conversations.entities.Presence;
|
||||
import eu.siacs.conversations.entities.ReadByMarker;
|
||||
import eu.siacs.conversations.entities.ReceiptRequest;
|
||||
import eu.siacs.conversations.entities.ServiceDiscoveryResult;
|
||||
import eu.siacs.conversations.http.HttpConnectionManager;
|
||||
import eu.siacs.conversations.http.P1S3UrlStreamHandler;
|
||||
import eu.siacs.conversations.services.MessageArchiveService;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xml.LocalizedContent;
|
||||
import eu.siacs.conversations.xmpp.InvalidJid;
|
||||
import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY;
|
||||
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY;
|
||||
|
||||
public class MessageParser extends AbstractParser implements OnMessagePacketReceived {
|
||||
|
||||
|
|
@ -1,29 +1,29 @@
|
|||
package de.pixart.messenger.parser;
|
||||
package eu.siacs.conversations.parser;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.crypto.PgpEngine;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.entities.MucOptions;
|
||||
import de.pixart.messenger.entities.Presence;
|
||||
import de.pixart.messenger.generator.IqGenerator;
|
||||
import de.pixart.messenger.generator.PresenceGenerator;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.utils.Namespace;
|
||||
import de.pixart.messenger.utils.XmppUri;
|
||||
import de.pixart.messenger.xml.Element;
|
||||
import de.pixart.messenger.xmpp.InvalidJid;
|
||||
import de.pixart.messenger.xmpp.OnPresencePacketReceived;
|
||||
import de.pixart.messenger.xmpp.pep.Avatar;
|
||||
import de.pixart.messenger.xmpp.stanzas.PresencePacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.crypto.PgpEngine;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.entities.MucOptions;
|
||||
import eu.siacs.conversations.entities.Presence;
|
||||
import eu.siacs.conversations.generator.IqGenerator;
|
||||
import eu.siacs.conversations.generator.PresenceGenerator;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.Namespace;
|
||||
import eu.siacs.conversations.utils.XmppUri;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.InvalidJid;
|
||||
import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
|
||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||
import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class PresenceParser extends AbstractParser implements
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.persistance;
|
||||
package eu.siacs.conversations.persistance;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
|
|
@ -38,24 +38,24 @@ import java.util.Set;
|
|||
import java.util.UUID;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.crypto.axolotl.AxolotlService;
|
||||
import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
|
||||
import de.pixart.messenger.crypto.axolotl.SQLiteAxolotlStore;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.entities.PresenceTemplate;
|
||||
import de.pixart.messenger.entities.Roster;
|
||||
import de.pixart.messenger.entities.ServiceDiscoveryResult;
|
||||
import de.pixart.messenger.services.ShortcutService;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.CursorUtils;
|
||||
import de.pixart.messenger.utils.FtsUtils;
|
||||
import de.pixart.messenger.utils.Resolver;
|
||||
import de.pixart.messenger.xmpp.InvalidJid;
|
||||
import de.pixart.messenger.xmpp.mam.MamReference;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
|
||||
import eu.siacs.conversations.crypto.axolotl.SQLiteAxolotlStore;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.entities.PresenceTemplate;
|
||||
import eu.siacs.conversations.entities.Roster;
|
||||
import eu.siacs.conversations.entities.ServiceDiscoveryResult;
|
||||
import eu.siacs.conversations.services.ShortcutService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.CursorUtils;
|
||||
import eu.siacs.conversations.utils.FtsUtils;
|
||||
import eu.siacs.conversations.utils.Resolver;
|
||||
import eu.siacs.conversations.xmpp.InvalidJid;
|
||||
import eu.siacs.conversations.xmpp.mam.MamReference;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class DatabaseBackend extends SQLiteOpenHelper {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.persistance;
|
||||
package eu.siacs.conversations.persistance;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.ContentResolver;
|
||||
|
|
@ -58,20 +58,20 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.UUID;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.services.AttachFileToConversationRunnable;
|
||||
import de.pixart.messenger.services.XmppConnectionService;
|
||||
import de.pixart.messenger.ui.util.Attachment;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import de.pixart.messenger.utils.ExifHelper;
|
||||
import de.pixart.messenger.utils.FileUtils;
|
||||
import de.pixart.messenger.utils.FileWriterException;
|
||||
import de.pixart.messenger.utils.MimeUtils;
|
||||
import de.pixart.messenger.xmpp.pep.Avatar;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.services.AttachFileToConversationRunnable;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.ui.util.Attachment;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.ExifHelper;
|
||||
import eu.siacs.conversations.utils.FileUtils;
|
||||
import eu.siacs.conversations.utils.FileWriterException;
|
||||
import eu.siacs.conversations.utils.MimeUtils;
|
||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||
import ezvcard.Ezvcard;
|
||||
import ezvcard.VCard;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.persistance;
|
||||
package eu.siacs.conversations.persistance;
|
||||
|
||||
public interface OnPhoneContactsMerged {
|
||||
void phoneContactsMerged();
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.PowerManager;
|
||||
|
|
@ -25,10 +25,10 @@ import java.util.concurrent.atomic.AtomicLong;
|
|||
|
||||
import javax.crypto.NoSuchPaddingException;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
|
||||
public class AbstractConnectionManager {
|
||||
private static final int UI_REFRESH_THRESHOLD = Config.REFRESH_UI_INTERVAL;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
public abstract class AbstractQuickConversationsService {
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.util.Log;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
|
||||
public class AlarmReceiver extends BroadcastReceiver {
|
||||
public static final int SCHEDULE_ALARM_REQUEST_CODE = 523976483;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
|
|
@ -22,14 +22,14 @@ import java.util.Locale;
|
|||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.crypto.PgpEngine;
|
||||
import de.pixart.messenger.entities.DownloadableFile;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.persistance.FileBackend;
|
||||
import de.pixart.messenger.ui.UiCallback;
|
||||
import de.pixart.messenger.utils.MimeUtils;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.PgpEngine;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.ui.UiCallback;
|
||||
import eu.siacs.conversations.utils.MimeUtils;
|
||||
|
||||
public class AttachFileToConversationRunnable implements Runnable, MediaTranscoder.Listener {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.Context;
|
||||
|
|
@ -29,13 +29,13 @@ import java.util.Locale;
|
|||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.ui.ConversationsActivity;
|
||||
import de.pixart.messenger.ui.adapter.MessageAdapter;
|
||||
import de.pixart.messenger.ui.util.PendingItem;
|
||||
import de.pixart.messenger.utils.WeakReferenceSet;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.ui.ConversationsActivity;
|
||||
import eu.siacs.conversations.ui.adapter.MessageAdapter;
|
||||
import eu.siacs.conversations.ui.util.PendingItem;
|
||||
import eu.siacs.conversations.utils.WeakReferenceSet;
|
||||
|
||||
public class AudioPlayer implements View.OnClickListener, MediaPlayer.OnCompletionListener, SeekBar.OnSeekBarChangeListener, Runnable, SensorEventListener {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
|
|
@ -29,24 +29,24 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Bookmark;
|
||||
import de.pixart.messenger.entities.Contact;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Conversational;
|
||||
import de.pixart.messenger.entities.ListItem;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.entities.MucOptions;
|
||||
import de.pixart.messenger.entities.RawBlockable;
|
||||
import de.pixart.messenger.entities.Room;
|
||||
import de.pixart.messenger.utils.UIHelper;
|
||||
import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded;
|
||||
import de.pixart.messenger.xmpp.XmppConnection;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Bookmark;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Conversational;
|
||||
import eu.siacs.conversations.entities.ListItem;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.entities.MucOptions;
|
||||
import eu.siacs.conversations.entities.RawBlockable;
|
||||
import eu.siacs.conversations.entities.Room;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded;
|
||||
import eu.siacs.conversations.xmpp.XmppConnection;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
import static de.pixart.messenger.ui.SettingsActivity.PREFER_XMPP_AVATAR;
|
||||
import static eu.siacs.conversations.ui.SettingsActivity.PREFER_XMPP_AVATAR;
|
||||
|
||||
public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.ContentProvider;
|
||||
|
|
@ -29,9 +29,9 @@ import java.io.FileOutputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.util.Hashtable;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
public class BarcodeProvider extends ContentProvider implements ServiceConnection {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -17,15 +17,15 @@ import java.util.concurrent.Executors;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Room;
|
||||
import de.pixart.messenger.http.HttpConnectionManager;
|
||||
import de.pixart.messenger.http.services.MuclumbusService;
|
||||
import de.pixart.messenger.parser.IqParser;
|
||||
import de.pixart.messenger.xmpp.OnIqPacketReceived;
|
||||
import de.pixart.messenger.xmpp.XmppConnection;
|
||||
import de.pixart.messenger.xmpp.stanzas.IqPacket;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Room;
|
||||
import eu.siacs.conversations.http.HttpConnectionManager;
|
||||
import eu.siacs.conversations.http.services.MuclumbusService;
|
||||
import eu.siacs.conversations.parser.IqParser;
|
||||
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
|
||||
import eu.siacs.conversations.xmpp.XmppConnection;
|
||||
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.ResponseBody;
|
||||
import retrofit2.Call;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.ComponentName;
|
||||
|
|
@ -16,9 +16,9 @@ import android.service.chooser.ChooserTargetService;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.ui.ConversationsActivity;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.ui.ConversationsActivity;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
public class ContactChooserTargetService extends ChooserTargetService implements ServiceConnection {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
|
|
@ -7,8 +7,8 @@ import android.os.Bundle;
|
|||
import android.preference.PreferenceManager;
|
||||
import android.util.Log;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
|
||||
public class EventReceiver extends BroadcastReceiver {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.app.Notification;
|
||||
import android.app.NotificationManager;
|
||||
|
|
@ -45,20 +45,20 @@ import javax.crypto.spec.IvParameterSpec;
|
|||
import javax.crypto.spec.PBEKeySpec;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.crypto.axolotl.SQLiteAxolotlStore;
|
||||
import de.pixart.messenger.entities.Account;
|
||||
import de.pixart.messenger.entities.Conversation;
|
||||
import de.pixart.messenger.entities.Message;
|
||||
import de.pixart.messenger.persistance.DatabaseBackend;
|
||||
import de.pixart.messenger.persistance.FileBackend;
|
||||
import de.pixart.messenger.utils.BackupFileHeader;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import de.pixart.messenger.utils.WakeLockHelper;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.axolotl.SQLiteAxolotlStore;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.Message;
|
||||
import eu.siacs.conversations.persistance.DatabaseBackend;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.utils.BackupFileHeader;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
import eu.siacs.conversations.utils.WakeLockHelper;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
import static de.pixart.messenger.utils.Compatibility.runsTwentySix;
|
||||
import static eu.siacs.conversations.utils.Compatibility.runsTwentySix;
|
||||
|
||||
public class ExportBackupService extends Service {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.app.PendingIntent;
|
||||
|
|
@ -39,19 +39,19 @@ import javax.crypto.CipherInputStream;
|
|||
import javax.crypto.spec.IvParameterSpec;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import de.pixart.messenger.Config;
|
||||
import de.pixart.messenger.R;
|
||||
import de.pixart.messenger.persistance.DatabaseBackend;
|
||||
import de.pixart.messenger.persistance.FileBackend;
|
||||
import de.pixart.messenger.ui.ManageAccountActivity;
|
||||
import de.pixart.messenger.utils.BackupFileHeader;
|
||||
import de.pixart.messenger.utils.Compatibility;
|
||||
import de.pixart.messenger.utils.SerialSingleThreadExecutor;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.persistance.DatabaseBackend;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.ui.ManageAccountActivity;
|
||||
import eu.siacs.conversations.utils.BackupFileHeader;
|
||||
import eu.siacs.conversations.utils.Compatibility;
|
||||
import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
|
||||
import rocks.xmpp.addr.Jid;
|
||||
|
||||
import static de.pixart.messenger.services.ExportBackupService.CIPHERMODE;
|
||||
import static de.pixart.messenger.services.ExportBackupService.KEYTYPE;
|
||||
import static de.pixart.messenger.services.ExportBackupService.PROVIDER;
|
||||
import static eu.siacs.conversations.services.ExportBackupService.CIPHERMODE;
|
||||
import static eu.siacs.conversations.services.ExportBackupService.KEYTYPE;
|
||||
import static eu.siacs.conversations.services.ExportBackupService.PROVIDER;
|
||||
|
||||
public class ImportBackupService extends Service {
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package de.pixart.messenger.services;
|
||||
package eu.siacs.conversations.services;
|
||||
|
||||
public class MediaPlayer extends android.media.MediaPlayer {
|
||||
private int streamType;
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue