datatransfer: fix autoaccept

Change-Id: Ifb8b5566989e28efe4ba0ea5257018306830bf7a

ring-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.java

@@ -744,7 +744,7 @@ public class NotificationServiceImpl implements NotificationService {
             return;
         }
         InteractionStatus event = info.getStatus();
-        if (event == null) {
+        if (event == null || event == InteractionStatus.FILE_AVAILABLE) {
             return;
         }
         android.net.Uri path = ConversationPath.toUri(conversation);

ring-android/libringclient/src/main/java/net/jami/facades/ConversationFacade.java

@@ -590,7 +590,8 @@ public class ConversationFacade {
 
     private void handleDataTransferEvent(DataTransfer transfer) {
         Conversation conversation = mAccountService.getAccount(transfer.getAccount()).onDataTransferEvent(transfer);
-        if (transfer.getStatus() == Interaction.InteractionStatus.TRANSFER_CREATED && !transfer.isOutgoing()) {
+        Interaction.InteractionStatus status = transfer.getStatus();
+        if ((status == Interaction.InteractionStatus.TRANSFER_CREATED || status == Interaction.InteractionStatus.FILE_AVAILABLE) && !transfer.isOutgoing()) {
             if (transfer.canAutoAccept(mPreferencesService.getMaxFileAutoAccept(transfer.getAccount()))) {
                 mAccountService.acceptFileTransfer(conversation, transfer.getFileId(), transfer);
                 return;

ring-android/libringclient/src/main/java/net/jami/model/Interaction.java

@@ -66,9 +66,9 @@ public class Interaction {
     String mExtraFlag = new JsonObject().toString();
 
     // Swarm
-    private String mConversationId;
-    private String mMessageId;
-    private List<String> mParentIds;
+    private String mConversationId = null;
+    private String mMessageId = null;
+    private List<String> mParentIds = null;
 
     /* Needed by ORMLite */
     public Interaction() {

ring-android/libringclient/src/main/java/net/jami/services/AccountService.java

@@ -1553,6 +1553,7 @@ public class AccountService {
         }
         interaction.setContact(contact);
         interaction.setSwarmInfo(conversation.getUri().getRawRingId(), id, parents);
+        interaction.setConversation(conversation);
         if (conversation.addSwarmElement(interaction)) {
             if (conversation.isVisible())
                 mHistoryService.setMessageRead(account.getAccountID(), conversation.getUri(), interaction.getMessageId());
@@ -1670,6 +1671,8 @@ public class AccountService {
             boolean isIncoming = !interaction.getContact().isUser();
             if (isIncoming) {
                 incomingSwarmMessageSubject.onNext(interaction);
+                if (interaction instanceof DataTransfer)
+                    dataTransferSubject.onNext((DataTransfer)interaction);
             }
         }
     }