TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-27 18:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,103 Commits 46 Branches 892 Tags 484 MiB
Commit Graph

1335 Commits

Author SHA1 Message Date
char32
7ff8c99055 Add the verizon MSISDN x-vzw-mdn header to MMS requests. 
Closes #4148
Fixes #3150
 2015-10-01 12:14:47 -07:00
Moxie Marlinspike
1fd8025cb5 No secure calls to yourself. 
Fixes #4156
// FREEBIE
 2015-10-01 11:14:11 -07:00
Jake McGinty
3035dc4df9 Experience upgrade splash screen. 
Behaves similarly to the DatabaseUpgradeActivity. You have a
static list of ExperienceUpgrade models that include a "trigger"
version, where when a user upgrades through it a notification
will appear, and there will be a splash explanation screen.

Right now the splash screens are basic and not too configurable,
but that can be reworked as upgrades demand.

Closes #4151
 2015-09-30 18:29:54 -07:00
Moxie Marlinspike
0b20e99cd2 Refresh attributes to signal voice support on update. 
// FREEBIE
 2015-09-30 18:24:40 -07:00
Moxie Marlinspike
e46caa024d Don't ring on incoming calls from blocked numbers 
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
31e20ca87e Distinguish between secure and insecure call in conversation menu. 
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
c87012ea69 Fixes #4142 
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
7f59983ce4 Fix for bluetooth NPE lollipop bug 
Fixes #4141
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
0402b45480 Simplify keyguard stuff. 
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
123c7b2119 Extract RedPhone string resources 
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
b68691bf05 Remove unnecessary volume level watcher. 
// FREEBIE
 2015-09-30 14:30:11 -07:00
Moxie Marlinspike
d9a3f5a3b8 Fix up security initialization stuff in ConversationActivity 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
4044da849e Replace all strings containing 'TextSecure' with 'Signal' 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
7377e6c7da Support for syncing and checking secure voice support. 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
ba67f108d4 Support unregistration from RedPhone 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
4fb5c6dd9a Tagify RedPhone classes. 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
826dc601c1 Remove dead RedPhone code. 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
26979b1c62 Log calls to conversations 
// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
36b7f767b6 Fixes for poorly merged behavior 
1) Fixed call in progress notification

2) Don't cache auth info in service

// FREEBIE
 2015-09-30 14:30:10 -07:00
Moxie Marlinspike
fdfa15aa4d Working proximity lock. 
// FREEBIE
 2015-09-30 14:30:09 -07:00
Moxie Marlinspike
961b9b882f Working bluetooth 
// FREEBIE
 2015-09-30 14:30:09 -07:00
Moxie Marlinspike
d83a3d71bc Support for Signal calls. 
Merge in RedPhone

// FREEBIE
 2015-09-30 14:30:09 -07:00
Jake McGinty
92422a939a trim threads in the right direction 
Closes #4143
// FREEBIE
 2015-09-28 16:59:06 -07:00
Jake McGinty
c6e2b5f6c5 fix more batch select click edge cases 
Closes #4122
// FREEBIE
 2015-09-27 09:08:05 -07:00
Jake McGinty
368f5c8dba setHasStableIds(false) 
because that shit is not stable
fixes #4128
// FREEBIE
 2015-09-25 17:10:36 -07:00
Jake McGinty
14f7c2d7a1 fix thumbnail click handling when batch selecting 
Closes #4118
// FREEBIE
 2015-09-24 15:59:48 -07:00
Jake McGinty
469c3298cc fix click interception logic to handle failures 
Closes #4111
// FREEBIE
 2015-09-24 14:12:09 -07:00
Moxie Marlinspike
92593d459b Remove the final vestiges of encrypted SMS 
Fixes #4026
// FREEBIE
 2015-09-24 14:12:09 -07:00
Jake McGinty
99d3374d35 migrate conversation list to RecyclerView 
fixes #2488
fixes #2333
// FREEBIE
 2015-09-24 14:12:09 -07:00
Matthias Voppichler
cbcd53a8a0 fixing duplicate system-contacts 
Fixes #4029
Closes #4072
 2015-09-24 14:12:09 -07:00
Moxie Marlinspike
50f079af8c Fix for AIOBE when language is no longer supported. 
// FREEBIE
 2015-09-24 13:58:14 -07:00
Jake McGinty
e574bcf15c initialize security in conversation first 
Closes #4108
// FREEBIE
 2015-09-23 12:03:45 -07:00
Jake McGinty
b55df9e186 don't cache preference for emoji 
Closes #4098
// FREEBIE
 2015-09-21 12:08:23 -07:00
Jake McGinty
9ea53d7b1e fix gingerbread view issues 
Closes #4085
// FREEBIE
 2015-09-20 19:40:32 -07:00
Jake McGinty
6ae38d0718 fix glide bitmap locking issue 
Closes #4086
// FREEBIE
 2015-09-20 19:08:40 -07:00
Jake McGinty
92b2da0286 download control details 
Closes #4063
// FREEBIE
 2015-09-17 12:51:57 -07:00
Moxie Marlinspike
0794380ca8 Listen for recipient changes in conversations and group updates. 
Closes #4079
// FREEBIE
 2015-09-17 12:22:35 -07:00
Jake McGinty
a7e05c4cd6 catch Camera RuntimeExceptions 
fixes #3895
Closes #4083
// FREEBIE
 2015-09-17 12:22:01 -07:00
Jake McGinty
336962eb55 fix EmojiEditText typo causing crash 
fixes #4078
// FREEBIE
 2015-09-17 12:22:01 -07:00
Jake McGinty
2d65464c04 fix attachment remove button alignment 
fixes #3597
Closes #4077
// FREEBIE
 2015-09-17 12:22:01 -07:00
Jake McGinty
415a61a09b TransferControlView 
Closes #4044
// FREEBIE
 2015-09-17 12:22:01 -07:00
Jake McGinty
f95435b0f1 show IME emoji button when using system 
Closes #4043
// FREEBIE
 2015-09-17 12:20:25 -07:00
Jake McGinty
e077cc6581 advanced pref to use android emoji 
// FREEBIE
 2015-09-17 12:20:25 -07:00
Jake McGinty
551274f167 Large attachment support 
Closes #4019
// FREEBIE
 2015-09-17 12:20:25 -07:00
Jake McGinty
0e06e2de97 fix queuing of pending parts that had data already 
fixes #4061
Closes #4073
// FREEBIE
 2015-09-14 18:06:03 -07:00
Jake McGinty
8933e03c02 prevent blocking recipient resolution on UI thread 
fixes #4058
Closes #4059
// FREEBIE
 2015-09-09 18:13:25 -07:00
Moxie Marlinspike
2c48155769 Bump version to 2.26.3 
// FREEBIE
 2015-09-09 17:14:55 -07:00
Moxie Marlinspike
16e258bdbc Only schedule a reminder if it's an alerting notification. 
// FREEBIE
 2015-09-09 16:53:00 -07:00
Jake McGinty
c418ca1890 fix thumbnail click 
fixes #4051
Closes #4053
// FREEBIE
 2015-09-09 16:52:53 -07:00
Jake McGinty
526f6e3058 don't try generating an in-progress part thumbnail 
Closes #4042
// FREEBIE
 2015-09-07 14:56:56 -07:00
Jake McGinty
21b7dccf1c fix persistent stale attachment jobs 
Closes #4041
// FREEBIE
 2015-09-07 14:37:53 -07:00
Jake McGinty
adc6fc8524 only allow thumbnail clicks when slide is present 
fixes #4024
Closes #4040
// FREEBIE
 2015-09-07 14:16:29 -07:00
Moxie Marlinspike
b5216ed7af Make recipient lookup asynchronous, add listener when appropriate. 
Fixes #4032

// FREEBIE
 2015-09-07 11:22:53 -07:00
Moxie Marlinspike
d4718c373a Fix for scanning provided identity 
Fixes #4028
// FREEBIE
 2015-09-06 21:26:43 -07:00
Jake McGinty
103686f89b damnit, glide. 
fixes #2957
// FREEBIE
 2015-09-04 12:47:48 -07:00
Jake McGinty
923d9fb07b fix crash on pending self-sent media 
fixes #4016
Closes #4017
// FREEBIE
 2015-09-04 11:42:58 -07:00
Moxie Marlinspike
5ef65f039d Run notification reminder broadcast in an AsyncTask 
Fixes #4016
// FREEBIE
 2015-09-04 09:40:59 -07:00
Jake McGinty
6d0e783236 fix GB StringSet compat issue. 
// FREEBIE
 2015-09-03 14:04:47 -07:00
Jake McGinty
80ce83ef9d Media download controls 
Closes #3991
// FREEBIE
 2015-09-03 11:40:55 -07:00
Sam Lanning
727c471234 Maintenance: Removed unused field in MediaPreviewActivity 
Closes #3934
// FREEBIE
 2015-09-02 12:51:30 -07:00
Sam Lanning
201da6f2a2 Maintenance: changed upcast to use method type parameter. 
Closes #3933
// FREEBIE
 2015-09-02 12:50:38 -07:00
Sam Lanning
99adbe5784 Made some inner classes static (For Efficiency) 
(and made one explicitly private)

Closes #3932
// FREEBIE
 2015-09-02 12:46:56 -07:00
Jake McGinty
0c9d9e8dcf use glide for encoding and resizing outgoing media 
Closes #3915
// FREEBIE
 2015-09-02 12:34:28 -07:00
Jake McGinty
1641fd91cf let ThumbnailView handle remove button placement 
Closes #3849
// FREEBIE
 2015-09-02 12:23:24 -07:00
Moxie Marlinspike
d6179bc12b Update notifications on background thread. 
// FREEBIE
 2015-08-12 10:44:27 -07:00
Moxie Marlinspike
82b74e8ce7 Fix NPE on media message with no media. 
Fixes #3921
// FREEBIE
 2015-08-10 09:33:57 -07:00
Jake McGinty
ae17b4b24a bright background for unread messages 
Closes #3909
// FREEBIE
 2015-08-07 17:15:50 -07:00
Moxie Marlinspike
58fd6f9273 Actually play the default notification sound. 
Fixes #3912
// FREEBIE
 2015-08-07 12:52:32 -07:00
Jake McGinty
edc47247f9 add thread/date multi-col SQLite indices 
Closes #3880
// FREEBIE
 2015-08-06 11:29:59 -07:00
Jake McGinty
107e202ab4 emojify!! emojify!? 
fixes #3802
Closes #3902
// FREEBIE
 2015-08-06 11:11:29 -07:00
Jake McGinty
3c400f958e handle null emojify inputs better 
fixes #3889
Closes #3901
// FREEBIE
 2015-08-06 10:51:05 -07:00
Moxie Marlinspike
973ed7686b Don't sync groups when there are no groups. 
Fixes #3882
// FREEBIE
 2015-08-06 10:20:13 -07:00
McLoo
716ed94ca1 Fix notification repeat 
by adding an undeniable truth
Until now we use the reminderCount as threadId and
 afterwards we updateNotification with a repeat count of always 0

Fixes #3893
Closes #3896
 2015-08-06 10:15:14 -07:00
McLoo
5fe1a28954 Fix broken multiple contact selection 
Increased tap area of action button too

Closes #3855
 2015-08-05 14:20:04 -07:00
agrajaghh
a820500ae0 finish MessageRecipientAsyncTask when context is destroyed 
Closes #3591

// FREEBIE
 2015-08-05 13:57:19 -07:00
Jake McGinty
f812efff3c only create DB readers as needed 
Closes #3730
// FREEBIE
 2015-08-05 13:48:07 -07:00
f41c0r
a3a7f8fb6c Add support to copy multiple messages 
Fixes #3748
Closes #3798

// FREEBIE
 2015-08-05 13:41:16 -07:00
Jake McGinty
00eb637e51 stop sync resolution of recipients on ui thread 
Closes #3885
// FREEBIE
 2015-08-05 13:14:21 -07:00
Moxie Marlinspike
f8bb065ffd Support for images in notifications. 
Closes #3859
Fixes #1858
// FREEBIE
 2015-08-05 13:08:28 -07:00
Moxie Marlinspike
120cde9917 Support for notification privacy settings. 
// FREEBIE
 2015-08-05 13:06:37 -07:00
Jake McGinty
d6d7ca19c1 reduce overdraw 
Closes #3856
// FREEBIE
 2015-08-05 13:05:01 -07:00
Jake McGinty
ec8b06e96c fix custom input race case 
fixes #3824
Closes #3851
// FREEBIE
 2015-08-05 13:00:58 -07:00
Jake McGinty
0c14639f9c fix GB half-screen cropping 
Closes #3848
// FREEBIE
 2015-08-05 12:56:26 -07:00
Jake McGinty
52e4abf562 prevent a thread race in CameraView 
when a camera preview surface is destroyed, send it down the same pipelien
to make sure a race condition isn't hit

fixes #3864
Closes #3875
// FREEBIE
 2015-08-03 13:50:02 -07:00
Heartsucker
9f3310f67a single initialization 
Closes #3794
// FREEBIE
 2015-07-30 10:18:38 -07:00
Geonu Kang
278214ef86 Improve multi-device strings consistency 
Fixes #3830
Closes #3840
// FREEBIE
 2015-07-30 10:15:50 -07:00
Moxie Marlinspike
99d3a76b56 Soften a few colors that are a bit too vibrant. 
Closes #3814
// FREEBIE
 2015-07-29 16:44:41 -07:00
Jake McGinty
a84dcf6a8e assert gif size constraints before OOMEs 
fixes #3778
closes #3833
// FREEBIE
 2015-07-29 16:17:27 -07:00
Jake McGinty
c36c759c8b fix EmojiTextView... 
Closes #3837
// FREEBIE
 2015-07-29 16:17:27 -07:00
Moxie Marlinspike
bbf33f88e0 Support for static RecipientDetails for certain shortcodes. 
Closes #3813
// FREEBIE
 2015-07-29 16:17:27 -07:00
agrajaghh
e2e5aa32a8 fix icon for "Take Photo" in the attachment dialog and 
also change "Take Photo" to "Camera"

fixes #3819
closes #3820

// FREEBIE
 2015-07-29 16:17:27 -07:00
Moxie Marlinspike
e88a7c3fd7 Update blocked contact list item on main thread. 
Fixes #3825
// FREEBIE
 2015-07-29 16:17:27 -07:00
Jake McGinty
98393ba2e1 fix new QAD layout issues 
fixes #3707
// FREEBIE
 2015-07-29 16:17:27 -07:00
Jake McGinty
e145b8171d revert emoji ellipsizing temporarily 
it doesn't react to layout changes correct, better
to not have it for the time being.

closes #3718
closes #3812
// FREEBIE
 2015-07-29 16:17:27 -07:00
Jake McGinty
5cf95f5b3d fix issue with camera controls going missing 
fixes #3775
Closes #3823
// FREEBIE
 2015-07-29 16:17:27 -07:00
Jake McGinty
8fbc14b191 enable half preview in GB 
Closes #3826
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
30f2c71861 work around weird GB layout limitations 
that was freaking annoying

// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
d4fc12f56c unbreak build 
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
7c32e5b1fb support variable keyboard heights 
Fixes #3661
Closes #3822
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
13bad6dfed Smooth transition for custom keyboards and softkey 
Closes #3786
Fixes #3780
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
24e14cbc73 fix gif NPE 
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
a2d63d117b fix rounded corners memory thrash 
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
cc5d779050 add previewFormat logging to QuickCamera 
Closes #3760
//FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
2c41394892 inflate transport popup opportunistically 
Closes #3763
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
454c604b86 asyncify reminderView 
Closes #3762
// FREEBIE
 2015-07-29 16:17:26 -07:00
Jake McGinty
f13ad54ba1 ditch RoundedImageView, make animated gifs work 
// FREEBIE
 2015-07-29 16:17:26 -07:00
Moxie Marlinspike
7de1683195 Add recipient listener to ConversationItem 
Fixes #3626
// FREEBIE
 2015-07-29 16:17:26 -07:00
Moxie Marlinspike
b1f336c874 Fix color selection dialog on GB. 
Fixes #3626
// FREEBIE
 2015-07-29 16:17:26 -07:00
Moxie Marlinspike
39ac2b5042 Expand tap target of contact selection keyboard toggles. 
Fixes #3750
// FREEBIE
 2015-07-29 16:17:26 -07:00
Moxie Marlinspike
c27459a760 Enable PTR for JB+ 
Fixes #3754
// FREEBIE
 2015-07-29 16:17:26 -07:00
Moxie Marlinspike
156a86013f Add phone number type to contacts DB to fix HTC bug. 
Fixes #3784
// FREEBIE
 2015-07-24 10:39:29 -07:00
Jake McGinty
6c5daf5ed6 👀 the 💥😐 
fixes #3753
closes #3758
// FREEBIE
 2015-07-22 12:39:48 -07:00
Moxie Marlinspike
3bac3c6263 Don't leak activity context to shortcut badger. 
// FREEBIE
 2015-07-22 12:24:41 -07:00
Moxie Marlinspike
d2a728fc08 Display notification after upgrade migration w/ password. 
// FREEBIE
 2015-07-21 16:03:56 -07:00
Jake McGinty
4840cdd293 fix layout ellipsis errors 
fixes #3718
closes #3743
// FREEBIE
 2015-07-21 14:38:23 -07:00
Moxie Marlinspike
f04281ac4a Resolve names off Recipient objects in contact selection. 
Fixes #3715
// FREEBIE
 2015-07-21 13:30:29 -07:00
Jake McGinty
4f75ea0fd0 fix emoji resizing in EditTexts 
fixes #3720
closes #3741
// FREEBIE
 2015-07-21 13:09:21 -07:00
Jake McGinty
12b8eee86f fix enter send behaviour 
fixes #3725
closes #3735
// FREEBIE
 2015-07-21 12:07:21 -07:00
Moxie Marlinspike
90d5e9dccd Fix for double notification when locked. 
Fixes #3702
// FREEBIE
 2015-07-20 18:00:48 -07:00
Moxie Marlinspike
1daea51cfb Switch to "home as up" button on new contact selection activity. 
Fixes #3687
// FREEBIE
 2015-07-20 17:29:41 -07:00
Moxie Marlinspike
905b4f0a6b Close open prekey FD during migration. 
Fixes #3696
// FREEBIE
 2015-07-20 17:01:35 -07:00
Moxie Marlinspike
dcc7ba20e6 Update disable passphrase strings. 
Fixes #3705
// FREEBIE
 2015-07-20 16:58:08 -07:00
Moxie Marlinspike
39dec1059b Show soft keyboard on toggle when hidden. 
Closes #3706
// FREEBIE
 2015-07-20 16:49:58 -07:00
Moxie Marlinspike
f4104f696e Search TextSecure contacts by name or number. 
Fixes #3710
// FREEBIE
 2015-07-20 16:41:05 -07:00
Max Muth
f22c9af136 Enable transition for "home" in RecipientPreferencesActivity. 
Fixes #3523
Closes #3701
//FREEBIE
 2015-07-20 16:17:04 -07:00
Jake McGinty
39c0fc0e5a add sane default emoji panel size 
fixes #3661
Closes #3691
// FREEBIE
 2015-07-20 16:12:29 -07:00
Jake McGinty
580a3182ab avoid excessive attribute resolution 
Closes #3729
// FREEBIE
 2015-07-20 16:08:11 -07:00
Jake McGinty
83919c087d update controls properly on orientation change 
fixes #3697
closes #3732
// FREEBIE
 2015-07-20 16:05:38 -07:00
Moxie Marlinspike
fda900e95d Fix for receiving message after upgrade with no MS set. 
// FREEBIE
 2015-07-17 18:02:17 -07:00
Moxie Marlinspike
beb3558d01 Fix missing strings. 
// FREEBIE
 2015-07-17 17:46:02 -07:00
Jake McGinty
7ff484c0c7 fix incoming progress indicator 
Closes #3685
// FREEBIE
 2015-07-17 10:23:51 -07:00
Moxie Marlinspike
f7e34a707d Don't blow away entire recipient cache on clear event. 
Switch to marking recipients as "dirty" instead.

// FREEBIE
 2015-07-17 10:16:14 -07:00
Moxie Marlinspike
73bc7220db Force explicit raw contact aggregation when possible. 
1) Don't add registered numbers that aren't already contacts.

2) When adding raw contacts, force aggregation to an existing
   raw contact.

// FREEBIE
 2015-07-16 22:40:04 -07:00
Moxie Marlinspike
f2a323ef7f Disable pull to refresh for GB devices. 
Doesn't work well on GB. Google wrote it so that's no surprise.

// FREEBIE
 2015-07-16 22:36:40 -07:00
Moxie Marlinspike
15345f874f Fix identity key migration code. 
// FREEBIE
 2015-07-16 12:56:23 -07:00
Jake McGinty
534ac22fd2 fix hint not ellipsizing 
Closes #3672
// FREEBIE
 2015-07-16 11:58:58 -07:00
Moxie Marlinspike
b0f7df93a4 Update migration versions. 
// FREEBIE
 2015-07-16 11:17:04 -07:00
zipperle
ff4929fcce URL decode numbers in quick response. 
Fixes #3518
Closes #3522
 2015-07-16 11:15:56 -07:00
Jake McGinty
1a7ab6346f re-enable direct capture 
Closes #3664
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
47b21707be Use InputType class mask constants. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
8b986ae094 Consistent 'this'ing. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
32cb489d1d Make directory refresh async task more careful. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
0e7fcc6893 Extract string resource. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
fe552ba53f Add contacts to contact provider on upgrade. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
410ec57f80 Don't create a canonical id for every character typed. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
2ef0054840 Update look of contact selection activities. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
704f2b91e2 Clean up contact queries. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
d1940fe0f9 Support for populating contacts DB with TS account type. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
8d9ae731ef Only use MasterSecret for local message encryption. 
Not for the axolotl store.

// FREEBIE
 2015-07-16 11:15:56 -07:00
Jake McGinty
44bfac9fe6 use better ImageView properties 
should reduce memory consumption

Closes #3671
// FREEBIE
 2015-07-15 17:33:52 -07:00