narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

renaming

Browse source
This commit is contained in:
iNPUTmice 2014-10-14 12:02:48 +02:00
parent bbb0693f4a
commit 4fdc6b2eac
15 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eu/siacs/conversations/crypto/PgpEngine.java
View file

@ -15,11 +15,11 @@ import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpApi.IOpenPgpCallback;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.DownloadableFile;
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.services.XmppConnectionService;
import eu.siacs.conversations.ui.UiCallback;

3
src/eu/siacs/conversations/DownloadableFile.java → src/eu/siacs/conversations/entities/DownloadableFile.java
View file

@ -1,4 +1,4 @@
package eu.siacs.conversations;
package eu.siacs.conversations.entities;
import java.io.File;
import java.io.FileInputStream;
@ -18,6 +18,7 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.utils.CryptoHelper;
import android.util.Log;

2
src/eu/siacs/conversations/http/HttpConnection.java
View file

@ -12,8 +12,8 @@ import javax.net.ssl.HttpsURLConnection;
import android.util.Log;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.Downloadable;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.services.XmppConnectionService;

2
src/eu/siacs/conversations/http/HttpConnectionManager.java
View file

@ -3,8 +3,8 @@ package eu.siacs.conversations.http;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import eu.siacs.conversations.AbstractConnectionManager;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.services.AbstractConnectionManager;
import eu.siacs.conversations.services.XmppConnectionService;
public class HttpConnectionManager extends AbstractConnectionManager {

2
src/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -30,9 +30,9 @@ import android.util.Base64OutputStream;
import android.util.Log;
import android.util.LruCache;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.services.ImageProvider;
import eu.siacs.conversations.utils.CryptoHelper;

3
src/eu/siacs/conversations/AbstractConnectionManager.java → src/eu/siacs/conversations/services/AbstractConnectionManager.java
View file

@ -1,6 +1,5 @@
package eu.siacs.conversations;
package eu.siacs.conversations.services;
import eu.siacs.conversations.services.XmppConnectionService;
public class AbstractConnectionManager {
protected XmppConnectionService mXmppConnectionService;

2
src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -171,7 +171,6 @@ public class ConferenceDetailsActivity extends XmppActivity {
}
protected void registerListener() {
if (xmppConnectionServiceBound) {
xmppConnectionService
.setOnConversationListChangedListener(this.onConvChanged);
xmppConnectionService.setOnRenameListener(new OnRenameListener() {
@ -198,7 +197,6 @@ public class ConferenceDetailsActivity extends XmppActivity {
}
});
}
}
private void populateView() {
mAccountJid.setText(getString(R.string.using_account,conversation.getAccount().getJid()));

2
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -736,12 +736,10 @@ public class ConversationActivity extends XmppActivity implements
}
public void registerListener() {
if (xmppConnectionServiceBound) {
xmppConnectionService.setOnConversationListChangedListener(this);
xmppConnectionService.setOnAccountListChangedListener(this);
xmppConnectionService.setOnRosterUpdateListener(this);
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode,

2
src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -13,10 +13,10 @@ import android.graphics.BitmapFactory;
import android.net.Uri;
import android.util.Log;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Downloadable;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.xml.Element;

2
src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View file

@ -7,10 +7,10 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import android.annotation.SuppressLint;
import android.util.Log;
import eu.siacs.conversations.AbstractConnectionManager;
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.xml.Element;
import eu.siacs.conversations.xmpp.OnIqPacketReceived;

2
src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
View file

@ -8,8 +8,8 @@ import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import android.util.Base64;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.OnIqPacketReceived;

2
src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
View file

@ -10,7 +10,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.utils.CryptoHelper;
public class JingleSocks5Transport extends JingleTransport {

2
src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.xmpp.jingle;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.DownloadableFile;
public abstract class JingleTransport {
public abstract void connect(final OnTransportConnected callback);

2
src/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.xmpp.jingle;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.DownloadableFile;
public interface OnFileTransmissionStatusChanged {
public void onFileTransmitted(DownloadableFile file);

2
src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.xmpp.jingle.stanzas;
import eu.siacs.conversations.DownloadableFile;
import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.xml.Element;
public class Content extends Element {