TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-15 10:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't display date for drafts in media preview

Browse Source 
Closes #6208
// FREEBIE
This commit is contained in:
FeuRenard 2017-02-10 15:02:48 +01:00 committed by Moxie Marlinspike
parent 917389131c
commit 98d223f094
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -629,6 +629,7 @@
<string name="MediaPreviewActivity_you">You</string> <string name="MediaPreviewActivity_you">You</string>
<string name="MediaPreviewActivity_cant_display">Failed to preview this image</string> <string name="MediaPreviewActivity_cant_display">Failed to preview this image</string>
<string name="MediaPreviewActivity_unssuported_media_type">Unsupported media type</string> <string name="MediaPreviewActivity_unssuported_media_type">Unsupported media type</string>
<string name="MediaPreviewActivity_draft">Draft</string>
<!-- MessageNotifier --> <!-- MessageNotifier -->
<string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d new messages in %2$d conversations</string> <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d new messages in %2$d conversations</string>

7
src/org/thoughtcrime/securesms/MediaPreviewActivity.java
View File

@ -106,7 +106,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
if (date > 0) { if (date > 0) {
relativeTimeSpan = DateUtils.getExtendedRelativeTimeSpanString(this,dynamicLanguage.getCurrentLocale(),date); relativeTimeSpan = DateUtils.getExtendedRelativeTimeSpanString(this,dynamicLanguage.getCurrentLocale(),date);
} else { } else {
relativeTimeSpan = null; relativeTimeSpan = getString(R.string.MediaPreviewActivity_draft);
} }
getSupportActionBar().setTitle(recipient == null ? getString(R.string.MediaPreviewActivity_you) getSupportActionBar().setTitle(recipient == null ? getString(R.string.MediaPreviewActivity_you)
: recipient.toShortString()); : recipient.toShortString());
@ -147,7 +147,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
mediaUri = getIntent().getData(); mediaUri = getIntent().getData();
mediaType = getIntent().getType(); mediaType = getIntent().getType();
date = getIntent().getLongExtra(DATE_EXTRA, System.currentTimeMillis()); date = getIntent().getLongExtra(DATE_EXTRA, -1);
size = getIntent().getLongExtra(SIZE_EXTRA, 0); size = getIntent().getLongExtra(SIZE_EXTRA, 0);
threadId = getIntent().getLongExtra(THREAD_ID_EXTRA, -1); threadId = getIntent().getLongExtra(THREAD_ID_EXTRA, -1);
@ -208,7 +208,8 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this, masterSecret); SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this, masterSecret);
saveTask.execute(new Attachment(mediaUri, mediaType, date)); long saveDate = (date > 0) ? date : System.currentTimeMillis();
saveTask.execute(new Attachment(mediaUri, mediaType, saveDate));
} }
}); });
} }