TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,422 Commits 46 Branches 892 Tags 481 MiB
9d1b9bae7f
Commit Graph

905 Commits

Author SHA1 Message Date
Niels Andriesse
c5428d7267 Clean up lock screen UI 2019-08-30 10:24:39 +10:00
Niels Andriesse
754e73e241 Fix crash 2019-08-29 10:21:23 +10:00
gmbnt
c516939007
Merge pull request #14 from nasal/nasal/change-signal-strings 
Replace 'Signal' with 'Loki Messenger' in app strings
 2019-08-29 09:57:42 +10:00
nasal
38f0dde726 Replace 'Signal' with 'Loki Messenger' in app strings 2019-08-23 12:22:27 +02:00
Niels Andriesse
3ae087bb88 Fix copy 2019-08-23 15:15:32 +10:00
Niels Andriesse
d831274920 Clean 2019-08-23 13:22:52 +10:00
Niels Andriesse
5d34314a00 Implement QR code scanning 2019-08-23 11:46:28 +10:00
Niels Andriesse
f3377fe384 Add show QR code button to settings 2019-08-23 11:00:07 +10:00
Niels Andriesse
d8ae307671 Update copy 2019-08-09 09:34:37 +10:00
Niels Andriesse
1822e87f7c Merge Signal 4.41.0 2019-08-07 16:48:54 +10:00
Niels Andriesse
b3759d788f Fix copy 2019-08-07 14:13:33 +10:00
Niels Andriesse
6d13b49ed1 Copy public key to clipboard on settings header long press 2019-08-07 12:40:33 +10:00
Niels Andriesse
fcb5cbb74d Fix threading issue 2019-07-26 16:16:40 +10:00
Niels Andriesse
c89c1632be Update app icon 2019-07-24 09:23:01 +10:00
Niels Andriesse
e896315cbb Clean up UI 2019-07-23 16:53:36 +10:00
Niels Andriesse
06e8d20da4 Refactor 2019-07-22 14:25:59 +10:00
Niels Andriesse
a767c84f74 Fix remaining UI issues 2019-07-22 14:05:51 +10:00
Niels Andriesse
1da6f20f18 Further Lokify UI 2019-07-22 13:08:56 +10:00
Niels Andriesse
3a8d509c1e Further Lokify UI 2019-07-18 15:59:41 +10:00
Niels Andriesse
659d9e6a8f Implement restore from seed UI 2019-07-17 10:26:06 +10:00
Niels Andriesse
ab99874ede Partially Lokify UI 2019-07-16 17:09:15 +10:00
Niels Andriesse
047a98ad63 Disable input bar if a friend request is pending 2019-06-25 11:48:39 +10:00
Niels Andriesse
d99a996d0e Finish friend request view & add message friend request status 2019-06-24 11:22:53 +10:00
Niels Andriesse
f22be7262b Hook up conversation screen 2019-06-07 13:27:48 +10:00
Niels Andriesse
b4328d1aa3 Create UI path to new conversation screen 2019-06-06 15:01:06 +10:00
Niels Andriesse
7d24ab12a2 Implement share public key button 2019-06-05 16:45:12 +10:00
Niels Andriesse
e36d9e110c Add copy mnemonic button 2019-06-05 16:05:08 +10:00
Niels Andriesse
4148d598f9 Stub key pair screen 2019-06-04 16:37:45 +10:00
Niels Andriesse
96efb5d296 Stub account details screen 2019-06-04 14:39:28 +10:00
Alan Evans
48698381fc Dark theme navigation bar. 
Fixes #8758
 2019-05-30 01:10:10 -04:00
Greyson Parrelli
2a644437fb Add sticker support. 
No sticker packs are available for use yet, but we now have the
latent ability to send and receive.
 2019-05-30 01:08:01 -04:00
Alan Evans
e5f70bdbda
End RTC call on incoming PSTN call. 
* Hangs up when new device call is answered.
* Ensure not on a device call when starting a Signal call.
 2019-05-23 16:56:05 -03:00
Alan Evans
56848fb83d
Replace sgnl.link urls with a more readable url. 
* Taken out random string, reverted to single "Let's switch".

#8767
 2019-05-23 08:02:15 -03:00
Alan Evans
95304fe001 Image Editor - Remove initial text. 
- Flashing cursor.
 2019-05-16 15:51:56 -07:00
Alan Evans
b1057d63a1 Lint. 
- Check for permissions.
- Fix Welsh positional format.
- Remove UIThread restriction.
- Asynchronous method does not need to be restricted to UIThread and there is no StaticFieldLeak to suppress.
- Fix or Ignore New API errors.
- Reduce severity of some errors from L10N.
 2019-05-10 11:57:43 -03:00
Alan Evans
93e6ccb9e4 Replace image editor. 2019-05-10 11:57:43 -03:00
Alan Evans
8cf2654c5b Show reply method SMS/Signal and respect sticky. 
Fixes #8792
 2019-05-06 16:45:30 -07:00
Greyson Parrelli
934a2a67bc Fix some keyboard issues in landscape. 2019-05-02 14:32:53 -07:00
Alan Evans
ec20b0e0e3
Fallback to SIM index. 
#8725
 2019-05-02 18:16:59 -03:00
Greyson Parrelli
d12b02fac5 Updated language translations. 2019-04-30 12:51:58 -07:00
Michael Walker
8ad5126408 Add pinterest domain and asset domains for link preview support 2019-04-30 12:51:57 -07:00
Greyson Parrelli
4a3c173adb Migrated to new JobManager. 2019-04-15 10:56:26 -04:00
Alan Evans
e842f78457
Voice Note Locking. 
Limit of 60 minutes, after which it's cancelled.
 2019-03-28 15:04:38 -03:00
Greyson Parrelli
ccfcfa71df Enable the sending of long messages. 2019-03-22 12:28:41 -07:00
Alan Evans
d41b24f9ae Fix "multiple substitutions specified in non-positional format" lint. 2019-03-21 11:02:12 -07:00
Greyson Parrelli
5a8753de85 Fix group string. 2019-03-19 10:34:56 -07:00
Greyson Parrelli
975a121c55 Show a warning for users on API < 19. 
We'll be updating minSdk to 19 in 4.37. This lets these users continue
to use the app, but they'll be warned with a persistent banner saying
that they can't receive updates.
 2019-03-18 15:09:56 -07:00
Greyson Parrelli
64cf032181 Updated media send UI. 2019-03-18 15:09:56 -07:00
Alan Evans
286b64274c Replace Avatar Cropper. 2019-03-18 15:09:50 -07:00
Greyson Parrelli
0a8bbf14a6 Merge camera into send flow. 2019-03-14 16:25:35 -07:00
Alan Evans
c46e53ab24
Add Esperanto and Swahili (Kiswahili) to language selection. 2019-03-13 17:45:53 -03:00
Greyson Parrelli
18613e3b6f Remove generic foreground service condition from Job. 
I don't think it actually helps at all, meaning it just adds
complexity.

Fixes #8677
 2019-03-12 11:29:59 -03:00
Greyson Parrelli
55699e27bc Added ability to receive long messages. 
Send support is in here too. We'll enable it in a future release after
enough people have updated.
 2019-03-01 14:15:08 -08:00
Greyson Parrelli
bf28e109d3 Update registration UI. 2019-03-01 14:15:01 -08:00
Greyson Parrelli
a6564f8f84 FCM improvements. 2019-02-15 14:21:23 -08:00
Greyson Parrelli
02b0800b22 Support requesting a CAPTCHA during registration. 2019-02-14 20:19:07 -08:00
Greyson Parrelli
c2a86fcc74 Sync self-sends to desktop. 
Updated UI to show self-conversations as "Note to Self".
 2019-02-14 20:19:07 -08:00
Greyson Parrelli
6896f8ea15 Properly check attachment size during media send. 
Prevent users from trying to send videos that exceed the size limit.

Also, this commit properly populates height/width on media shared into
the app.

Fixes #8573
 2019-02-14 20:19:06 -08:00
Greyson Parrelli
9f04c28bfd Implemented conversation search. 
You can now search for messages within a specific conversation.
 2019-02-14 20:19:01 -08:00
Meteor0id
c5571e8a8d Add 'Got it' as string to be used on link preview splash screen. 
"Understood" or "Got it" is a way of dismissing a splash screen of notification without any change that is applies agreeing to anything.
It replaces "OK" which was sometimes misinterpreted as "I am OK with what I just read".
 2019-02-06 09:22:19 -08:00
Greyson Parrelli
c76081d99c Added support for link previews. 2019-01-30 16:10:43 -08:00
Greyson Parrelli
a6f31c60bd Show a toast when you've gone over the max media selection. 2019-01-16 14:31:59 -08:00
Greyson Parrelli
fc989f3820 Fix album sizing issues on skinnier devices. 2019-01-15 23:57:43 -08:00
Greyson Parrelli
66dde4415d Added an 'All media' folder in the gallery. 2019-01-15 13:38:06 -08:00
Greyson Parrelli
6fa7eca60b Implement new media send flow. 
Update our media send flow to allow users to send multiple images/videos
at once. This change includes:

- New in-app media picker flow.
- Ability to caption images and videos.
- Image editing tools are made more prominent in the flow.
- Some fixes to the image editing tools.
 2019-01-14 11:25:06 -08:00
riyapenn-signal
7278f6db76 Update in-app language list for Welsh, Hindi, Quechua, Khmer 
Languages added: 

1. Welsh Cymraeg cy
2. Hindi Hindi हिंदी hi 
3. Quechua qu_EC

Languages modified: 

1. Khmer from kh-rKH to kh
 2019-01-13 19:25:40 -08:00
Greyson Parrelli
b553bb1cb0 Don't allow sending SMS unless we're the default. 2019-01-13 19:25:40 -08:00
Greyson Parrelli
b6098a26b4 Update typing indicator intro strings. 2018-12-01 09:55:21 -08:00
Greyson Parrelli
5a53268534 Update typing indicator intro screen. 2018-11-27 17:45:58 -08:00
Greyson Parrelli
47a10a0288 Added support for multi-image receive. 2018-11-21 01:55:30 -08:00
Greyson Parrelli
776b0e23ae Add support for typing indicators. 2018-11-21 01:55:25 -08:00
Greyson Parrelli
ff9d5df0e0 Dark theme support for emoji variation selector. 2018-11-15 11:43:38 -08:00
Greyson Parrelli
2acab563d9 Support for sealed sender - Part 2 2018-10-30 08:48:08 -07:00
Greyson Parrelli
48ff9673b9 Allow the selection of fitzpatrick emoji. 2018-10-26 11:05:10 -07:00
Greyson Parrelli
92773b1a12 Update delivery icon tint in conversation list. 2018-10-16 11:18:49 -07:00
Greyson Parrelli
7cadb0d35a Properly set the document download icon tint. 2018-10-16 10:58:19 -07:00
Greyson Parrelli
275ca9e3ba Remove the ability to set a color for a group. 
No longer applicable given that we're adding back per-person colors in
groups.
 2018-10-09 15:34:08 -07:00
Greyson Parrelli
710fa4a6f0 Switch the conversation color back to incoming messages. 2018-10-09 15:34:04 -07:00
Greyson Parrelli
1b736e9e04 Ensure notifications are processed after receiving GCM message. 
It's unreliable to run these tasks on WorkManager, as there's no
scheduling guarantees.
 2018-10-08 10:00:15 -07:00
Greyson Parrelli
a1ba5003d3 Fix some dark theme color consistency issues. 
Fixes #8253
 2018-10-05 17:21:26 -07:00
Greyson Parrelli
43ebcfdee5 Added more contrast to shared contact button color in dark theme. 
Relates to #8252
 2018-10-04 11:12:49 -07:00
Greyson Parrelli
bab92fca7b Move unread indicator to be above the avatar. 2018-10-03 14:23:59 -07:00
Greyson Parrelli
127505af0b Implement new color palette. 2018-10-03 14:23:59 -07:00
Greyson Parrelli
e4b56d4e40 Show foreground notification for jobs when network is restricted. 
Occasionally a job may be run when the app is in a network-restricted
mode, like a form of doze. When this happens, jobs can timeout due to
lack of network access, causing a cascade of job delays. This is
particularly bad in the case of message retrieval.

To prevent this, if a job that normally requires network detects that no
network is available when running, then we start a foreground
notification.
 2018-10-03 10:00:42 -07:00
Greyson Parrelli
12d9d7741b Clean up batch saving. 
- Post a better string for when batch saving completes successfully
- Exit multi-select after saving
 2018-09-27 10:35:56 -07:00
FeuRenard
91a119393c Allow batch saving in media overview 2018-09-27 10:35:56 -07:00
FeuRenard
c82afd8944 Allow selecting all media in overview 2018-09-27 10:35:56 -07:00
Greyson Parrelli
08ace15f95 Implemented new camera capture flow. 
A new, fullscreen camera capture flow that easily allows you to capture
and edit a photo before sending it. Replaces the current half-screen
camera button.
 2018-09-27 10:35:56 -07:00
Greyson Parrelli
45c4eafbd7 Add the ability to block groups. 
This also fixes the situation where we block group-leave messages,
preventing blocked contacts from leaving groups.

Fixes #7970

Also, this forced us to upgrade libsignal-service, which fixes the
websocket timeout issues. Thanks to @dpapavas!

Fixes #6644
 2018-09-18 15:26:50 -07:00
Greyson Parrelli
ad7dd7584e Fixed document display in media overview in dark theme. 
Shoutout to @aleb2000 for working on this as well!

Fixes #8151
 2018-09-08 08:23:33 -07:00
Greyson Parrelli
440ad70d79 Allow submitting a debug log during registration. 2018-09-08 07:48:20 -07:00
Greyson Parrelli
15b4517e35 Prevent restoring newer backups into older versions of Signal. 
Relates to #8184
 2018-09-07 15:54:38 -07:00
Greyson Parrelli
ca2efcac8a Added safeguards during NotificationChannel creation. 
We were getting an IllegalArgumentException during channel creation on
some Samsung phones. Stack trace didn't give me much more than that, so
just adding in some additional safeguards that make sense based on
reading AOSP.
 2018-08-22 13:19:59 -07:00
Greyson Parrelli
e9b85a10a6 Add per-contact notification channels. 
Fixes #8119
Fixes #8121
Fixes #8122
 2018-08-17 15:51:01 -07:00
Greyson Parrelli
c49b0348bd Add failsafe for invalid shortcuts. 
Some launchers may create broken shortcuts, so we just want to have
a smooth fallback in that scenario.

Fixes #8109
 2018-08-15 12:48:04 -07:00
Greyson Parrelli
b79748bbb1 Change lock status channel name to 'lock status'. 2018-08-14 16:59:21 -07:00
Greyson Parrelli
eabaead700 Revert "Fingerprint unlock UX improvements" 
This reverts commit 8441ac4091.

Fixes #8106
 2018-08-14 13:04:33 -07:00
art1fa
8441ac4091 Fingerprint unlock UX improvements 2018-08-13 18:38:59 -04:00
Greyson Parrelli
13c72779af Visually note quotes for messages you don't have. 
We will now show a small footer under quotes for messages that you
don't have locally.

Also fixes #7850
 2018-08-13 18:38:59 -04:00
Greyson Parrelli
4d565990c9 Add drop shadow under attachment drawer. 2018-08-13 18:38:59 -04:00
Greyson Parrelli
5cdf5499d0 Clean up shortcut code. 2018-08-13 18:38:59 -04:00
Leonard Ehrenfried
c3c44e324b Allow users to add conversation shortcuts to the home screen. 2018-08-13 18:38:59 -04:00
Greyson Parrelli
c7da83a702 Show attachment button while composing text. 
Previously, we'd only show the attachment button when the user had
yet to enter any text. To add an attachment after text was entered,
you'd have to go to the three-dot menu. Now we just show a little
attach button in the text area.

I also took the opportunity to clean up other button paddings and
stuff in the compose area so things look better and react to text
sizes more predictably.
 2018-08-13 18:38:59 -04:00
Greyson Parrelli
dbd42c4af2 Add notification channel support. 
Bucket our notifications into channels. Required to target API 26.
 2018-08-13 18:38:53 -04:00
Greyson Parrelli
b7d83c7a1f Make libpaste a source dependency. 2018-08-06 10:50:06 -04:00
art1fa
faea8fd2ec Apply message bubble paddings to both top and bottom 
Batch selecting messages now feels better. Fixes #8035.
 2018-07-27 16:15:37 -04:00
Greyson Parrelli
d5a9efa96a Reduce letter spacing on Preview text. 2018-07-25 09:58:43 -04:00
Christian Ascheberg
0bb44f2034 Improve disappearing message time strings 
Fixes #7501
 2018-07-24 20:35:51 -04:00
Greyson Parrelli
6a1fd8b1c6 Increase difference between read/unread conversations in list. 
Updating to match the design.
 2018-07-24 12:34:21 -04:00
Greyson Parrelli
aa25f39fe9 Fix footer icon tints. 2018-07-20 15:40:13 -07:00
Greyson Parrelli
860047c2d3 Remove CornerMaskingView. 2018-07-20 14:24:04 -07:00
Greyson Parrelli
8f551c8b32 Fix various redesign issues with Android 4.x. 
In particular, there were many issues with drawing corners.
Unfortunately, there's no pretty way to get masking working on every
Android version, so we have to switch back to using custom backgrounds
and then using multiple masking methods depending on Android version.

Also, I had to remove attr references in drawables. They crash on 4.x.
 2018-07-18 16:53:36 -07:00
Jonathan Fung
85d963047e Adding a long press icon description for the Search icon 
Fixes #7836
 2018-07-18 09:04:42 -07:00
Greyson Parrelli
1c023b5218 Remove unused resources. 2018-07-17 12:06:50 -07:00
RiseT
7960a5785d Export some strings from shared contact details activity 2018-07-17 12:06:50 -07:00
Greyson Parrelli
8579c30909 Styling improvements and code cleanup. 2018-07-17 12:06:42 -07:00
Greyson Parrelli
24b062d8dd Improve the look of message bubbles. 2018-07-17 09:53:52 -07:00
Greyson Parrelli
7cfcb62c25 Added colors and styles. 2018-07-12 10:59:29 -07:00
RiseT
e75822c6fd Remove unused strings 
- Removed unused strings
- Removed some obsolete header comments
- Removed some whitespace
 2018-07-02 17:56:07 -07:00
RiseT
6a465e6589 Update locales per 2018-06-23 
Translation completion >= 90%, with the exception of Irish (80%), but they've been waiting for a rather long time.

Added:
- Irish
- Kurdish
- Telugu
- Ukrainian
 2018-07-02 17:49:29 -07:00
Greyson Parrelli
3134837d56 Remove plaintext backup import option. 
We have our own secure backup solution built into the app now.
No need to support plaintext backups.
 2018-07-02 17:11:13 -07:00
Greyson Parrelli
f72f75ee61 Show a link for privacy policy. 2018-06-22 13:09:43 -07:00
Greyson Parrelli
20cc6f4d0e Return registration permission string to previous value. 2018-06-22 10:59:53 -07:00
riyapenn-signal
b9c337d0b7 Updated for small copy change 2018-06-22 10:59:53 -07:00
riyapenn-signal
3654856be5 Updated strings.xml to include minor copy changes 
- Permission prompt to include text about backups
- Updated support email
- Updated domain to signal.org in a link
 2018-06-22 10:59:53 -07:00
Greyson Parrelli
4f72f4c649 Remove unused string. 2018-06-22 10:59:53 -07:00
Greyson Parrelli
542e962be9 Fixed crash when ScribbleView failed to save. 
Previously, if an operation failed, we set the result to "null".
However, this was a mistake. Setting the result at all assumes success.
Instead, we need to set an exception so the ListenableFuture knows that
the operation failed.
 2018-06-18 14:33:44 -07:00
Greyson Parrelli
2c17b54ef9 Show a banner in the event of a service outage. 
We will now determine if there has been a service outage and render a
banner at the top of the conversation list if we detect that there has
been one.
 2018-06-18 14:32:45 -07:00
Greyson Parrelli
0999359454 Improve the image editor. 
A variety of improvements to the image editor, such as:

- New, fullscreen styling
- Smoother lines
- Better text and sticker handling
- Improved color picker with a history pallette
- New highlighter tool
 2018-06-18 14:32:45 -07:00
Greyson Parrelli
3a827d1c48 Fix dark theme in search. 
Fixed #7821
 2018-05-22 12:37:00 -04:00
Greyson Parrelli
0449647cf9 Implemented full-text search. 
You can now use the search bar on the conversation list to find
conversations, messages, and contacts.
 2018-05-21 16:36:59 -04:00
Greyson Parrelli
e6c16cf28d Allow editing of contact names. 
Took care to properly format CJK names.
 2018-05-21 15:45:22 -04:00
Greyson Parrelli
54dbffaf30 Added ability to share contacts. 
The "contact" option in the attachments tray now brings you through an
optimized contact sharing flow, allowing you to select specific fields
to share. The contact is then presented as a special message type,
allowing you to interact with the card to add the contact to your system
contacts, invite them to signal, initiate a signal message, etc.
 2018-05-21 15:45:22 -04:00
Greyson Parrelli
ca8fecea9c Clean up camera flipping, handle having missing cameras. 
Did a refactor to better organize the camera flipping code. Also, I
wanted to make sure we handle the cases where the user doesn't have two
cameras (or no cameras, for that matter). In these cases, we just don't
show the appropriate buttons.
 2018-05-21 15:45:22 -04:00
Niklas Hambüchen
f1c79eaebf Add button to flip camera (front vs rear). Fixes #6279 2018-05-21 15:45:22 -04:00
Greyson Parrelli
43622e603d Save replies in drafts. 
Previously, quotes were not saved to drafts, meaning they would be lost
when leaving the conversation or app. Now, a QuoteId (which represents
the necessary data to restore the QuoteModel) is serialized and stored
in the DraftDatabase.

Fixes #7716
Closes #7729
 2018-04-26 09:19:22 -07:00
RiseT
7100030c22 Export string conversation_context__menu_reply_to_message 
Additionally changed from "Reply" to "Reply to message" as other
related strings are more comprehensive as well.

Closes #7732
 2018-04-25 10:41:26 -07:00
Greyson Parrelli
cbe394025d Fix reply-to colors in dark mode to increase contrast. 
Fixes #7705
 2018-04-20 17:35:48 -07:00
RiseT
29af1669e1 Export strings from registration_call_me_view 
Export strings from webrtc_call_screen

Closes #7543
 2018-04-19 18:03:45 -07:00
Nicholas Rizzio
e6f76159b0 Export "creating backup" string 
Closes #7656
 2018-04-19 17:59:31 -07:00
Greyson Parrelli
fa99e8f0d0 Updated reply-to UI. 
All UI components are now properly styled and functioning according to
spec.
 2018-04-16 17:33:26 -07:00
Moxie Marlinspike
d567534609 replies 2018-04-16 17:33:26 -07:00
Moxie Marlinspike
4669c45ff7 Perpetuate the original sin of dark theme 
Fixes #7614
 2018-04-16 17:33:26 -07:00
Moxie Marlinspike
e86a9ce7eb Add phone number and direct dial to recipient preferences 2018-04-16 17:33:26 -07:00
Greyson Parrelli
18039bc3f4 Show groups when searching for contacts. 
Currently, if you're searching for a contact to start a conversation
with or send a share to (via the Android sharing system), groups do not
appear. With this change, groups will now appear when searching, located
under their own  heading.

Fixes #7202.
Closes #7577
 2018-03-31 02:14:02 -07:00
Greyson Parrelli
ea374735e1 Render images in a conversation true-to-size. 
Previously, we were always rendering images as squares. Instead of doing
that, we now render them as close to true-to-size as possible (within
reasonable min/max width/height boundaries).
 2018-03-31 02:14:02 -07:00
Greyson Parrelli
10e5b24cfd Allow batch deletion of media. 
It is now possible to batch-delete media in the "media overview" screen.
You can long press to enter multi-select mode. Then a delete button
appears on the menu bar. After pressing delete, you will get a
confirmation, and if the user confirms, the items will delete while a
progres dialog shows.
 2018-03-31 02:14:02 -07:00
Greyson Parrelli
0c768a24e4 Allow deletion of media through preview. 
When viewing a media in the media preview, you can delete it by pressing
a delete button on the action bar. It will then ask you to confirm your
choice. If you confirm, it will delete the attachment from the database
and from disk. If it was the only attachment for that message, the
message itself will also be deleted.
 2018-03-31 02:14:02 -07:00
平民·寻梦(Pingmin Fenlly Liu)
cc288d1e43 Just update to the new repo path "github.com/signalapp" 
Closes #7469
 2018-03-11 17:06:22 -07:00
FeuRenard
150601c51e Replace '1' with '%d' in plural strings 
Fixes #7470
Closes #7471
 2018-03-11 17:05:01 -07:00