TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,810 Commits 46 Branches 892 Tags 481 MiB
43ebcfdee5
Commit Graph

725 Commits

Author SHA1 Message Date
Moxie Marlinspike
64c8b4b2ef Support for selective permissions 2017-11-30 10:26:41 -08:00
Moxie Marlinspike
886298674e Adjust inbox zero empty state 2017-11-30 10:26:41 -08:00
Moxie Marlinspike
80042ae3aa Display action mode over toolbar 
Fixes #7198
 2017-11-19 18:19:01 -08:00
Moxie Marlinspike
86bd2351bc Replace answer/decline button and action for incoming calls 
Fixes #7199
 2017-11-19 16:32:22 -08:00
Moxie Marlinspike
cf81815bf6 Add recent chats to top of share list 2017-11-16 15:21:46 -08:00
Moxie Marlinspike
c5a9f27c31 Catch some activity not found exceptions for expired builds 2017-11-16 12:31:42 -08:00
Moxie Marlinspike
de812d3f0f Extract string resources 2017-11-16 12:28:29 -08:00
Moxie Marlinspike
2da47c3bb3 Fix share list crash and update look/feel 
Fixes #7195
 2017-11-16 12:22:09 -08:00
Moxie Marlinspike
1986e58c5f Remove unused resources 
According to Android Studio
 2017-11-14 11:43:25 -08:00
Moxie Marlinspike
b88069f396 Revert "Remove unused resources" 
AS seems to have miscalculated

This reverts commit 344af622b7.
 2017-11-14 11:29:20 -08:00
Moxie Marlinspike
344af622b7 Remove unused resources 
Or so says Android Studio
 2017-11-14 11:15:03 -08:00
Moxie Marlinspike
534dec282f Brighten light theme 
1) Brighten background color

2) Add unread indicator in conversation list

3) Eliminate some conversation list overdraw
 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
03573df00f Add inset dividers in conversation list 
Closes #7074
 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
6b94d0679c Remove unused resource 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
405ee3b741 Improve search bar visibility 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
9a75f49aa1 Add an empty state for search 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
9c50057909 Add an empty state for archived 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
bb878f8a67 Adjust Conversation List toolbar to match RecyclerView alignment 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
3097c2855e Add empty state for conversation list 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
90ff0e58b0 Update registration flow 2017-11-14 10:50:17 -08:00
Moxie Marlinspike
5711adb2c9 Fix profile out of memory errors on low mem devices 
Fixes #7094
// FREEBIE
 2017-10-15 10:00:03 -07:00
Moxie Marlinspike
77c232760c No documents found -> No documents 
// FREEBIE
 2017-10-09 10:38:36 -07:00
Moxie Marlinspike
cee3858e2e Fix mysteriously missing string content 
// FREEBIE
 2017-10-04 12:27:45 -07:00
FeuRenard
d71fb4c958 Adjust dark themed NoActionBar activities 
// FREEBIE
 2017-10-04 11:50:55 -07:00
Moxie Marlinspike
677c7732cf Update incognito keyboard string 
Fixes #7037
// FREEBIE
 2017-10-04 11:21:03 -07:00
Moxie Marlinspike
ba849bce2c Add support for incognito keyboard preference 
Closes #6985
// FREEBIE
 2017-10-03 18:57:23 -07:00
Moxie Marlinspike
b3147aad55 Make "Shared media" string translatable 
// FREEBIE
 2017-10-03 16:29:11 -07:00
Moxie Marlinspike
2e56a0aa70 Fix typo 
// FREEBIE
 2017-10-02 09:58:08 -07:00
Moxie Marlinspike
2b4064f3b7 Add splash screen for read receipts 
// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
8ce914a344 Refactor media overview activity to display documents 
// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
c6b2e785a5 Reorganize conversation media activity to have sticky headers 
// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
4828a8a274 Add conversation media photo rail to recipient preferences 
// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
a1c276f70b Update to V7 PreferencesCompat library 
// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
cb9bc9659b Support for read receipts 
// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
65124fd1f2 Redesign conversation and conversation preferences layouts 
Remove avatars from conversation items unless in a group chat.

// FREEBIE
 2017-10-01 22:36:52 -07:00
Moxie Marlinspike
967c374213 Display error when camera doesn't return image 
Partial #6926
// FREEBIE
 2017-09-06 16:03:08 -07:00
Moxie Marlinspike
19be527370 Fix recursive experience upgrade activity problem 
// FREEBIE
 2017-09-06 00:29:49 -07:00
Moxie Marlinspike
2add02c62f Add splash screen for setting profiles 
// FREEBIE
 2017-09-03 19:45:43 -07:00
Moxie Marlinspike
beed9d8034 Add length limit feedback when setting profile name 
// FREEBIE
 2017-08-28 10:30:50 -07:00
Moxie Marlinspike
64ad9ec9dd Add group profile sharing logic 
// FREEBIE
 2017-08-28 10:30:50 -07:00
Moxie Marlinspike
1b2f52209d Display unknown sender footer for unknown senders 
// FREEBIE
 2017-08-28 10:30:50 -07:00
Moxie Marlinspike
c11f2eddf5 Display user profile information in settings activity 
Allow for editing

// FREEBIE
 2017-08-28 10:30:50 -07:00
Moxie Marlinspike
df99deb480 Insert profile creation into registration flow, fix capture 
// FREEBIE
 2017-08-28 10:30:50 -07:00
Christian Ascheberg
95d48bd3e9 Improve wording of joined contact notification 
Fixes #6757
Closes #6764
// FREEBIE
 2017-07-05 14:18:07 -07:00
RiseT
52311eb881 "Message notifications" >> "Messages" 
Closes #6700
// FREEBIE
 2017-06-12 09:52:46 -07:00
Moxie Marlinspike
414a885b54 Make string plural 
// FREEBIE
 2017-06-12 09:49:04 -07:00
Moxie Marlinspike
59d3e666fe Rename 'verify safety number' to 'view safety number' 
// FREEBIE
 2017-06-09 19:58:05 -07:00
Moxie Marlinspike
76c28cfa7a Add support for SN verification 
// FREEBIE
 2017-06-09 19:58:01 -07:00
Moxie Marlinspike
73410f64b5 Display a notification when unable retrieve messages for push 
Fixes #6684
// FREEBIE
 2017-05-31 14:51:48 -07:00
Christian Ascheberg
662fe826cb Fix conversation list safety number change snippet for groups 
Fixes #5985
Closes #6655
// FREEBIE
 2017-05-31 14:51:48 -07:00
Joan Montané
6ede47d4f7 FREEBIE: Add Catalan to language selector 
Closes #6612
 2017-05-06 14:08:43 -07:00
Mateo Hernandez
b17cba621e Show emoji-only messages larger 
Closes #6531
// FREEBIE
 2017-04-26 17:52:16 -07:00
Mateo Hernandez
869630b7f4 Tint and resize import/export icons 
Closes #6567
// FREEBIE
 2017-04-26 10:27:30 -07:00
Moxie Marlinspike
03e347bfd9 s/Document/File 
// FREEBIE
 2017-04-23 16:28:10 -07:00
Moxie Marlinspike
25c7459464 Add support for notification priority preference 
Fixes #6315
// FREEBIE
 2017-04-21 23:05:59 -07:00
Moxie Marlinspike
2dceef50b7 Slim down some preference screens 
// FREEBIE
 2017-04-21 23:05:59 -07:00
Moxie Marlinspike
d00671e7a5 Tweak attachment type selector look 
// FREEBIE
 2017-04-21 23:05:59 -07:00
Moxie Marlinspike
2b79e131a7 Support for sending arbitrary file types 
// FREEBIE
 2017-04-21 23:05:59 -07:00
Ahmed Ibrahim Khalil
c3164a8e84 Support copying links on long click. 
Fixes #6343
Closes #6454
 2017-04-21 23:05:59 -07:00
Mateo Hernandez
a353ebd834 Add tint to preference icons 
Closes #6540
// FREEBIE
 2017-04-21 23:05:59 -07:00
Mateo Hernandez
9716849bb9 Fix preference divider crash on KitKat 
Closes #6546
Fixes #6544
// FREEBIE
 2017-04-19 18:08:44 -07:00
Moxie Marlinspike
8aab61c2e3 Make preference category card dividers more dark theme compatible 
// FREEBIE
 2017-04-17 15:31:54 -07:00
RiseT
9d3ff55457 Make "Contact joined Signal" translatable 
Closes #6534
// FREEBIE
 2017-04-17 10:29:34 -07:00
Mateo Hernandez
19c7fd21a8 Update preference screen icons 
Closes #6538
// FREEBIE
 2017-04-17 10:27:02 -07:00
Moxie Marlinspike
f583c14e0e s/text/font size 
// FREEBIE
 2017-04-16 12:54:42 -07:00
Moxie Marlinspike
fe1cc3d6d1 Adjust compose field look 
1) Align top of compose bubble with top of attach/send icon

2) Simplify hint

3) Make hint size same as input size

// FREEBIE
 2017-04-15 10:12:00 -07:00
Moxie Marlinspike
5f5db5ded7 Support for message body text size preference 
// FREEBIE
 2017-04-14 22:59:30 -07:00
Moxie Marlinspike
e5a287b4e5 Add preference for SMS invitation prompt 
// FREEBIE
 2017-04-14 20:51:22 -07:00
Moxie Marlinspike
13d785894a Fix up preference screen a little 
1) Remove phantom padding on left margin for all fragments

2) Move preferences around slightly

3) Add some card separators and style led list pref

// FREEBIE
 2017-04-14 20:39:38 -07:00
Taylor Kline
b7f9525680 Remove unused summary field for notification. 
Closes #6481
 2017-04-10 10:45:18 -07:00
Moxie Marlinspike
ce9a67d095 Fix case 
// FREEBIE
 2017-04-02 18:26:28 -07:00
Moxie Marlinspike
75782affd1 Adjust joined signal string 
// FREEBIE
 2017-03-31 08:54:07 -07:00
Paride Legovini
9d52e6af6a Don't mention CyanogenMod 
Closes #6422
// FREEBIE
 2017-03-30 18:50:40 -07:00
Moxie Marlinspike
3aae86d20c Update registration activity style 
// FREEBIE
 2017-03-30 18:18:04 -07:00
Moxie Marlinspike
f67eb5f9f3 Support for receiving arbitrary attachment types 
// FREEBIE
 2017-03-29 18:17:34 -07:00
greenjoe
deb96646a3 Add action indicator when resending a message. 
When message is being resent, "RESEND" button now disappears.
"Resending..." text is displayed instead of an error message.

Fixes #6307
Closes #6347
 2017-03-16 15:27:26 -07:00
FeuRenard
52b1e17c36 Unify alert dialog button colors 
Fixes #5227
Closes #5415
// FREEBIE
 2017-03-15 16:57:11 -07:00
Moxie Marlinspike
9273f5cc67 Switch import/export activity from tabs to cards 
// FREEBIE
 2017-03-15 16:53:15 -07:00
Christian Ascheberg
3506f2db12 Improve group update descriptions 
Closes #5416
// FREEBIE
 2017-03-14 14:26:14 -07:00
RiseT
a41e82bb7d Make WebRtcCallScreen_new_safety_numbers_title singular 
Closes #6364
// FREEBIE
 2017-03-14 13:42:39 -07:00
mcloo
7ae0f38c45 Update language list 
Closes #6055
 2017-03-07 13:20:44 -08:00
Moxie Marlinspike
ed5faa4ba9 Add video calling intro screen 
// FREEBIE
 2017-03-06 12:32:09 -08:00
Moxie Marlinspike
9b8719e2d5 Support for website distribution build with auto-updating APK 
// FREEBIE
 2017-02-27 23:53:36 -08:00
haffenloher
76ac95756f Fix last seen divider crash on Android <5.0 
Apparently, it's not possible to reference an attribute in an xml
drawable on API <21, so we have to use separate light and dark theme
drawables instead.

Closes #6285
 2017-02-22 17:57:42 +01:00
Moxie Marlinspike
4ee607878c Fix unread message conversation separator for dark theme 
Fixes #6265
// FREEBIE
 2017-02-21 12:37:40 -08:00
Moxie Marlinspike
b27d829013 Extract some strings for localization 
// FREEBIE
 2017-02-20 13:59:23 -08:00
Moxie Marlinspike
1669731329 Support for using Signal without Play Services 
This is now possible with beta calling, so non-GCM users are a
part of beta calling by default.

// FREEBIE
 2017-02-20 12:00:03 -08:00
Moxie Marlinspike
f541e33356 Publish TURN-only ICE candidates in some situations 
1) Incoming call is from a number not in user's address book

2) Turn-only preference is enabled for all incoming/outgoing calls

// FREEBIE
 2017-02-19 12:29:33 -08:00
haffenloher
83e31cac07 Show videos in media overview 
Fixes #5941
Closes #6152
// FREEBIE
 2017-02-19 12:29:33 -08:00
FeuRenard
98d223f094 Don't display date for drafts in media preview 
Closes #6208
// FREEBIE
 2017-02-19 12:29:33 -08:00
RiseT
917389131c Fix some wording for group conversations 
Closes #6204
Fixes #6193

// FREEBIE
 2017-02-19 12:29:33 -08:00
haffenloher
9c1f7f1657 Make VideoPlayer toast error message translatable 
Closes #6150
// FREEBIE
 2017-02-19 12:29:33 -08:00
Moxie Marlinspike
8bf160532e Make safety numbers singular in webrtc call screen 
Closes #6148
// FREEBIE
 2017-02-19 12:29:33 -08:00
Moxie Marlinspike
d9b42c4369 Support for a "new messages" divider in conversations 
// FREEBIE
 2017-02-19 12:29:33 -08:00
Moxie Marlinspike
f3e47f7b60 Support for minimized controls during video call 
// FREEBIE
 2017-02-11 20:48:42 -08:00
Moxie Marlinspike
ea0945d406 Beta support for webrtc video and voice calling 
// FREEBIE
 2017-02-01 13:55:52 -08:00
Moxie Marlinspike
e2b81c9637 Update look and feel of fast-scroll-to-bottom 
Closes #6086
// FREEBIE
 2017-01-24 11:05:32 -08:00
Stuart Gilbert
aa9d8e4d14 Add scroll to bottom button in conversation view 
Added a FloatingActionButton to the conversation_fragment
that appears and disappears using the same logic as the
existing compose divider: appear when the conversation list
is scrolled away from the bottom, disappear when the list is
scrolled to the bottom.

Fixes #5651
 2017-01-24 11:05:03 -08:00
Moxie Marlinspike
4c815db076 Support for sticky date headers 
Closes #4696
// FREEBIE
 2017-01-23 16:44:38 -08:00
Moxie Marlinspike
dadc8d0183 Refactor "unnamed" group logic 
// FREEBIE
 2017-01-22 21:23:51 -08:00
RiseT
333a0f38e3 Remove one ellipsis I've overlooked in #5887 
Closes #6052
// FREEBIE
 2017-01-21 10:13:40 -08:00
Moxie Marlinspike
235a8472d9 Remove dedicated MMS download controls 
// FREEBIE
 2017-01-20 15:26:17 -08:00
RiseT
49e78d16ba Remove redundant ellipses in strings according to Material guidelines 
Quote :
"Use to indicate an action in progress ("Downloading…") or
 incomplete or truncated text. No space before the ellipses.

 Omit from menu items or buttons that open a dialog or start
  some other process.

 Midline ellipses (three-bullet glyphs) are also used to represent
 numeric truncation and the redaction of sensitive data, such as
 credit cards."

 https://material.google.com/style/writing.html

Closes #5887
// FREEBIE
 2017-01-12 10:38:49 -08:00
FeuRenard
bd819d7d10 Disable verify button if no message was exchanged 
Fixes #5878
Closes #5951
// FREEBIE
 2017-01-11 18:51:11 -08:00
FeuRenard
477589b092 Color passphrase prompt text field blue 
Closes #5424
// FREEBIE
 2017-01-02 17:17:48 -08:00
FeuRenard
cde92256a6 Convert file save toast string to plural 
Closes #5961
// FREEBIE
 2017-01-02 17:17:48 -08:00
RiseT
e8555a84ac Make description strings in audio_view.xml translatable. 
Closes #5916
// FREEBIE
 2016-12-15 10:41:18 -08:00
Paul Lanctot
73bf75f65f Accessible content labels for attachment icons 
Fixes #5908
Closes #5917
// FREEBIE
 2016-12-14 20:56:37 -08:00
Amire80
71276161fc Remove comma splice from an English interface string 2016-12-12 17:44:04 -08:00
Moxie Marlinspike
f7474362ff Updated emoji set 
// FREEBIE
 2016-12-12 17:37:27 -08:00
Moxie Marlinspike
1b44bdcd3c Support for stickers and scribbles 
// FREEBIE
 2016-12-12 17:37:00 -08:00
Nicholas Rizzio
2197d77ffc Fix the content description of the audio record button 
Fixes #5910
Closes #5911
// FREEBIE
 2016-12-04 18:12:48 -08:00
FeuRenard
09ff8d5865 Add gallery button to MediaPreview 
// FREEBIE
 2016-11-28 09:42:26 -08:00
RiseT
43e1d452c7 Change DateUtils string 'Now' to 'Just now' 
Changes the DateUtils string 'Now' to 'Just now' which is a better fit
imho.
Used for messages in the conversation view that e. g. just have been
received.

// FREEBIE

Closes #5761
 2016-11-28 09:16:38 -08:00
Moxie Marlinspike
8b342ee18b Support for "recent photos" thumbnailsabove attachment selector 
// FREEBIE

Closes #5893
 2016-11-27 19:37:31 -08:00
RiseT
e8ae6d67b1 Change safety number strings to be singular 
// FREEBIE

Closes #5894
 2016-11-27 19:35:54 -08:00
Moxie Marlinspike
8af9b7fd15 Improve animations on audio controls, enable push to talk 
// FREEBIE
 2016-11-21 18:58:10 -08:00
Moxie Marlinspike
8fdcff9f20 If Signal isn't enabled for receiving SMS, don't allow sending SMS 
Closes #5877
// FREEBIE
 2016-11-21 08:56:21 -08:00
Moxie Marlinspike
b55a7ff5c0 Add copy and compare safety numbers from clipboard actions 
// FREEBIE
 2016-11-14 19:50:29 -08:00
Moxie Marlinspike
cb28e7c1f9 Update libsignal-service to 2.4.0 
// FREEBIE
 2016-11-13 10:58:51 -08:00
FeuRenard
92aeafc261 Add share button for safety numbers 
Fixes #5798
Closes #5854
// FREEBIE
 2016-11-13 10:42:40 -08:00
FeuRenard
f5966af781 Allow 2nd person conjugation in timer messages 
Fixes #5658
// FREEBIE
 2016-11-11 18:37:16 -08:00
RiseT
2d104d3783 "No results found." --> "Nothing found" 
Closes #5814

// FREEBIE
 2016-11-11 18:34:03 -08:00
Amire80
5d1cfb50a9 Change "GiF" to "GIF" in an English user interface string 
Closes #5830
 2016-11-11 18:14:31 -08:00
FeuRenard
a3244de587 Add forward button to MediaPreview 
Closes #5833
Related to #4906
// FREEBIE
 2016-11-11 18:03:20 -08:00
mateoeh
0a72f6b32e Add shadow under compose view on scroll 
Fixes #5098
Closes #5796
// FREEBIE
 2016-10-24 16:10:51 -07:00
Moxie Marlinspike
69d0242574 Giphy integration 
// FREEBIE
 2016-10-18 10:28:42 -07:00
RiseT
8e1970c398 Make message and thread records for changed safety numbers translatable 
Fixes #5769
Closes #5771

Makes the message and thread records for 'Your safety numbers with %s
have changed' translatable.

// FREEBIE
 2016-10-10 10:16:23 -07:00
RiseT
e3da0ac908 Make 'Disappears' in message details translatable 
Fixes #5755
Closes #5756

// FREEBIE
 2016-10-07 10:42:05 -07:00
Moxie Marlinspike
2b4d41de03 Safety number string fixes 
// FREEBIE
 2016-09-25 19:50:03 -07:00
RiseT
8fe96fc1b7 String improvement: Blocking and unblocking contacts 
This fixes/improves several strings related to blocking and unblocking
contacts regarding:

- Wording consistency
- Compliance with Google's Design Guidelines
- Clarity

Closes #5696
// FREEBIE
 2016-09-25 14:55:03 -07:00
RiseT
33a79dde06 Fix string: Adding group members 
This changes the string "Add member" to "Add members" as the
corresponding list is multi-selectable.

Closes #5697
// FREEBIE
 2016-09-25 14:51:21 -07:00
Moxie Marlinspike
848a25664b Make fingerprint changes optionally non-blocking 
Also complete the rename from "identity" to "safety numbers."

// FREEBIE
 2016-09-25 14:27:40 -07:00
Moxie Marlinspike
852634b294 Support for updated fingerprint format 
// FREEBIE
 2016-09-25 14:23:52 -07:00
Christian Ascheberg
e1b24ab878 Fix display of secure session reset records 
Fixes #5605
Closes #5680

// FREEBIE
 2016-09-14 16:37:28 -07:00
FeuRenard
677f80b8ef Theme number picker text (disappearing messages) 
Fixes #5659
Closes #5667
// FREEBIE
 2016-09-14 16:37:28 -07:00
Christian Ascheberg
40332f57ad improve invite strings 
Fixes #4869
Closes #5393
//FREEBIE
 2016-09-01 10:44:45 -07:00
FeuRenard
a370f086c0 Respect privacy settings on ticker content for Android <5 
Fixes #5517
Closes #5592

// FREEBIE
 2016-08-31 18:44:15 -07:00
FeuRenard
5bf1707d60 Catch ActivityNotFoundExceptions 
Fixes #3726
Closes #5617
// FREEBIE
 2016-08-31 18:17:15 -07:00
Moxie Marlinspike
d7e4928f22 Support for disappearing messages 
// FREEBIE
 2016-08-28 17:03:23 -07:00
Clam
a8a8ec1d40 Extend DPAD support. 
Allows the hardware DPAD to control more of the UI.

Closes #4989
// FREEBIE
 2016-05-20 13:09:38 -07:00
McLoo
fd43dbdcdb Be more specific when toasting "Success!" 
Closes #4871
//FREEBIE
 2016-03-09 15:58:26 -08:00
RiseT
ff1a5a5197 'Devices' & 'Manage linked devices' -> 'Linked devices' 
Fixes #5201
Closes #5213
// FREEBIE
 2016-03-09 14:05:16 -08:00
haffenloher
bd1dc37bab Clarify "SMS import complete" notification text 
Fixes #5262
Closes #5274

// FREEBIE
 2016-03-09 13:47:17 -08:00
Geonu Kang
ba960a82e2 Extract compose subhint for SIM name to string resource 
Fixes #5304
Closes #5305
// FREEBIE
 2016-03-02 12:46:59 -08:00
haffenloher
25d7931358 Make system database import notification translatable 
Also replace "TextSecure" with "Signal" in the notification text.

Closes #5256
// FREEBIE
 2016-02-18 17:52:41 -08:00
Andreas Fehn
238471b847 Allow saving all attachments of a thread 
Closes #3975
 2016-02-18 17:52:01 -08:00
Moxie Marlinspike
0d6b2d899e Fix broken strings 
Fixes #5218
// FREEBIE
 2016-02-18 17:52:01 -08:00
RiseT
12957d96e0 Improve identity key scanning strings 
Closes #5218
Fixes #1481
// FREEBIE
 2016-02-18 17:52:01 -08:00
Moxie Marlinspike
6da86e482d Support for dual-sim SMS/MMS functionality 
Allow source selection for sending SMS/MMS, and display the
SIM that received SMS/MMS.

Fixes #555
Closes #5199
// FREEBIE
 2016-02-09 16:53:15 -08:00