I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved sent mail detection, show email_status_text when set

Browse Source
This commit is contained in:
str4d
2014-05-17 11:56:47 +00:00
parent e6cbdffb5b
commit 39b00c50f6
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/i2p/bote/android/EmailListAdapter.java
View File

@@ -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());

26
src/i2p/bote/android/util/BoteHelper.java
View File

@@ -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;
}
}