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

1006 Commits

Author SHA1 Message Date
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
Moxie Marlinspike
183f8742a7 ViewStub for ThumbnailView in ConversationItem 
// FREEBIE
 2017-01-20 10:27:18 -08:00
Moxie Marlinspike
e270e8d429 ViewStub for AudioView in ConversationItems 
// FREEBIE
 2017-01-20 09:11:40 -08:00
Moxie Marlinspike
41c9bed155 ViewStub for EmojiDrawer 
// FREEBIE
 2017-01-19 11:47:02 -08:00
Moxie Marlinspike
508a666e76 ViewStub for ReminderView, lazy create AttachmentTypeSelector 
// FREEBIE
 2017-01-19 11:47:02 -08:00
Moxie Marlinspike
3d6cbdd775 ViewStub for entire AttachmentManager 
// FREEBIE
 2017-01-19 11:47:02 -08:00
Moxie Marlinspike
0a25c3a33d Updated language translations 
// FREEBIE
 2017-01-17 20:56:56 -08:00
Moxie Marlinspike
80503067e9 Updated language translations 
// FREEBIE
 2017-01-13 18:06:19 -08:00
Moxie Marlinspike
c6d6e0e97e Updated language translations 
// FREEBIE
 2017-01-12 16:37:30 -08:00
Veeti Paananen
4dae4444bc Fix right-to-left language support for voice recording 
Bug: fixes #5999

// FREEBIE
 2017-01-12 11:47:43 -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
Moxie Marlinspike
4ad989cc38 Fix rounded corners bitmap double free 
Fixes #4732
// FREEBIE
 2017-01-08 13:06:11 -08:00
Moxie Marlinspike
d280604f1f Fix compileSdk 25 problems with GIF search 
For #5965
// FREEBIE
 2017-01-07 11:02:18 -08:00
Moxie Marlinspike
1a57ff16cd Updated language translations 
// FREEBIE
 2017-01-06 11:36:02 -08:00
Moxie Marlinspike
d2be49af42 Support for tiling image view and large image viewing 
Fixes #5949
Fixes #5574
Fixes #4380
// FREEBIE
 2017-01-02 17:17:48 -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
Moxie Marlinspike
541718fd11 Support for censorship circumvention in Egypt and UAE 
// FREEBIE
 2016-12-20 09:55:52 -08:00
Moxie Marlinspike
c3ab6e6c29 Updated language translations 
// FREEBIE
 2016-12-19 11:10:35 -08:00
Moxie Marlinspike
c7e373ed55 Update emoji category images to fix SDK <21 tinting issues 
Fixes #5973
// FREEBIE
 2016-12-18 21:05:01 -08:00
Moxie Marlinspike
71f8e9eb31 Revert support library update, the future wasn't all we hoped for 
Fixes #5965
// FREEBIE
 2016-12-18 19:06:39 -08:00
Moxie Marlinspike
4ff8de0ca8 Remove superfluous icon and padding that came with sdk 24 
Fixes #5965
// FREEBIE
 2016-12-17 15:52:27 -08:00
Moxie Marlinspike
9a1225fe21 Updated language translations 
// FREEBIE
 2016-12-16 09:59:06 -08:00
Moxie Marlinspike
ee07a59950 Updated language translations 
// FREEBIE
 2016-12-15 10:44:03 -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
a4c17e5325 Support for generating video thumbnails 
// FREEBIE
 2016-12-12 17:38:05 -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
Moxie Marlinspike
f6cbae602d Fix broken build (grrr @RiseT) 
// FREEBIE
 2016-12-01 12:03:01 -08:00
Moxie Marlinspike
e3a7781392 Updated language translations 
// FREEBIE
 2016-12-01 11:38:19 -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
69b102bfe3 Support for playing video in-app 
// FREEBIE

Closes #5892
 2016-11-27 19:38:59 -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
Mattias Eriksson
9148b7da5f Initial Android Auto support 
This adds android auto support accordign to
https://developer.android.com/training/auto/messaging/index.html#messaging
However, since android auto is not officially supported in my country,
the functionality is limited. Which means that I have not been able
to fully test everything yet.

What work is:
* Message notification is shown.
* When you click on it, the message is read.

Closes #5880
 2016-11-27 19:33:11 -08:00
Moxie Marlinspike
030df09f67 Updated language translations 
// FREEBIE
 2016-11-24 09:05:16 -08:00
Moxie Marlinspike
7c0dacc627 Updated language translations 
// FREEBIE
 2016-11-22 21:46:36 -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
f4b5daabdb Updated language translations 
// FREEBIE
 2016-11-14 19:53:56 -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
7d98b85ae7 Updated language translations 
// FREEBIE
 2016-11-14 13:40:24 -08:00
Moxie Marlinspike
c5bf84cf9c Make blocking SN changes the default for now 
// FREEBIE
 2016-11-14 13:36:48 -08:00
Moxie Marlinspike
06325470ce Updated language translations 
// FREEBIE
 2016-11-13 17:35:34 -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
Moxie Marlinspike
0abe56171a Enable non-blocking safety number changes 
// FREEBIE
 2016-11-11 19:07:35 -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
Moxie Marlinspike
971bcb8213 Updated language translations 
// FREEBIE
 2016-11-01 09:03:02 -07:00
Moxie Marlinspike
0e5d71e1a5 Updated language translations 
// FREEBIE
 2016-10-29 11:05:55 -07:00
Moxie Marlinspike
1ef5e5eb52 Updated language translations 
// FREEBIE
 2016-10-27 11:51:06 -07:00
Moxie Marlinspike
ab00ce7455 Updated language translations 
// FREEBIE
 2016-10-25 13:41:04 -07: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
b8d938a020 Limit giphy search bar to one line 
// FREEBIE
 2016-10-24 14:00:56 -07:00
Moxie Marlinspike
69d0242574 Giphy integration 
// FREEBIE
 2016-10-18 10:28:42 -07:00
Moxie Marlinspike
66bc5e9f5b Update language translations 
// FREEBIE
 2016-10-10 13:35:57 -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
FeuRenard
ff2cb6935d Make 'Tap to scan' readable in dark theme 
Fixes #5749
Closes #5762
//FREEBIE
 2016-10-09 09:48:17 -07:00
Moxie Marlinspike
f85ff090f5 Update language translations 
// FREEBIE
 2016-10-08 14:07:04 -07:00
Moxie Marlinspike
6708193938 Updated language translations 
// FREEBIE
 2016-10-07 18:54:35 -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
6422178baf Updated language translations 
// FREEBIE
 2016-10-06 19:59:55 -07:00
Moxie Marlinspike
d36d000dc5 Increase minLines on disappearing messages duration dialog 
This isn't foolproof across all translations, but it's probably
the best we can do.

Fixes #5746

// FREEBIE
 2016-10-05 16:17:10 -07:00
Moxie Marlinspike
da029ebc24 Update language translations 
// FREEBIE
 2016-10-05 12:37:54 -07:00
Moxie Marlinspike
549e45e2d6 Disable non-blocking identity changes for iOS compat 
// FREEBIE
 2016-10-05 10:27:32 -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
Moxie Marlinspike
751830d38f Updated language translations 
// FREEBIE
 2016-09-14 17:03:36 -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
3432db37d9 Fix scrollbars 
Fixes #5487
Closes #5671

// FREEBIE
 2016-09-14 16:37:28 -07:00
Moxie Marlinspike
df19cdd4fb Updated language translations 
// FREEBIE
 2016-09-06 18:26:38 -07:00
Moxie Marlinspike
f961c0574a Updated language translations 
// FREEBIE
 2016-09-01 20:46:45 -07:00
Moxie Marlinspike
a23abda5fc Fix translation 
// FREEBIE
 2016-09-01 17:06:42 -07:00
Moxie Marlinspike
17c28da2ac Updated language translations 
// FREEBIE
 2016-09-01 16:57:30 -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
Nicholas Rizzio
8c631ad765 Correct a couple more invite shortlinks to use HTTPS 
Closes #5511
// FREEBIE
 2016-08-22 18:45:15 -07:00
Moxie Marlinspike
474920280c Fix broken escapes 
// FREEBIE
 2016-05-20 14:19:40 -07:00
Moxie Marlinspike
263b0921c3 Updated language translations 
// FREEBIE
 2016-05-20 13:56:42 -07:00
Christian Ascheberg
2a23b53988 add contextual menu items to NewConversationActivity 
Closes #5390
// FREEBIE
 2016-05-20 13:16:08 -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
Moxie Marlinspike
2e4f8be235 Updated language translations 
// FREEBIE
 2016-03-24 14:47:44 -07:00
Pascal Hartig
6a88434338 Change ic_menu_lock_dark to full opacity white 
Fixes #5342
Closes #5343
// FREEBIE
 2016-03-15 19:15:10 -07:00
Moxie Marlinspike
94b0176515 Updated language translations 
// FREEBIE
 2016-03-13 15:48:37 -07:00
Pascal Hartig
f0b832e287 Change lock icons 
Closes #5325
// FREEBIE
 2016-03-13 15:46:41 -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
Jani Monoses
0155d21967 Use switch instead of checkbox for emoji setting. 
Closes #5167
Fixes #5073
// FREEBIE.
 2016-03-07 16:09:38 -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
Moxie Marlinspike
97ff7a192d Updated language translations 
// FREEBIE
 2016-02-26 10:17:42 -08:00
Moxie Marlinspike
25020d114a Updated language translations 
// FREEBIE
 2016-02-19 10:53:47 -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
Ali İskender Turan
1575665266 Update notification_icon.png 
Old notification icon replaced with new one.

Closes #5250
 2016-02-18 17:52:01 -08:00
Moxie Marlinspike
b69c109d6b Updated language translations 
// FREEBIE
 2016-02-10 17:50:15 -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
Moxie Marlinspike
7fcd9c36bf Updated language translations 
// FREEBIE
 2016-01-30 14:33:37 -08:00
Jani Monoses
847142d0f6 No need for capitalization in page title. 
Closes #5097
// FREEBIE
 2016-01-27 12:22:30 -08:00
2-4601
058585bf81 Fix five strings 
Fixes
- one ambiguous pronoun
- one remaining reference of ambiguous 'lock screen'
- three cases of 'click' -> 'tap'

And gets rid of unnecessary line breaks in two strings.

Closes #5095
// FREEBIE
 2016-01-27 12:21:32 -08:00
Geonu Kang
999a7431ac Make debug log strings more consistent 
Fixes #5083
Closes #5087
// FREEBIE
 2016-01-27 12:17:43 -08:00
Luc Ritchie
f3f80f0c6e Theme background color in device link screens 
Fixes #4611
Closes #5066
 2016-01-27 12:14:40 -08:00
haffenloher
1abf39685a Use larger version of ic_contact_picture in calls 
Closes #4971
Fixes #4245
// FREEBIE
 2016-01-27 11:59:10 -08:00
Moxie Marlinspike
d8b197dbc4 Updated language translations 
// FREEBIE
 2016-01-04 13:13:26 -08:00
Moxie Marlinspike
759f9d8016 Support for location drafts 
Fixes #4979
// FREEBIE
 2016-01-04 13:02:22 -08:00
Moxie Marlinspike
2b359d4642 Updated language translations 
// FREEBIE
 2015-12-27 13:21:05 -08:00
agrajaghh
759ecbc7b8 completely hide location button on API < 16 
Closes #4964
// FREEBIE
 2015-12-25 14:39:49 -08:00
mimi89999
8b46dda004 Center "Take photo" text in attachment selector 
Fixes #4959
Closes #4961
 2015-12-25 14:37:56 -08:00
Moxie Marlinspike
bcf95e50aa Support for location messages 
Start with encoding as a simple image thumbnail for compatibility
with MMS and iOS

// FREEBIE
 2015-12-24 07:47:25 -08:00
agrajaghh
4fa6680f83 RTL support 
Closes #4916
Fixes #4714
 2015-12-24 07:47:25 -08:00
Christian Ascheberg
fd570310e0 fix more plurals 
Closes #4898
// FREEBIE
 2015-12-24 07:47:25 -08:00
agrajaghh
ed592950c0 setting to disable notifications for new contacts 
also mute these notifications between 23:00 and 09:00

fixes #4572
Closes #4926
 2015-12-24 07:47:25 -08:00
RiseT
d238e2bbc5 Wording: Improve some strings in Privacy preferences 
Closes #4907
Fixes #4651
// FREEBIE
 2015-12-24 07:47:25 -08:00
Moxie Marlinspike
e0c3b105e7 Updated language translations 
// FREEBIE
 2015-12-11 23:29:41 -08:00
McLoo
50d33be0aa Add Chinese (Traditional) to language list 
Closes #4855
//FREEBIE
 2015-12-10 18:58:54 -08:00
Darren Foong
43c784f564 Fix wrong Chinese language entry 
Fixes #4845
Closes #4846
// FREEBIE
 2015-12-10 05:04:03 -08:00
Christian Ascheberg
08b61572e9 fix some plurals 
Closes #4815
Fixes #4811
// FREEBIE
 2015-12-10 05:04:03 -08:00
Christian Ascheberg
4696837f2f warn user before build expires 
Closes #4322
// FREEBIE
 2015-12-10 05:04:03 -08:00
junitas
038f24f394 Set maximum group name 
Closes #3438
 2015-12-10 05:04:03 -08:00
RiseT
307578eb18 Wording ambiguity: Archived conversation -> Conversation archived 
Closes #4802
// FREEBIE
 2015-12-10 05:04:03 -08:00
Moxie Marlinspike
e4cf4dacd4 Update language translations 
// FREEBIE
 2015-12-07 23:49:26 -08:00
Moxie Marlinspike
6c4df2919c Updated language translations 
// FREEBIE
 2015-12-03 17:57:24 -08:00
Moxie Marlinspike
73acd1f3a2 Take people into Signal when they attempt to link w/ 3rd party scan 
// FREEBIE
 2015-12-03 14:39:13 -08:00
haffenloher
7c95adc7e6 Add delivery status icons to the conversation list 
Closes #4710
 2015-12-03 11:28:04 -08:00
Jake McGinty
df5c497b5b remove compat actionbar shadow for invite page 
// FREEBIE
 2015-12-03 10:22:11 -08:00
Geonu Kang
8afdbc1f4d Fix NewConversationActivity toolbar/overflow dynamic theming 
Fixes #4624
Closes #4626
 2015-12-03 10:21:58 -08:00
Geonu Kang
afb21203b7 Extract "Today" in device list item to string resource 
Related to #4752
Closes #4780
// FREEBIE
 2015-12-02 09:36:32 -08:00
Geonu Kang
d0a65f86f5 Add color to "Scan the QR code" in DeviceAddFragment 
Fixes #4771
Closes #4776
// FREEBIE
 2015-12-02 09:35:10 -08:00
Geonu Kang
29f4f269fc Make "New Message!" notification string more consistent with guidelines 
Fixes #4758
Closes #4759
// FREEBIE
 2015-12-02 09:33:23 -08:00
RiseT
65176c940e Wording consistency: thread -> conversation 
Closes #4753
// FREEBIE
 2015-12-02 09:31:56 -08:00
Geonu Kang
591ee92e45 Add string resource for unarchive button title 
Fixes #4747
Closes #4748
// FREEBIE
 2015-12-02 09:30:29 -08:00