Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
376 Commits 1 Branch 0 Tags 3.4 MiB
a77ff1627d
Commit Graph

358 Commits

Author SHA1 Message Date
Jason A. Donenfeld
53d29b312f More javafication 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-18 05:28:31 +02:00
Jason A. Donenfeld
69f1a35a3f Version bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 06:02:03 +02:00
Jason A. Donenfeld
140fb395dc GoBackend: default MTU is 1280 
This sucks, but it works with mobile networks. Later we can do something
sophisticated like we do with wg-quick.c, but not now.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 05:59:23 +02:00
Jason A. Donenfeld
b5360871e8 Remove sloppy java with enterprise java horrors 
Since the amount of mind numbing boiler plate has been increased, this
must be the proper way to do things.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 05:27:05 +02:00
Jason A. Donenfeld
e40c579b0e global: update various upstreams 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:25:35 +02:00
Aurélien Chabot
4c9143c835 GoBackend: Handle vpn service expiration 
After a timeout the android system is destroying the vpn service when it
is not used. By using a completable future we can wait for the service
to be relaunch on demand.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
74eae55c87 Config: Handle multiple address or dns in config file 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
44698bb000 GoBackend: Add support for multiple address and dns as a comma separated list 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
175f7e16dd GoBackend: parse allowed ips 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
c6d311923a GoBackend: Parse the dns address 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
6878aba911 GoBackend: IPv6 handling 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
d97312b96a GoBackend: Resolve endpoint before passing it to the go lib 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Aurélien Chabot
9dfab4d60f GoBackend: Use the android VpnService to encapsulate the go backend 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-04-17 02:15:24 +02:00
Jason A. Donenfeld
19aec7c5c6 GoBackend: support NO_PI mode 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-02-28 19:59:50 +01:00
Jason A. Donenfeld
f2113f80db Update submodules 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-02-20 17:01:54 +01:00
Jason A. Donenfeld
0ea6f73332 GoBackend: integrate into app 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-02-17 21:14:09 +01:00
Jason A. Donenfeld
b923f7bc57 wg: bump commit 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-02-17 21:14:09 +01:00
Jason A. Donenfeld
d1c863b16e KeyEncoding: add constant time hex implementation 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-02-13 19:47:31 +01:00
Samuel Holland
b22e2b259b manifest: Add permission to read external storage 
This fixes support for file managers that don't proxy the file access
from the file selection dialog through a content provider, and just
return a raw file:// URL. In this case, resolver.openInputStream() tries
to open the file directly, and fails with "Permission denied".

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-02-03 12:47:14 -06:00
Jason A. Donenfeld
a66348c315 Version bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-18 23:17:29 +01:00
Samuel Holland
c683d23125 FileConfigStore: Warn for deletion failure in exception path 
There's nothing we can do about it at this point; we're already rolling
back changes.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-18 04:12:54 -06:00
Samuel Holland
23535c0577 WgQuickBackend: Always pass the full path to wg-quick 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-18 04:10:58 -06:00
Samuel Holland
8dde6c3c0f fragments: Be extra paranoid about the binding getting destroyed 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-18 04:10:58 -06:00
Samuel Holland
54f201174d TunnelManager: Use constants directly where appropriate 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-17 14:35:39 -06:00
Samuel Holland
fb3138bdda Peer: Add missing @Override 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-17 14:35:39 -06:00
Samuel Holland
f63aeea6b8 WgQuickBackend: Clean up unused fields and imports 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-17 14:35:39 -06:00
Samuel Holland
09c207b8a3 ToolsInstaller: Remove double-checked locking 
It can't work and may be crashing the runtime.

Use a lock object to avoid exposing the synchronization in the class's
interface.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-17 14:35:39 -06:00
Samuel Holland
d56eda2fd6 RootShell: Use a lock object instead of sync methods 
This avoids exposing the synchronization implementation details
in the class's interface.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-17 14:35:14 -06:00
Jason A. Donenfeld
75aeec035c Build bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 23:52:02 +01:00
Jason A. Donenfeld
c1cc2774be Manifest: show back arrow on sub activities 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 23:52:02 +01:00
Jason A. Donenfeld
7e06768f75 ToolsInstaller: symlink tools always 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 23:47:13 +01:00
Jason A. Donenfeld
7a618c1463 FileConfigStore: cleanup on rename problem 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 23:26:12 +01:00
Samuel Holland
f8ee7dcce9 QuickTileService: Fix crash opening activity 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-10 11:13:16 -06:00
Samuel Holland
30901a6152 TunnelController: Use helper function to unwrap the Throwable 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-10 00:03:45 -06:00
Samuel Holland
7b9c1a536c model: Use ConfigStore.rename() to avoid recreating tunnels 
Rename all of the functions to be in line with setConfig/setState

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-10 00:03:03 -06:00
Samuel Holland
951afaa9b2 ConfigStore: Add a rename method and implement it 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-10 00:01:52 -06:00
Samuel Holland
5ce7eba2bf FileConfigStore: Simplify error handling 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 23:57:15 -06:00
Jason A. Donenfeld
dfa4a2eb9d WgQuickBackend: properly report exception so alert shows 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 03:16:42 +01:00
Jason A. Donenfeld
df3062c7ad Tunnel: ifname has max len 15 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 02:49:06 +01:00
Jason A. Donenfeld
b3e928c1bf tools: error if setconf fails 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 02:48:05 +01:00
Jason A. Donenfeld
01faa9b358 tools: ifname has max len 15 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 02:38:29 +01:00
Jason A. Donenfeld
a42892bc28 TunnelEditorFragment: do not pass null localConfig 
Otherwise we might dereference it, per this play store gathered trace:

Xiaomi Redmi 3S (land), 2048MB RAM, Android 7.1
java.lang.NullPointerException:
at com.wireguard.android.model.Tunnel.setConfig (Tunnel.java:118)
at com.wireguard.android.fragment.TunnelEditorFragment.onOptionsItemSelected (TunnelEditorFragment.java:160)
at android.app.Fragment.performOptionsItemSelected (Fragment.java:2478)
at android.app.FragmentManagerImpl.dispatchOptionsItemSelected (FragmentManager.java:2182)
at android.app.FragmentController.dispatchOptionsItemSelected (FragmentController.java:336)
at android.app.Activity.onMenuItemSelected (Activity.java:3211)
at com.android.internal.policy.PhoneWindow.onMenuItemSelected (PhoneWindow.java:1219)
at com.android.internal.view.menu.MenuBuilder.dispatchMenuItemSelected (MenuBuilder.java:761)
at com.android.internal.view.menu.MenuItemImpl.invoke (MenuItemImpl.java:152)
at com.android.internal.view.menu.MenuBuilder.performItemAction (MenuBuilder.java:904)
at com.android.internal.view.menu.MenuBuilder.performItemAction (MenuBuilder.java:894)
at android.widget.ActionMenuView.invokeItem (ActionMenuView.java:616)
at com.android.internal.view.menu.ActionMenuItemView.onClick (ActionMenuItemView.java:152)
at android.view.View.performClick (View.java:5637)
at android.view.View$PerformClick.run (View.java:22433)
at android.os.Handler.handleCallback (Handler.java:751)
at android.os.Handler.dispatchMessage (Handler.java:95)
at android.os.Looper.loop (Looper.java:153)
at android.app.ActivityThread.main (ActivityThread.java:6244)
at java.lang.reflect.Method.invoke (Native Method)
at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run (ZygoteInit.java:891)
at com.android.internal.os.ZygoteInit.main (ZygoteInit.java:781)

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 00:54:59 +01:00
Jason A. Donenfeld
138ba5c416 QuickTileService: sometimes tile is null 
According to play store reports, such as:

wt88047, 0MB RAM, Android 8.1
java.lang.NullPointerException:
at com.wireguard.android.QuickTileService.updateTile (QuickTileService.java:97)
at com.wireguard.android.QuickTileService.onStartListening (QuickTileService.java:56)
at android.service.quicksettings.TileService$H.handleMessage (TileService.java:407)
at android.os.Handler.dispatchMessage (Handler.java:106)
at android.os.Looper.loop (Looper.java:164)
at android.app.ActivityThread.main (ActivityThread.java:6520)
at java.lang.reflect.Method.invoke (Native Method)
at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run (RuntimeInit.java:442)
at com.android.internal.os.ZygoteInit.main (ZygoteInit.java:807)

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-10 00:41:28 +01:00
Samuel Holland
c6bdeb1d45 Prepare version 0.3.0 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 10:31:08 -06:00
Samuel Holland
17f8c65b2e WgQuickBackend: Finish the implementation 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 10:31:08 -06:00
Samuel Holland
933a685585 model: Chain completions to avoid race conditions 
Otherwise getConfigAsync().thenCompose(x -> setState()) would be unsafe.

This reverts commit a6595a273afd50524cc66765c6bfbdcc34cb12e4.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 10:03:29 -06:00
Samuel Holland
daacc06a0d global: Clean up error logging 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 09:37:49 -06:00
Samuel Holland
a1d955ef62 WgQuickBackend: Log when tunnels can't be enumerated 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 09:18:03 -06:00
Samuel Holland
ca077dd090 RootShell: Improve shell start error handling 
No need to catch and re-throw exceptions before starting the process. If
running `su` itself fails, there's no (functional) root, so report that.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 09:17:08 -06:00
Samuel Holland
3d6737e32f RootShell: Be stricter about command delimiters 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 09:16:53 -06:00
Jason A. Donenfeld
643b698f30 RootShell: stop if we can't start 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 08:39:07 -06:00
Jason A. Donenfeld
23c09eb655 RootShell: hoist out synchronization 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 15:19:50 +01:00
Jason A. Donenfeld
14638b10ae tools: try not to overflow 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 15:15:15 +01:00
Samuel Holland
426fa7d50b ToolsInstaller: Propagate NoRootException properly 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 08:13:32 -06:00
Samuel Holland
52e8eef9ce RootShell: Simplify, synchronize, clean up 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 08:13:11 -06:00
Samuel Holland
662bc3894b TunnelListFragment: Remove useless keyword 
final doesn't do anything in try-with-resources (it's always final).

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-09 06:25:53 -06:00
Jason A. Donenfeld
1451c4baf5 ToolsInstaller: terminators are better than seperators 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 13:12:49 +01:00
Jason A. Donenfeld
2785def37a RootShell: synchronize accesses to single shell 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 13:12:49 +01:00
Samuel Holland
204755d689 RootShell: Simplify constructor 
ToolsInstaller now takes care of installing the tools.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:49:14 -06:00
Samuel Holland
c806e655fa WgQuickBackend: Ensure tools are available before use 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
5201c7f849 ToolsInstaller: Add a method to ensure tool availability 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
ba30d46e08 WgQuickBackend: Inline resolveState() 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
1cfb938dd1 ToolsInstaller: Add methods to check/make symlinks 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
011d683c23 ToolsInstallerPreference: Examine current state on load 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
b87568482d ToolsInstaller: Add method to check installation status 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
2776455d4f TunnelEditorFragment: Fix dismissing creator activity 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:32 -06:00
Samuel Holland
4f02817ef0 global: Fix or suppress most lints/warnings 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:26 -06:00
Samuel Holland
dd69a2e778 project: Remove currently-unused library 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 23:39:15 -06:00
Samuel Holland
710ffc7bb3 Fragment/Tile: Make success/error messages translatable 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 20:30:03 -06:00
Jason A. Donenfeld
6361628e16 layout: never use suggestions 
IP addresses and key material could be potentially sensitive. We also
don't want any interactions with the suggestive text APIs. So, we mark
it as both a visible password and we turn off suggestions. This will fix
the length limit, too, in Android 8.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 00:23:33 +01:00
Jason A. Donenfeld
da30a6d449 TunnelListFragment: fix plural grammar 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-09 00:23:22 +01:00
Jason A. Donenfeld
1ae10b8f45 RootShell: fix off by one 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-08 20:42:12 +01:00
Jason A. Donenfeld
5944efc13c QuickTileService: show toast for longer and use right messages 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-08 20:30:25 +01:00
Jason A. Donenfeld
7645ea15c4 global: Prefix tags with WireGuard/ 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-08 20:29:51 +01:00
Jason A. Donenfeld
31ba7e6593 RootShell: multiplex commands 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-01-08 19:46:51 +01:00
Samuel Holland
ae2068dc16 Port over remaining error handling 
This doesn't really belong here, but there's no sense in throwing it
away--even here, it's a minor optimization.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 04:34:28 -06:00
Samuel Holland
c4e91f8040 Handle tunnel state change errors appropriately 
This class should probably be renamed and moved, but I don't know to
what or where.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 04:33:54 -06:00
Samuel Holland
c40555c1bd TunnelListFragment: Fix crash on deleting multiple tunnels 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 04:31:30 -06:00
Samuel Holland
b6ed17884f ToggleSwitch: Improve reliability 
It's not great, but it's better than it was.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 04:31:04 -06:00
Samuel Holland
668d90f063 WgQuickBackend: Improve error handling 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 04:25:15 -06:00
Samuel Holland
ec81014c4e Tunnel: Add a State factory method 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 04:25:15 -06:00
Samuel Holland
d645d69847 project: Global cleanup 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 02:19:13 -06:00
Samuel Holland
88e30431cb Application: Remove unneeded exported component 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 00:35:35 -06:00
Samuel Holland
08cca56388 ToolsInstaller: Extract to its own classes 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-08 00:34:55 -06:00
Samuel Holland
1f30e133d6 TunnelManager: Simplify save/resume methods 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 21:52:14 -06:00
Samuel Holland
4a3d68bb7d BaseActivity: Make variable names consistent 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 21:51:55 -06:00
Samuel Holland
1fd9547f6a TunnelManager/QuickTileService: Remember last used tunnel 
This is actually a bit simpler than having a manually-selected "primary"
tunnel, and is hopefully easier for the user.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 21:50:43 -06:00
Samuel Holland
38b2aafce8 Remove primary configuration preference 
It is no longer used.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 21:46:41 -06:00
Samuel Holland
16c0b5b15a FileConfigStore: Move function returns outside try blocks 
This makes more clear what things can throw exceptions, and the
functions' control flow.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 20:33:39 -06:00
Samuel Holland
0ab3e29432 Tunnel: Remove UNKNOWN state 
It's never used.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 20:33:07 -06:00
Samuel Holland
11f851abf8 Move bundle keys where they are used 
This both clarifies and simplifies the code.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 20:32:01 -06:00
Samuel Holland
cef97b990e WgQuickBackend: Prefer ArrayList over LinkedList 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 01:45:27 -06:00
Samuel Holland
e01813487f app: Upgrade to build tools version 27.0.3 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 01:33:11 -06:00
Samuel Holland
137325d3cc ConfigEditorFragment: Support renaming tunnels 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 01:23:08 -06:00
Samuel Holland
30396b8718 model: Allow renaming tunnels 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 01:22:31 -06:00
Samuel Holland
e70b242c01 model: Remove confusing uses of completion chaining 
This looks like the builder pattern, but isn't.

Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 00:41:47 -06:00
Samuel Holland
77fdd7c883 TunnelListFragment: Name a CompletionStage what it is 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 00:26:08 -06:00
Samuel Holland
1862ff0bbe Tunnel: The name passed to isNameValid is never null 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 00:25:49 -06:00
Samuel Holland
2f5494d47c ConfigEditorFragment: Ensure localName is never null 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 00:25:33 -06:00
Samuel Holland
be8b6017d5 Make TunnelManager the point of asynchronicity 
Signed-off-by: Samuel Holland <samuel@sholland.org>
 2018-01-07 00:24:56 -06:00