Merge tag '2.5.3' into develop

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### Version 2.5.3
+* bug fixes for peer to peer file transfer (Jingle)
+* fixed server info for unlimited/unknown max file size
+
+### Version 2.5.2
+* bug fixes
+
 ### Version 2.5.1
 * minor bug fixes
 * Set own OMEMO devices to inactive after not seeing them for 14 days. (was 7 days)

build.gradle

@@ -81,8 +81,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 329
+        versionCode 330
-        versionName "2.5.2"
+        versionName "2.5.3"
         archivesBaseName += "-$versionName"
         applicationId "eu.sum7.conversations"
         resValue "string", "applicationId", applicationId

src/main/java/eu/siacs/conversations/Config.java

@@ -150,7 +150,7 @@ public final class Config {
             "TLS_RSA_WITH_AES_256_CBC_SHA",
     };
 
-    public static final String WEAK_CIPHER_PATTERNS[] = {
+    public static final String[] WEAK_CIPHER_PATTERNS = {
             "_NULL_",
             "_EXPORT_",
             "_anon_",

src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java

@@ -27,8 +27,8 @@ public abstract class AbstractGenerator {
 			Content.Version.FT_3.getNamespace(),
 			Content.Version.FT_4.getNamespace(),
 			Content.Version.FT_5.getNamespace(),
-			"urn:xmpp:jingle:transports:s5b:1",
+			Namespace.JINGLE_TRANSPORTS_S5B,
-			"urn:xmpp:jingle:transports:ibb:1",
+			Namespace.JINGLE_TRANSPORTS_IBB,
 			"http://jabber.org/protocol/muc",
 			"jabber:x:conference",
 			Namespace.OOB,

src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java

@@ -36,7 +36,7 @@ public class HttpConnectionManager extends AbstractConnectionManager {
     }
 
     public static Proxy getProxy() throws IOException {
-        return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getByAddress(new byte[]{127, 0, 0, 1}), 8118));
+        return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(InetAddress.getByAddress(new byte[]{127, 0, 0, 1}), 9050));
     }
 
     public void createNewDownloadConnection(Message message) {

src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java

@@ -276,7 +276,9 @@ public class HttpDownloadConnection implements Transferable {
 				Log.d(Config.LOGTAG, "retrieve file size. interactive:" + String.valueOf(interactive));
 				changeStatus(STATUS_CHECKING);
 				HttpURLConnection connection;
-				if (mUseTor || message.getConversation().getAccount().isOnion()) {
+				final String hostname = mUrl.getHost();
+				final boolean onion = hostname != null && hostname.endsWith(".onion");
+				if (mUseTor || message.getConversation().getAccount().isOnion() || onion) {
 					connection = (HttpURLConnection) mUrl.openConnection(HttpConnectionManager.getProxy());
 				} else {
 					connection = (HttpURLConnection) mUrl.openConnection();

src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java

@@ -155,11 +155,14 @@ public class HttpUploadConnection implements Transferable {
 		PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_upload_"+message.getUuid());
 		try {
 			fileInputStream = new FileInputStream(file);
+			final String slotHostname = slot.getPutUrl().getHost();
+			final boolean onionSlot = slotHostname != null && slotHostname.endsWith(".onion");
 			final int expectedFileSize = (int) file.getExpectedSize();
 			final int readTimeout = (expectedFileSize / 2048) + Config.SOCKET_TIMEOUT; //assuming a minimum transfer speed of 16kbit/s
 			wakeLock.acquire(readTimeout);
 			Log.d(Config.LOGTAG, "uploading to " + slot.getPutUrl().toString()+ " w/ read timeout of "+readTimeout+"s");
-			if (mUseTor || message.getConversation().getAccount().isOnion()) {
+
+			if (mUseTor || message.getConversation().getAccount().isOnion() || onionSlot) {
 				connection = (HttpURLConnection) slot.getPutUrl().openConnection(HttpConnectionManager.getProxy());
 			} else {
 				connection = (HttpURLConnection) slot.getPutUrl().openConnection();

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -869,7 +869,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
         public boolean execute(Account account) {
             if (jid != null) {
                 Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, jid, true, false);
-                if (!conversation.getMucOptions().online()) {
+                if (conversation.getMucOptions().online()) {
+                    Log.d(Config.LOGTAG,account.getJid().asBareJid()+": received invite to "+jid+" but muc is considered to be online");
+                    mXmppConnectionService.mucSelfPingAndRejoin(conversation);
+                } else {
                     conversation.getMucOptions().setPassword(password);
                     mXmppConnectionService.databaseBackend.updateConversation(conversation);
                     mXmppConnectionService.joinMuc(conversation, inviter != null && inviter.mutualPresenceSubscription());

src/main/java/eu/siacs/conversations/services/NotificationService.java

@@ -517,7 +517,6 @@ public class NotificationService {
         final Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService, quietHours ? "quiet_hours" : (notify ? "messages" : "silent_messages"));
         if (messages.size() >= 1) {
             final Conversation conversation = (Conversation) messages.get(0).getConversation();
-            final UnreadConversation.Builder mUnreadBuilder = new UnreadConversation.Builder(conversation.getName().toString());
             mBuilder.setLargeIcon(mXmppConnectionService.getAvatarService()
                     .get(conversation, AvatarService.getSystemUiAvatarSize(mXmppConnectionService)));
             mBuilder.setContentTitle(conversation.getName());
@@ -528,28 +527,31 @@ public class NotificationService {
                 Message message;
                 //TODO starting with Android 9 we might want to put images in MessageStyle
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && (message = getImage(messages)) != null) {
-                    modifyForImage(mBuilder, mUnreadBuilder, message, messages);
+                    modifyForImage(mBuilder, message, messages);
                 } else {
-                    modifyForTextOnly(mBuilder, mUnreadBuilder, messages);
+                    modifyForTextOnly(mBuilder, messages);
                 }
                 RemoteInput remoteInput = new RemoteInput.Builder("text_reply").setLabel(UIHelper.getMessageHint(mXmppConnectionService, conversation)).build();
                 PendingIntent markAsReadPendingIntent = createReadPendingIntent(conversation);
                 NotificationCompat.Action markReadAction = new NotificationCompat.Action.Builder(
                         R.drawable.ic_drafts_white_24dp,
                         mXmppConnectionService.getString(R.string.mark_as_read),
-                        markAsReadPendingIntent).build();
+                        markAsReadPendingIntent)
+                        .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
+                        .setShowsUserInterface(false)
+                        .build();
                 String replyLabel = mXmppConnectionService.getString(R.string.reply);
                 NotificationCompat.Action replyAction = new NotificationCompat.Action.Builder(
                         R.drawable.ic_send_text_offline,
                         replyLabel,
-                        createReplyIntent(conversation, false)).addRemoteInput(remoteInput).build();
+                        createReplyIntent(conversation, false))
+                        .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
+                        .setShowsUserInterface(false)
+                        .addRemoteInput(remoteInput).build();
                 NotificationCompat.Action wearReplyAction = new NotificationCompat.Action.Builder(R.drawable.ic_wear_reply,
                         replyLabel,
                         createReplyIntent(conversation, true)).addRemoteInput(remoteInput).build();
                 mBuilder.extend(new NotificationCompat.WearableExtender().addAction(wearReplyAction));
-                mUnreadBuilder.setReplyAction(createReplyIntent(conversation, true), remoteInput);
-                mUnreadBuilder.setReadPendingIntent(markAsReadPendingIntent);
-                mBuilder.extend(new NotificationCompat.CarExtender().setUnreadConversation(mUnreadBuilder.build()));
                 int addedActionsCount = 1;
                 mBuilder.addAction(markReadAction);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -609,8 +611,7 @@ public class NotificationService {
         return mBuilder;
     }
 
-    private void modifyForImage(final Builder builder, final UnreadConversation.Builder uBuilder,
+    private void modifyForImage(final Builder builder, final Message message, final ArrayList<Message> messages) {
-                                final Message message, final ArrayList<Message> messages) {
         try {
             final Bitmap bitmap = mXmppConnectionService.getFileBackend().getThumbnail(message, getPixel(288), false);
             final ArrayList<Message> tmp = new ArrayList<>();
@@ -631,7 +632,7 @@ public class NotificationService {
             }
             builder.setStyle(bigPictureStyle);
         } catch (final IOException e) {
-            modifyForTextOnly(builder, uBuilder, messages);
+            modifyForTextOnly(builder, messages);
         }
     }
 
@@ -653,7 +654,7 @@ public class NotificationService {
         return builder.build();
     }
 
-    private void modifyForTextOnly(final Builder builder, final UnreadConversation.Builder uBuilder, final ArrayList<Message> messages) {
+    private void modifyForTextOnly(final Builder builder,  final ArrayList<Message> messages) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             final Conversation conversation = (Conversation) messages.get(0).getConversation();
             final Person.Builder meBuilder = new Person.Builder().setName(mXmppConnectionService.getString(R.string.me));
@@ -707,15 +708,6 @@ public class NotificationService {
                 }
             }
         }
-        /** message preview for Android Auto **/
-        for (Message message : messages) {
-            Pair<CharSequence, Boolean> preview = UIHelper.getMessagePreview(mXmppConnectionService, message);
-            // only show user written text
-            if (!preview.second) {
-                uBuilder.addMessage(preview.first.toString());
-                uBuilder.setLatestTimestamp(message.getTimeSent());
-            }
-        }
     }
 
     private Message getImage(final Iterable<Message> messages) {

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -1559,7 +1559,8 @@ public class XmppConnectionService extends Service {
     }
 
     public void pushBookmarks(Account account) {
-        if (account.getXmppConnection().getFeatures().bookmarksConversion()) {
+        final XmppConnection connection = account.getXmppConnection();
+        if (connection != null && connection.getFeatures().bookmarksConversion()) {
             pushBookmarksPep(account);
         } else {
             pushBookmarksPrivateXml(account);
@@ -1973,7 +1974,7 @@ public class XmppConnectionService extends Service {
 	    archiveConversation(conversation, true);
     }
 
-	private void archiveConversation(Conversation conversation, final boolean maySyncronizeWithBookmarks) {
+	private void archiveConversation(Conversation conversation, final boolean maySynchronizeWithBookmarks) {
 		getNotificationService().clear(conversation);
 		conversation.setStatus(Conversation.STATUS_ARCHIVED);
 		conversation.setNextMessage(null);
@@ -1982,7 +1983,7 @@ public class XmppConnectionService extends Service {
 			if (conversation.getMode() == Conversation.MODE_MULTI) {
 				if (conversation.getAccount().getStatus() == Account.State.ONLINE) {
 					Bookmark bookmark = conversation.getBookmark();
-					if (maySyncronizeWithBookmarks && bookmark != null && synchronizeWithBookmarks()) {
+					if (maySynchronizeWithBookmarks && bookmark != null && synchronizeWithBookmarks()) {
 						if (conversation.getMucOptions().getError() == MucOptions.Error.DESTROYED) {
 							Account account = bookmark.getAccount();
 							bookmark.setConversation(null);
@@ -2430,6 +2431,26 @@ public class XmppConnectionService extends Service {
 		}
 	}
 
+	public void mucSelfPingAndRejoin(final Conversation conversation) {
+	    final Jid self = conversation.getMucOptions().getSelf().getFullJid();
+	    final IqPacket ping = new IqPacket(IqPacket.TYPE.GET);
+	    ping.setTo(self);
+	    ping.addChild("ping", Namespace.PING);
+	    sendIqPacket(conversation.getAccount(), ping, (account, response) -> {
+	        if (response.getType() == IqPacket.TYPE.ERROR) {
+	            Element error = response.findChild("error");
+	            if (error == null || error.hasChild("service-unavailable") || error.hasChild("feature-not-implemented") || error.hasChild("item-not-found")) {
+	                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ping to "+self+" came back as ignorable error");
+                } else {
+	                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ping to "+self+" failed. attempting rejoin");
+	                joinMuc(conversation);
+                }
+            } else if (response.getType() == IqPacket.TYPE.RESULT) {
+	            Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ping to "+self+" came back fine");
+            }
+        });
+    }
+
 	public void joinMuc(Conversation conversation) {
 		joinMuc(conversation, null, false);
 	}

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -1994,8 +1994,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         final boolean doNotAppend = extras.getBoolean(ConversationsActivity.EXTRA_DO_NOT_APPEND, false);
         final List<Uri> uris = extractUris(extras);
         if (uris != null && uris.size() > 0) {
-            final List<Uri> cleanedUris = cleanUris(new ArrayList<>(uris));
+            if (uris.size() == 1 && "geo".equals(uris.get(0).getScheme())) {
-            mediaPreviewAdapter.addMediaPreviews(Attachment.of(getActivity(), cleanedUris));
+                mediaPreviewAdapter.addMediaPreviews(Attachment.of(getActivity(), uris.get(0), Attachment.Type.LOCATION));
+            } else {
+                final List<Uri> cleanedUris = cleanUris(new ArrayList<>(uris));
+                mediaPreviewAdapter.addMediaPreviews(Attachment.of(getActivity(), cleanedUris));
+            }
             toggleInputMethod();
             return;
         }
@@ -2015,7 +2019,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 }
             }
         } else {
-            if (text != null && asQuote) {
+            if (text != null && GeoHelper.GEO_URI.matcher(text).matches()) {
+                mediaPreviewAdapter.addMediaPreviews(Attachment.of(getActivity(), Uri.parse(text), Attachment.Type.LOCATION));
+                toggleInputMethod();
+                return;
+            } else if (text != null && asQuote) {
                 quoteText(text);
             } else {
                 appendText(text, doNotAppend);

src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java

@@ -1044,7 +1044,12 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
                 this.binding.serverInfoPep.setText(R.string.server_info_unavailable);
             }
             if (features.httpUpload(0)) {
-                this.binding.serverInfoHttpUpload.setText(UIHelper.filesizeToString(features.getMaxHttpUploadSize()));
+                final long maxFileSize = features.getMaxHttpUploadSize();
+                if (maxFileSize > 0) {
+                    this.binding.serverInfoHttpUpload.setText(UIHelper.filesizeToString(maxFileSize));
+                } else {
+                    this.binding.serverInfoHttpUpload.setText(R.string.server_info_available);
+                }
             } else if (features.p1S3FileTransfer()) {
                 this.binding.serverInfoHttpUploadDescription.setText(R.string.p1_s3_filetransfer);
                 this.binding.serverInfoHttpUpload.setText(R.string.server_info_available);

src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java

@@ -21,6 +21,7 @@ import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.adapter.ConversationAdapter;
 import eu.siacs.conversations.ui.service.EmojiService;
+import eu.siacs.conversations.utils.GeoHelper;
 import rocks.xmpp.addr.Jid;
 
 public class ShareWithActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate {
@@ -126,10 +127,14 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
         }
         final String type = intent.getType();
         final String action = intent.getAction();
+        final Uri data = intent.getData();
         if (Intent.ACTION_SEND.equals(action)) {
             final String text = intent.getStringExtra(Intent.EXTRA_TEXT);
             final Uri uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (type != null && uri != null && (text == null || !type.equals("text/plain"))) {
+            if (data != null && "geo".equals(data.getScheme())) {
+                this.share.uris.clear();
+                this.share.uris.add(data);
+            } else if (type != null && uri != null && (text == null || !type.equals("text/plain"))) {
                 this.share.uris.clear();
                 this.share.uris.add(uri);
             } else {

src/main/java/eu/siacs/conversations/ui/util/SendButtonAction.java

@@ -38,7 +38,10 @@ import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE_T
 public enum SendButtonAction {
 	TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE, RECORD_VIDEO;
 
-	public static SendButtonAction valueOfOrDefault(String setting, SendButtonAction text) {
+	public static SendButtonAction valueOfOrDefault(final String setting) {
+		if (setting == null) {
+			return TEXT;
+		}
 		try {
 			return valueOf(setting);
 		} catch (IllegalArgumentException e) {

src/main/java/eu/siacs/conversations/ui/util/SendButtonTool.java

@@ -42,7 +42,10 @@ import eu.siacs.conversations.utils.UIHelper;
 
 public class SendButtonTool {
 
-	public static SendButtonAction getAction(Activity activity, Conversation c, String text) {
+	public static SendButtonAction getAction(final Activity activity, final Conversation c, final String text) {
+		if (activity == null) {
+			return SendButtonAction.TEXT;
+		}
 		final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
 		final boolean empty = text.length() == 0;
 		final boolean conference = c.getMode() == Conversation.MODE_MULTI;
@@ -60,14 +63,14 @@ public class SendButtonTool {
 					return SendButtonAction.CANCEL;
 				} else {
 					String setting = preferences.getString("quick_action", activity.getResources().getString(R.string.quick_action));
-					if (!setting.equals("none") && UIHelper.receivedLocationQuestion(c.getLatestMessage())) {
+					if (!"none".equals(setting) && UIHelper.receivedLocationQuestion(c.getLatestMessage())) {
 						return SendButtonAction.SEND_LOCATION;
 					} else {
-						if (setting.equals("recent")) {
+						if ("recent".equals(setting)) {
 							setting = preferences.getString(ConversationFragment.RECENTLY_USED_QUICK_ACTION, SendButtonAction.TEXT.toString());
-							return SendButtonAction.valueOfOrDefault(setting, SendButtonAction.TEXT);
+							return SendButtonAction.valueOfOrDefault(setting);
 						} else {
-							return SendButtonAction.valueOfOrDefault(setting, SendButtonAction.TEXT);
+							return SendButtonAction.valueOfOrDefault(setting);
 						}
 					}
 				}

src/main/java/eu/siacs/conversations/utils/GeoHelper.java

@@ -1,6 +1,5 @@
 package eu.siacs.conversations.utils;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -17,7 +16,6 @@ import java.util.regex.Pattern;
 
 import eu.siacs.conversations.R;
 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.ui.ShareLocationActivity;
@@ -28,7 +26,7 @@ public class GeoHelper {
 	private static final String SHARE_LOCATION_PACKAGE_NAME = "eu.siacs.conversations.location.request";
 	private static final String SHOW_LOCATION_PACKAGE_NAME = "eu.siacs.conversations.location.show";
 
-	public static Pattern GEO_URI = Pattern.compile("geo:(-?\\d+(?:\\.\\d+)?),(-?\\d+(?:\\.\\d+)?)(?:,-?\\d+(?:\\.\\d+)?)?(?:;crs=[\\w-]+)?(?:;u=\\d+(?:\\.\\d+)?)?(?:;[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+)*", Pattern.CASE_INSENSITIVE);
+	public static Pattern GEO_URI = Pattern.compile("geo:(-?\\d+(?:\\.\\d+)?),(-?\\d+(?:\\.\\d+)?)(?:,-?\\d+(?:\\.\\d+)?)?(?:;crs=[\\w-]+)?(?:;u=\\d+(?:\\.\\d+)?)?(?:;[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+)*(\\?z=\\d+)?", Pattern.CASE_INSENSITIVE);
 
 	public static boolean isLocationPluginInstalled(Context context) {
 		return new Intent(SHARE_LOCATION_PACKAGE_NAME).resolveActivity(context.getPackageManager()) != null;

src/main/java/eu/siacs/conversations/xml/Namespace.java

@@ -25,4 +25,7 @@ public final class Namespace {
 	public static final String BOOKMARKS = "storage:bookmarks";
 	public static final String SYNCHRONIZATION = "im.quicksy.synchronization:0";
 	public static final String AVATAR_CONVERSION = "urn:xmpp:pep-vcard-conversion:0";
+	public static final String JINGLE_TRANSPORTS_S5B = "urn:xmpp:jingle:transports:s5b:1";
+	public static final String JINGLE_TRANSPORTS_IBB = "urn:xmpp:jingle:transports:ibb:1";
+	public static final String PING = "urn:xmpp:ping";
 }

src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -1396,7 +1396,7 @@ public class XmppConnection implements Runnable {
         if (!r()) {
             final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
             iq.setFrom(account.getJid());
-            iq.addChild("ping", "urn:xmpp:ping");
+            iq.addChild("ping", Namespace.PING);
             this.sendIqPacket(iq, null);
         }
         this.lastPingSent = SystemClock.elapsedRealtime();

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java

@@ -154,6 +154,7 @@ public class JingleInbandTransport extends JingleTransport {
 			if (count == -1) {
 				sendClose();
 				file.setSha1Sum(digest.digest());
+				Log.d(Config.LOGTAG,account.getJid().asBareJid()+": sendNextBlock() count was -1");
 				this.onFileTransmissionStatusChanged.onFileTransmitted(file);
 				fileInputStream.close();
 				return;
@@ -181,6 +182,7 @@ public class JingleInbandTransport extends JingleTransport {
 			} else {
 				sendClose();
 				file.setSha1Sum(digest.digest());
+				Log.d(Config.LOGTAG,account.getJid().asBareJid()+": sendNextBlock() remaining size");
 				this.onFileTransmissionStatusChanged.onFileTransmitted(file);
 				fileInputStream.close();
 			}
@@ -204,6 +206,7 @@ public class JingleInbandTransport extends JingleTransport {
 				file.setSha1Sum(digest.digest());
 				fileOutputStream.flush();
 				fileOutputStream.close();
+				Log.d(Config.LOGTAG,account.getJid().asBareJid()+": receive next block nothing remaining");
 				this.onFileTransmissionStatusChanged.onFileTransmitted(file);
 			} else {
 				connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));

src/main/java/eu/siacs/conversations/xmpp/jingle/Transport.java

@@ -0,0 +1,5 @@
+package eu.siacs.conversations.xmpp.jingle;
+
+public enum Transport {
+    SOCKS, IBB
+}

src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java

@@ -2,132 +2,129 @@ package eu.siacs.conversations.xmpp.jingle.stanzas;
 
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xml.Namespace;
 
 public class Content extends Element {
 
-	public enum Version {
+    public enum Version {
-		FT_3("urn:xmpp:jingle:apps:file-transfer:3"),
+        FT_3("urn:xmpp:jingle:apps:file-transfer:3"),
-		FT_4("urn:xmpp:jingle:apps:file-transfer:4"),
+        FT_4("urn:xmpp:jingle:apps:file-transfer:4"),
-		FT_5("urn:xmpp:jingle:apps:file-transfer:5");
+        FT_5("urn:xmpp:jingle:apps:file-transfer:5");
 
-		private final String namespace;
+        private final String namespace;
 
-		Version(String namespace) {
+        Version(String namespace) {
-			this.namespace = namespace;
+            this.namespace = namespace;
-		}
+        }
 
-		public String getNamespace() {
+        public String getNamespace() {
-			return namespace;
+            return namespace;
-		}
+        }
-	}
+    }
 
-	private String transportId;
+    private String transportId;
 
-	public Content() {
+    public Content() {
-		super("content");
+        super("content");
-	}
+    }
 
-	public Content(String creator, String name) {
+    public Content(String creator, String name) {
-		super("content");
+        super("content");
-		this.setAttribute("creator", creator);
+        this.setAttribute("creator", creator);
-		this.setAttribute("senders", creator);
+        this.setAttribute("senders", creator);
-		this.setAttribute("name", name);
+        this.setAttribute("name", name);
-	}
+    }
 
-	public Version getVersion() {
+    public Version getVersion() {
-		if (hasChild("description", Version.FT_3.namespace)) {
+        if (hasChild("description", Version.FT_3.namespace)) {
-			return Version.FT_3;
+            return Version.FT_3;
-		} else if (hasChild("description" , Version.FT_4.namespace)) {
+        } else if (hasChild("description", Version.FT_4.namespace)) {
-			return Version.FT_4;
+            return Version.FT_4;
-		} else if (hasChild("description" , Version.FT_5.namespace)) {
+        } else if (hasChild("description", Version.FT_5.namespace)) {
-			return Version.FT_5;
+            return Version.FT_5;
-		}
+        }
-		return null;
+        return null;
-	}
+    }
 
-	public void setTransportId(String sid) {
+    public void setTransportId(String sid) {
-		this.transportId = sid;
+        this.transportId = sid;
-	}
+    }
 
-	public Element setFileOffer(DownloadableFile actualFile, boolean otr, Version version) {
+    public Element setFileOffer(DownloadableFile actualFile, boolean otr, Version version) {
-		Element description = this.addChild("description", version.namespace);
+        Element description = this.addChild("description", version.namespace);
-		Element file;
+        Element file;
-		if (version == Version.FT_3) {
+        if (version == Version.FT_3) {
-			Element offer = description.addChild("offer");
+            Element offer = description.addChild("offer");
-			file = offer.addChild("file");
+            file = offer.addChild("file");
-		} else {
+        } else {
-			file = description.addChild("file");
+            file = description.addChild("file");
-		}
+        }
-		file.addChild("size").setContent(Long.toString(actualFile.getExpectedSize()));
+        file.addChild("size").setContent(Long.toString(actualFile.getExpectedSize()));
-		if (otr) {
+        if (otr) {
-			file.addChild("name").setContent(actualFile.getName() + ".otr");
+            file.addChild("name").setContent(actualFile.getName() + ".otr");
-		} else {
+        } else {
-			file.addChild("name").setContent(actualFile.getName());
+            file.addChild("name").setContent(actualFile.getName());
-		}
+        }
-		return file;
+        return file;
-	}
+    }
 
-	public Element getFileOffer(Version version) {
+    public Element getFileOffer(Version version) {
-		Element description = this.findChild("description", version.namespace);
+        Element description = this.findChild("description", version.namespace);
-		if (description == null) {
+        if (description == null) {
-			return null;
+            return null;
-		}
+        }
-		if (version == Version.FT_3) {
+        if (version == Version.FT_3) {
-			Element offer = description.findChild("offer");
+            Element offer = description.findChild("offer");
-			if (offer == null) {
+            if (offer == null) {
-				return null;
+                return null;
-			}
+            }
-			return offer.findChild("file");
+            return offer.findChild("file");
-		} else {
+        } else {
-			return description.findChild("file");
+            return description.findChild("file");
-		}
+        }
-	}
+    }
 
-	public void setFileOffer(Element fileOffer, Version version) {
+    public void setFileOffer(Element fileOffer, Version version) {
-		Element description = this.addChild("description", version.namespace);
+        Element description = this.addChild("description", version.namespace);
-		if (version == Version.FT_3) {
+        if (version == Version.FT_3) {
-			description.addChild("offer").addChild(fileOffer);
+            description.addChild("offer").addChild(fileOffer);
-		} else {
+        } else {
-			description.addChild(fileOffer);
+            description.addChild(fileOffer);
-		}
+        }
-	}
+    }
 
-	public String getTransportId() {
+    public String getTransportId() {
-		if (hasSocks5Transport()) {
+        if (hasSocks5Transport()) {
-			this.transportId = socks5transport().getAttribute("sid");
+            this.transportId = socks5transport().getAttribute("sid");
-		} else if (hasIbbTransport()) {
+        } else if (hasIbbTransport()) {
-			this.transportId = ibbTransport().getAttribute("sid");
+            this.transportId = ibbTransport().getAttribute("sid");
-		}
+        }
-		return this.transportId;
+        return this.transportId;
-	}
+    }
 
-	public Element socks5transport() {
+    public Element socks5transport() {
-		Element transport = this.findChild("transport",
+        Element transport = this.findChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
-				"urn:xmpp:jingle:transports:s5b:1");
+        if (transport == null) {
-		if (transport == null) {
+            transport = this.addChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
-			transport = this.addChild("transport",
+            transport.setAttribute("sid", this.transportId);
-					"urn:xmpp:jingle:transports:s5b:1");
+        }
-			transport.setAttribute("sid", this.transportId);
+        return transport;
-		}
+    }
-		return transport;
-	}
 
-	public Element ibbTransport() {
+    public Element ibbTransport() {
-		Element transport = this.findChild("transport",
+        Element transport = this.findChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
-				"urn:xmpp:jingle:transports:ibb:1");
+        if (transport == null) {
-		if (transport == null) {
+            transport = this.addChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
-			transport = this.addChild("transport",
+            transport.setAttribute("sid", this.transportId);
-					"urn:xmpp:jingle:transports:ibb:1");
+        }
-			transport.setAttribute("sid", this.transportId);
+        return transport;
-		}
+    }
-		return transport;
-	}
 
-	public boolean hasSocks5Transport() {
+    public boolean hasSocks5Transport() {
-		return this.hasChild("transport", "urn:xmpp:jingle:transports:s5b:1");
+        return this.hasChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
-	}
+    }
 
-	public boolean hasIbbTransport() {
+    public boolean hasIbbTransport() {
-		return this.hasChild("transport", "urn:xmpp:jingle:transports:ibb:1");
+        return this.hasChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
-	}
+    }
 }