TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,411 Commits 46 Branches 892 Tags 481 MiB
716ed251bc
Commit Graph

812 Commits

Author SHA1 Message Date
Moxie Marlinspike
fecc5e63e8 Update language translations 
// FREEBIE
 2015-11-14 15:22:30 -08:00
Moxie Marlinspike
cb60e08da2 Update language translations 
// FREEBIE
 2015-11-13 11:42:19 -08:00
Jake McGinty
0c75e652eb bring back the ripple when clicking on preview 
Closes #4506
// FREEBIE
 2015-11-12 15:20:17 -08:00
Jake McGinty
d3000f384f adhere to android plural standards 
// FREEBIE

Closes #4503
 2015-11-12 15:20:17 -08:00
Jake McGinty
76b0183e0f move db query off main thread, fix group self-add 
fixes #4168
Closes #4502
// FREEBIE
 2015-11-12 15:20:17 -08:00
Jake McGinty
fb8d6cb538 contact selection reeemix 
1) RecyclerView-based, with better long scroller
   and more material-inspired look.
2) Add badge for Signal users to contact selection
   list.

// FREEBIE
 2015-11-12 15:20:16 -08:00
Moxie Marlinspike
7bec5efe1a Add 'Signal Call' option to contact card 
Fixes #4392
Closes #4465
// FREEBIE
 2015-11-12 15:20:16 -08:00
agrajaghh
5c59c3f423 make invite strings plural 
fixes #4388
Closes #4389

// FREEBIE
 2015-11-12 15:20:16 -08:00
Sebastian Morr
181c7dfd85 Add the option to mute notifications for one year. 
Fixes #4448.
Closes #4454
 2015-11-12 15:20:16 -08:00
RiseT
e1f9519235 Replace 'my' with 'your' 
See
https://www.google.com/design/spec/style/writing.html#writing-language

// FREEBIE
 2015-11-12 15:20:16 -08:00
RiseT
7f0b0803bc Change 'SD card' to 'storage' & cosmetic corrections 
Fixes #3920
 2015-11-12 15:20:16 -08:00
Jake McGinty
b0137c08cb go back to old CameraView 
Fixes #4415
Closes #4484
// FREEBIE
 2015-11-10 15:48:50 -08:00
Moxie Marlinspike
56117237b6 Updated translations 
// FREEBIE
 2015-11-05 11:39:02 -08:00
Jake McGinty
381c8820b1 remove unused CircleIndicator 
Fixes #4393
closes #4397
// FREEBIE
 2015-11-05 11:02:56 -08:00
Moxie Marlinspike
09c57f3f44 Add close button to attachment type selector 
// FREEBIE
 2015-11-04 17:56:21 -08:00
Moxie Marlinspike
be0ca330f5 Nicer looking attachment type selector 
Closes #4367
// FREEBIE
 2015-11-04 17:56:21 -08:00
Jake McGinty
59f2446a2b unjankify incoming media sharing 
Closes #4374
Fixes #3989
// FREEBIE
 2015-11-04 17:56:21 -08:00
Manuel Geier
328a3ff20e show total number of messages or threads to be deleted 
in delete-confirm-dialogs

Closes #4284

// FREEBIE
 2015-11-04 17:56:20 -08:00
Jake McGinty
3e798a9863 batch invitation 
// FREEBIE
 2015-11-04 17:56:20 -08:00
Moxie Marlinspike
8d82033855 Notify when contacts join Signal 
Closes #4314
// FREEBIE
 2015-11-04 17:56:20 -08:00
Jake McGinty
8fd0ea39aa Simplify excessively convoluted camera logic 
1) QuickCamera logic moved into CameraView

2) The strategies for texture vs. surface view were too complex
   with no observed gain. Better to remove and have to re-add
   if necessary than assume it to be necessary.

3) Drop CWAC-Camera dependency - the device profiles weren't being
   used very much and even that is deprecated so we'd be left on
   our own with new hardware. Not worth it.

4) Selfies first.

5) Layout/orientation mathy logic from CWAC moved into CameraUtils,
   with the  hopes that most of it might be further simplified or
   rendered unnecessary in the future.

Closes #4326

// FREEBIE
 2015-11-04 17:56:20 -08:00
RiseT
08be47c03e Adjust a couple of strings in order to include calls AND messages. 
Closes #4311
 2015-11-04 17:56:20 -08:00
RiseT
13bd3c773c Make some 'notification sound' strings consistent with the rest 
Closes #4324
// FREEBIE
 2015-11-04 17:56:20 -08:00
Moxie Marlinspike
50794ba49d Updated language translations 
// FREEBIE
 2015-10-28 16:14:20 -07:00
Moxie Marlinspike
f80909738d Update translations 
// FREEBIE
 2015-10-26 13:52:21 -07:00
Geonu Kang
ea4def7ea1 Change string "Load" to "See" 
Fixes #4304
Closes #4305
// FREEBIE
 2015-10-26 12:26:21 -07:00
Jake McGinty
285bd3de0e tweak reminder jedi mind tricks 
// FREEBIE
 2015-10-26 12:24:53 -07:00
Moxie Marlinspike
35bcd30b24 Updated languages 
// FREEBIE
 2015-10-26 11:48:21 -07:00
Moxie Marlinspike
3453aadcfd Revert "Change string "Load" to "See"" 
This reverts commit 7a0765c1c2.
 2015-10-26 11:45:28 -07:00
Geonu Kang
7a0765c1c2 Change string "Load" to "See" 
Fixes #4304
Closes #4305
// FREEBIE
 2015-10-26 11:42:12 -07:00
Jake McGinty
46def68776 really show reminders 
fixes #4291
// FREEBIE
 2015-10-26 10:59:39 -07:00
Sam Lanning
c342f0d7e4 Change text of dialog box confirming blocking. 
Blocking users now also blocks incoming calls, so the block confirmation
message has been updated.

fixes #4217
Closes #4295

// FREEBIE
 2015-10-24 11:04:10 -07:00
Moxie Marlinspike
474922493f Fix audio seekbar layout on GB 
Fixes #4287
// FREEBIE
 2015-10-23 17:47:06 -07:00
Jake McGinty
2f568c6400 go back to old reminder view look 
Closes #4283
// FREEBIE
 2015-10-23 12:53:19 -07:00
Moxie Marlinspike
91785e5590 Updated language translations 
// FREEBIE
 2015-10-23 11:36:07 -07:00
Moxie Marlinspike
5111fe2e95 Display thumbnail previews for images in conversation list. 
Closes #4262
// FREEBIE
 2015-10-22 10:45:04 -07:00
Moxie Marlinspike
15c6f18750 Support for an audio view to allow in-app playback of audio. 
Closes #4270
// FREEBIE
 2015-10-22 10:32:45 -07:00
Jake McGinty
4ffb1ea95e in-conversation invite reminder 
Closes #4250
// FREEBIE
 2015-10-15 13:23:37 -07:00
Bastelbursche
38d0b5caa8 Remove unused strings with "session" 
Closes #4208
 2015-10-15 11:34:13 -07:00
Jake McGinty
ae97495c47 only load partial conversation by default 
Closes #4252
Fixes #3911
// FREEBIE
 2015-10-15 11:16:49 -07:00
Moxie Marlinspike
7342d839bc Updated translations 
// FREEBIE
 2015-10-09 09:49:23 -07:00
Moxie Marlinspike
b960f908dc Updated translations 
// FREEBIE
 2015-10-05 11:05:22 -07:00
Moxie Marlinspike
143f786322 Extern Incoming call string. 
Fixes #4196
// FREEBIE
 2015-10-04 17:41:23 -07:00
Geonu Kang
a0859a71b2 Make 'reset secure session' consistent 
Closes #4200
Fixes #4198
// FREEBIE
 2015-10-04 10:24:21 -07:00
Moxie Marlinspike
26f8870344 server failed -> network failed 
// FREEBIE
 2015-10-02 13:37:16 -07:00
Moxie Marlinspike
b45e6b6139 Updated translations 
// FREEBIE
 2015-10-02 07:37:43 -07:00
Moxie Marlinspike
e0ebe6c858 Switch up thread record strings 
// FREEBIE
 2015-10-01 18:01:15 -07:00
Moxie Marlinspike
77d73fa572 Correctly display call actions in thread list 
Fixes #4170
// FREEBIE
 2015-10-01 17:27:22 -07:00
Moxie Marlinspike
a7348f6ae0 Updated translations 
// FREEBIE
 2015-10-01 16:21:45 -07:00
Jake McGinty
d071625326 fix experience upgrade versioning 
Closes #4169
// FREEBIE
 2015-10-01 16:02:05 -07:00
Moxie Marlinspike
ff1f190110 Rename some strings 
// FREEBIE
 2015-10-01 12:47:13 -07:00
Moxie Marlinspike
c6abb7dc64 Switch recipient preference from Rington -> Notification tone 
// FREEBIE
 2015-10-01 12:22:17 -07:00
Moxie Marlinspike
003787e4a6 Externalize missing strings. 
Fixes #4158
// FREEBIE
 2015-10-01 10:27:20 -07:00
Brinly Taylor
0d05a2bf09 Signal: Clarify a string. 
Closes #4157
// FREEBIE
 2015-10-01 10:19:03 -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
31e20ca87e Distinguish between secure and insecure call in conversation menu. 
// 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
a0fc948519 Menu should be 'reset secure session,' since it'll never end. 
// 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
cf14b0478d Fix up incoming call colors 
// 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
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
c6e2b5f6c5 fix more batch select click edge cases 
Closes #4122
// FREEBIE
 2015-09-27 09:08:05 -07:00
Moxie Marlinspike
ffae7a24f7 Updated language translations 
// FREEBIE
 2015-09-24 14:14:38 -07:00
Jake McGinty
f047df0fe8 fix bubble height change glitch 
Closes #4033
// 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
Jake McGinty
9ea53d7b1e fix gingerbread view issues 
Closes #4085
// FREEBIE
 2015-09-20 19:40:32 -07:00
Jake McGinty
eedbc667c6 fix system emoji transparency 
Closes #4084
// FREEBIE
 2015-09-17 15:05:21 -07:00
Moxie Marlinspike
9b524e0496 Updated language translations 
// FREEBIE
 2015-09-17 13:24:43 -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
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
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
Moxie Marlinspike
0b7342ba67 Updated langauge translations 
// FREEBIE
 2015-09-04 14:15:47 -07:00
Jake McGinty
aaf3d6a7c7 media download controls i18n 
fixes #4015
// FREEBIE
 2015-09-04 12:11:06 -07:00
Moxie Marlinspike
a74276d31b Updated language translations 
// FREEBIE
 2015-09-03 16:39:09 -07:00
Jake McGinty
80ce83ef9d Media download controls 
Closes #3991
// FREEBIE
 2015-09-03 11:40:55 -07:00
f41c0r
7e2c9f97e9 Adds dependency for display in notifications 
Fixes #3982
Closes #3986

// FREEBIE
 2015-09-02 12:56:54 -07:00
Jake McGinty
d0fc5268a6 add vietnamese translations 
Closes #3978
// FREEBIE
 2015-09-02 12:37:17 -07:00
Jake McGinty
1641fd91cf let ThumbnailView handle remove button placement 
Closes #3849
// FREEBIE
 2015-09-02 12:23:24 -07:00
Jake McGinty
ae17b4b24a bright background for unread messages 
Closes #3909
// FREEBIE
 2015-08-07 17:15:50 -07:00
Moxie Marlinspike
9053bccd33 Updated language translations 
// FREEBIE
 2015-08-06 12:19:20 -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
RiseT
f693a04531 Preferences Message Notifications Description 
// FREEBIE
Closes #3871
 2015-08-05 13:11:13 -07:00
Geonu Kang
eae80e2c86 Fix Japanese language entry 
Fixes #3861
Closes #3862
// FREEBIE
 2015-08-05 13:09:39 -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
b5318ed248 fix composition bar disappearing 
Closes #3846
// FREEBIE
 2015-07-30 13:28:16 -07:00
Moxie Marlinspike
68df5f832c Updated language translations. 
// FREEBIE
 2015-07-30 11:06:19 -07:00
Moxie Marlinspike
40a3134b32 Updated language translations. 
// FREEBIE
 2015-07-30 10:50:55 -07:00
Geonu Kang
278214ef86 Improve multi-device strings consistency 
Fixes #3830
Closes #3840
// FREEBIE
 2015-07-30 10:15:50 -07:00
McLoo
109a6ed599 Update language list for 90%+ translations 
Closes #3841
//FREEBIE
 2015-07-30 08:17:52 -07:00
Sam Lanning
c72719747a Added white background to indicator for BLOCKED indicator 
Also modified text colour in light theme to nicer red

fixes #3524
Closes #3806
// FREEBIE
 2015-07-29 16:18:12 -07:00
Jake McGinty
a84dcf6a8e assert gif size constraints before OOMEs 
fixes #3778
closes #3833
// 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
Jake McGinty
13bad6dfed Smooth transition for custom keyboards and softkey 
Closes #3786
Fixes #3780
// FREEBIE
 2015-07-29 16:17:26 -07:00
agrajaghh
102a151127 fix icon size of quick_camera_rear 
this also changes BUILDING.md to reflect the new syntax of pngs_from_svg.py

fixes #3769
closes #3770

// 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
b1f336c874 Fix color selection dialog on GB. 
Fixes #3626
// FREEBIE
 2015-07-29 16:17:26 -07:00
Moxie Marlinspike
3e15a5e2db Updated translations. 
// FREEBIE
 2015-07-21 14:46:22 -07:00
Moxie Marlinspike
dcc7ba20e6 Update disable passphrase strings. 
Fixes #3705
// FREEBIE
 2015-07-20 16:58:08 -07:00
Jake McGinty
13578bb8c0 fix missing EmojiTextViews 
fixes #3676
Closes #3688
// FREEBIE
 2015-07-20 16:13:14 -07:00
Jake McGinty
39c0fc0e5a add sane default emoji panel size 
fixes #3661
Closes #3691
// FREEBIE
 2015-07-20 16:12:29 -07:00
agrajaghh
cfc9514f89 make "Enter name or number" translateable 
Fixes #3703
Closes #3708

// FREEBIE
 2015-07-20 16:09:10 -07:00
Moxie Marlinspike
97dbe648f9 Updated language translations. 
// FREEBIE
 2015-07-17 10:28:12 -07:00
Moxie Marlinspike
1b0cba3919 Updated language translations. 
// FREEBIE
 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
0e7fcc6893 Extract string resource. 
// FREEBIE
 2015-07-16 11:15:56 -07:00
Moxie Marlinspike
89f2429283 Remove unused menus. 
// 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
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
Jake McGinty
b519fd2533 stop using PopupWindow for emoji. too many android bugs. 
Closes #3655
// FREEBIE
 2015-07-13 16:41:03 -07:00
Jake McGinty
c7599094f5 hide controls when camera drawer isn't open 
Closes #3654
// FREEBIE
 2015-07-13 16:39:30 -07:00
Calvin Hu
b75a04eb08 add padding to conversation activity to compensate for actionbar overlay mode 
fixes #3627
closes #3635
 2015-07-13 10:50:55 -07:00
Jake McGinty
a44a4bc759 disable direct cap 
Closes #3612
// FREEBIE
 2015-07-11 12:38:39 -07:00
Moxie Marlinspike
d400f0fb58 Updated languages 
// FREEBIE
 2015-07-10 17:07:39 -07:00
Jake McGinty
9b2aabfdc8 add EmojiSpan that scaled w/ TextView 
Fixes #3317
Closes #3605
// FREEBIE
 2015-07-10 16:53:34 -07:00
Jake McGinty
35159ac456 make TransportOptionsPopup a ListPopupWindow 
disable circular reveal at least for now

Fixes #3600
Closes #3607
// FREEBIE
 2015-07-10 16:38:32 -07:00
Jake McGinty
5eaaadad26 fix camera ui thread hangs and view race condition 
also add a background behind the camera preview surface to avoid
transparency peek-through issues.

Fixes #3576
Closes #3601
// FREEBIE"
 2015-07-10 11:54:27 -07:00
Veeti Paananen
21c8051b02 Use matching status bar color during action mode 
Closes #3552
FREEBIE.
 2015-07-09 12:18:58 -07:00
Jake McGinty
bc787f20e3 Resolve emoji keyboard layout issues 
1) orientation changes are now properly handled
2) emoji panel will not overrun the actionbar and composition area
   in space-contentious situations (quick reply popup)

Closes #3553
fixes #3501
fixes #3485
fixes #3199

// FREEBIE
 2015-07-08 17:26:23 -07:00
Jake McGinty
c4524ebbd1 Revert the "Send via TextSecure" string change 
// FREEBIE
 2015-07-08 17:22:51 -07:00
Moxie Marlinspike
98b99ef5b1 Reduce right margin on incoming message bubbles. 
Fixes #3499
// FREEBIE
 2015-07-08 17:11:31 -07:00
Jake McGinty
54a37cc658 refactor direct capture 
Closes #3516
// FREEBIE
 2015-07-08 16:02:39 -07:00
Calvin Hu
c4a37e38ab Add camera preview to message composition 2015-07-08 16:01:57 -07:00
Moxie Marlinspike
13eed3baa7 Fix up wearable reply stuff a little. 
1) Don't include MasterSecret in PendingIntents.

2) Correctly reply to non-push group threads, rather than
   just an individual in that group.

// FREEBIE
 2015-07-08 13:13:49 -07:00
Christoph Haefner
f0b2cc5590 Added WearReplyReceiver 2015-07-08 12:55:46 -07:00
Moxie Marlinspike
69e1252f7f Add "conversation settings" menu option in conversation activity. 
Closes #3399
Fixes #3399
// FREEBIE
 2015-07-08 12:22:51 -07:00
Jake McGinty
ed8f617c81 fix recipient detail title align 
Closes #3533
// FREEBIE
 2015-07-08 12:12:58 -07:00
Jake McGinty
00a85c4438 fix landscape softkey sizing 
Closes #3540
// FREEBIE
 2015-07-06 18:11:01 -07:00
Jake McGinty
fa62b9bde2 clean up EmojiDrawer layout 
Fixes #2940
Closes #3517
// FREEBIE
 2015-07-06 16:50:22 -07:00
Moxie Marlinspike
48bf65db74 Fix for dark theme colors. 
// FREEBIE
 2015-07-02 14:22:33 -07:00
Moxie Marlinspike
6561365326 Updated language translations. 
// FREEBIE
 2015-07-02 12:48:22 -07:00
Jake McGinty
59c51127f6 add twilio shoutout to registration 
// FREEBIE
 2015-07-02 12:20:51 -07:00
Jake McGinty
c2e5f4e80a Add transfer indicators for attachments 
Closes #3498
// FREEBIE
 2015-07-01 15:38:55 -07:00
Jake McGinty
daa98107c3 new composition styling 
Closes #3506
// FREEBIE
 2015-07-01 14:31:04 -07:00
Owen66
140cbe9f25 Track previously selected per-recipient ringtone value. 
Fixes #3397
Closes #3477
 2015-07-01 14:14:42 -07:00
McLoo
3a9ceb8371 Move ellipse from title to message and complete ellipse 
Closes #3481
//FREEBIE
 2015-07-01 14:07:40 -07:00
Jake McGinty
4274329867 fix gingerbread press reaction 
Fixes #3392
Closes #3493
// FREEBIE
 2015-07-01 14:05:51 -07:00
Moxie Marlinspike
4ea40b30a2 Switch to enum and theme type for MaterialColor. 
// FREEBIE
 2015-07-01 12:24:38 -07:00
Moxie Marlinspike
9bf7562d49 Use theme-defined weights instead of ThemeType. 
// FREEBIE
 2015-07-01 12:24:38 -07:00
Moxie Marlinspike
ce2f66ad17 Refactor colorization to support dark theme. 
// FREEBIE
 2015-07-01 12:24:38 -07:00