From 39b00c50f6f64e1d5a78c4e6f2f170de41839b3a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 17 May 2014 11:56:47 +0000
Subject: [PATCH] Improved sent mail detection, show email_status_text when set

---
 src/i2p/bote/android/EmailListAdapter.java | 16 +++++++------
 src/i2p/bote/android/util/BoteHelper.java  | 26 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/i2p/bote/android/EmailListAdapter.java b/src/i2p/bote/android/EmailListAdapter.java
index 655b1bf..406f3de 100644
--- a/src/i2p/bote/android/EmailListAdapter.java
+++ b/src/i2p/bote/android/EmailListAdapter.java
@@ -8,9 +8,9 @@ import java.util.List;
 import javax.mail.MessagingException;
 import javax.mail.Part;
 
+import i2p.bote.Util;
 import i2p.bote.android.util.BoteHelper;
 import i2p.bote.email.Email;
-import i2p.bote.email.EmailDestination;
 import i2p.bote.fileencryption.PasswordException;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -97,16 +97,18 @@ public class EmailListAdapter extends ArrayAdapter<Email> {
             }
 
             // Set email status if we sent it
-            String fromDest = EmailDestination.extractBase64Dest(fromAddress);
-            if (fromDest != null && BoteHelper.getIdentity(fromDest) != null) {
+            if (BoteHelper.isSentEmail(email)) {
                 TextView emailStatus = (TextView) v.findViewById(R.id.email_status_text);
                 if (email.isDelivered())
                     ((ImageView) v.findViewById(
                             R.id.email_status)).setVisibility(View.VISIBLE);
-                else if (email.getDeliveryPercentage() > 0)
-                    emailStatus.setText(email.getDeliveryPercentage() + "%");
-                else
-                    emailStatus.setText(BoteHelper.getEmailStatus(email));
+                else {
+                    if (email.getDeliveryPercentage() > 0)
+                        emailStatus.setText(email.getDeliveryPercentage() + "%");
+                    else
+                        emailStatus.setText(BoteHelper.getEmailStatus(email));
+                    emailStatus.setVisibility(View.VISIBLE);
+                }
             }
         } catch (MessagingException e) {
             subject.setText("ERROR: " + e.getMessage());
diff --git a/src/i2p/bote/android/util/BoteHelper.java b/src/i2p/bote/android/util/BoteHelper.java
index e575181..3dd44e1 100644
--- a/src/i2p/bote/android/util/BoteHelper.java
+++ b/src/i2p/bote/android/util/BoteHelper.java
@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
+import javax.mail.Address;
 import javax.mail.MessagingException;
 
 import android.content.Context;
@@ -12,6 +13,7 @@ import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.util.Base64;
 import i2p.bote.android.R;
+import i2p.bote.email.Email;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.fileencryption.PasswordException;
@@ -125,4 +127,28 @@ public class BoteHelper extends GeneralHelper {
         picture.compress(CompressFormat.PNG, 0, baos);
         return Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
     }
+
+    public static boolean isSentEmail(Email email) throws PasswordException, IOException, GeneralSecurityException, MessagingException {
+        // Is the sender anonymous and we are not the recipient?
+        if (email.isAnonymous()) {
+            Address[] recipients = email.getAllRecipients();
+            for (int i = 0; i < recipients.length; i++) {
+                String toDest = EmailDestination.extractBase64Dest(recipients[i].toString());
+                if (toDest != null && getIdentity(toDest) != null)
+                    // We are a recipient
+                    return false;
+            }
+            // We are not a recipient
+            return true;
+        }
+
+        // Are we the sender?
+        String fromAddress = email.getOneFromAddress();
+        String fromDest = EmailDestination.extractBase64Dest(fromAddress);
+        if ((fromDest != null && getIdentity(fromDest) != null))
+            return true;
+
+        // We are not the sender
+        return false;
+    }
 }