fixed file edit and a reply scenario

- Corrected file editing and reloading.
- Fixed #106, allowing reply attempt for previously unregistered
devices.

Author: Michael Farb

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

@@ -205,6 +205,8 @@ public long createDraftMessage(RecipientRow recip, MessageData msg, long submitT
                 if (msg.getFileName() != null)
                     values.put(KEY_FILENAME, msg.getFileName()); // name of file
 
+                values.put(KEY_FILELEN, msg.getFileSize()); // len encoded file
+
                 if (msg.getFileType() != null)
                     values.put(KEY_FILETYPE, msg.getFileType()); // file mime
                                                                  // type
@@ -240,6 +242,8 @@ public boolean updateDraftMessage(long rowId, RecipientRow recip, MessageData ms
                 if (msg.getFileName() != null)
                     values.put(KEY_FILENAME, msg.getFileName()); // name of file
 
+                values.put(KEY_FILELEN, msg.getFileSize()); // len encoded file
+
                 if (msg.getFileType() != null)
                     values.put(KEY_FILETYPE, msg.getFileType()); // file mime
                                                                  // type

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

@@ -433,7 +433,6 @@ public void processIntent(Intent intent) {
     public void setProperDefaultTab() throws SQLException {
         // if nothing else, make sure proper default tab is selected
         RecipientDbAdapter dbRecipient = RecipientDbAdapter.openInstance(getApplicationContext());
-        MessageDbAdapter dbMessage = MessageDbAdapter.openInstance(getApplicationContext());
 
         if (dbRecipient.getTrustedRecipientCount() == 0) {
             // Sling Keys should be the default when there are 0 keys
@@ -1842,7 +1841,17 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                             try {
                                 if (c.moveToFirst()) {
                                     RecipientRow recip = new RecipientRow(c);
+                                    if (recip != null && recip.getNotRegDate() > 0) {
+                                        // reset registration to 0 to enable
+                                        // test reply
+                                        if (!dbRecipient.updateRecipientRegistrationState(
+                                                recip.getRowId(), true)) {
+                                            showNote(R.string.error_UnableToUpdateMessageInDB);
+                                        }
+                                        recip.setNotRegDate(0L);
+                                    }
                                     d.setRecip(recip);
+
                                     CheckRegistrationStateTask task = new CheckRegistrationStateTask();
                                     task.execute(recip);
                                     if (requestCode == VIEW_RECIPSEL_FORFILE_ID

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

@@ -694,6 +694,13 @@ public void run() {
 
                                         } else if (mDraft != null
                                                 && mDraft.getRowId() == messageRow.getRowId()) {
+                                            // file data must reloaded from db,
+                                            // text message is edited on this ui
+                                            mDraft.setFileData(messageRow.getFileData());
+                                            mDraft.setFileDir(messageRow.getFileDir());
+                                            mDraft.setFileName(messageRow.getFileName());
+                                            mDraft.setFileSize(messageRow.getFileSize());
+                                            mDraft.setFileType(messageRow.getFileType());
                                             // draft has already been updated
                                             continue;