fixes from tests: storing introductions in db

- minor fixes for removing queued and draft introductions
- remove expired notice when download has been completed

Author: Michael Farb

safeslinger-messenger/src/edu/cmu/cylab/starslinger/SafeSlinger.java

@@ -687,26 +687,35 @@ private class CleanupFailedMessagesTask extends AsyncTask<String, String, String
         @Override
         protected String doInBackground(String... arg0) {
             MessageDbAdapter dbMessage = MessageDbAdapter.openInstance(getApplicationContext());
-            Cursor c = dbMessage.fetchAllMessagesQueued();
+            Cursor c = dbMessage.fetchAllMessagesQueuedDraft();
             if (c != null) {
                 while (c.moveToNext()) {
-                    try {
-                        MessageData sendMsg = new MessageRow(c, true);
-
-                        // we can remove failed introductions, it is better if
-                        // the user starts over
-                        String[] types = sendMsg.getFileType().split("/");
-                        if (types.length == 2) {
-                            if (types[1]
-                                    .compareToIgnoreCase(SafeSlingerConfig.MIMETYPE_FUNC_SECINTRO) == 0) {
+                    MessageData failMsg = new MessageRow(c, false);
+                    if (!failMsg.isInbox()) {
+
+                        if (failMsg.getStatus() == MessageDbAdapter.MESSAGE_STATUS_QUEUED) {
+                            // queued messages should be converted back to
+                            // draft
+                            if (!dbMessage.updateDraftMessage(failMsg.getRowId(), null, failMsg)) {
+                                showNote(R.string.error_UnableToUpdateMessageInDB);
+                            }
+                        }
 
-                                // queued draft should be removed
-                                dbMessage.deleteMessage(sendMsg.getRowId());
+                        if (!TextUtils.isEmpty(failMsg.getFileType())) {
+                            // we can remove failed introductions, it is
+                            // better if the user starts over
+                            String[] types = failMsg.getFileType().split("/");
+                            if (types.length == 2) {
+                                if (types[1]
+                                        .compareToIgnoreCase(SafeSlingerConfig.MIMETYPE_FUNC_SECINTRO) == 0) {
+
+                                    // queued draft should be removed
+                                    dbMessage.deleteMessage(failMsg.getRowId());
+                                }
                             }
                         }
-                    } catch (OutOfMemoryError e) {
-                        e.printStackTrace();
                     }
+
                 }
                 c.close();
             }

safeslinger-messenger/src/edu/cmu/cylab/starslinger/model/MessageDbAdapter.java

@@ -432,15 +432,19 @@ public Cursor fetchAllMessagesUpgradeTo6() {
         }
     }
 
-    public Cursor fetchAllMessagesQueued() {
+    public Cursor fetchAllMessagesQueuedDraft() {
         synchronized (SafeSlinger.sDataLock) {
-            String where = KEY_STATUS + "=" + MESSAGE_STATUS_QUEUED;
+            StringBuilder where = new StringBuilder();
+            where.append(KEY_STATUS + "=" + MESSAGE_STATUS_DRAFT);
+            where.append(" OR ");
+            where.append(KEY_STATUS + "=" + MESSAGE_STATUS_QUEUED);
+
             Cursor c = query(true, DATABASE_TABLE, new String[] {
                     KEY_ROWID, KEY_DATE_RECV, KEY_DATE_SENT, KEY_ENCBODY, KEY_FILEDIR,
                     KEY_MSGHASH_BLOB, KEY_FILELEN, KEY_FILENAME, KEY_FILETYPE, KEY_KEYIDLONG,
                     KEY_PERSON, KEY_READ, KEY_SEEN, KEY_STATUS, KEY_TEXT, KEY_TYPE, KEY_KEYID,
                     KEY_MSGHASH, KEY_RETNOTIFY, KEY_RETPUSHTOKEN, KEY_RETRECEIPT
-            }, where, null, null, null, null, null);
+            }, where.toString(), null, null, null, null, null);
             if (c != null) {
                 if (c.moveToFirst()) {
                     return c;

safeslinger-messenger/src/edu/cmu/cylab/starslinger/view/MessagesAdapter.java

@@ -177,7 +177,9 @@ private void drawMessageItem(View convertView, MessageRow msg) {
         StringBuilder fileInfo = new StringBuilder();
         if (!TextUtils.isEmpty(msg.getFileName()) || msg.getFileSize() > 0) {
             fileInfo.append(msg.getFileName());
-            if (msg.isInbox() && TextUtils.isEmpty(msg.getFileDir())) {
+            if (msg.isInbox() && TextUtils.isEmpty(msg.getFileDir())
+                    && msg.getStatus() != MessageDbAdapter.MESSAGE_STATUS_FILE_DECRYPTED) {
+                // time to expire/expired only needed before download
                 fileInfo.append(timeLeft);
             }
         }