mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,448 Commits 1 Branch 412 Tags 39 MiB
Commit Graph

2796 Commits

Author SHA1 Message Date
M66B 11127101c9 Revert "use new session per ICMP ID" 
This reverts commit a8bc2b4a33.
 2018-03-28 07:54:22 +02:00
Marcel Bokhorst ff89f4ad37
Merge pull request #513 from top-master/master 
use new session per ICMP ID
 2018-03-27 14:50:11 +02:00
top master a8bc2b4a33 use new session per ICMP ID 
restore ICMP id change and use new session instead:
I always try to save memory but this wents this time bad, we do need a new session for each port/id or ICMP will never work right.
 2018-03-27 15:25:41 +04:30
top master 864c676dce Revert "git rid of ICMP hack" 
This reverts commit 680b0e3e1d.
 2018-03-27 15:13:18 +04:30
M66B 9b1e1d5817 2.192 release 2018-03-27 12:05:58 +02:00
Marcel Bokhorst 77ef69955b
Merge pull request #512 from top-master/master 
git rid of ICMP response hack
 2018-03-27 08:36:23 +02:00
top master 680b0e3e1d git rid of ICMP hack 
**Reproduce Failure:**
1. install and run any ping app that does repeat `ICMP` requests to the same web-site/IP but every time on an other `port` like [ping](https://apkpure.com/ping/com.lipinic.ping)
2. start `NetGuard` and block every thing except that mentioned `ping` app
3. provide a valid IP to `ping` app and press its `start` button
all done ping will start but you will see the first request gets answered but for any other request after first `ping` will say "`time out`" since every time the app does use an other `port`/`icmp-id`.
 2018-03-27 10:47:35 +04:30
top master fa624ce279 Revert "ICMP management Fix" 
This reverts commit 8877e06f04.
 2018-03-27 10:38:35 +04:30
M66B 62753cd5e4 Increase session limit to 40% 2018-03-26 17:19:45 +02:00
top master 8877e06f04 ICMP management Fix 
the first ICMP session that gets created did never stop, when there comes unstop other requests for an other port/id after the first all others will fail since the requestor checks the ICMP id that it last used but it did got from NetGuard the first id used for that site.

we did find the bug using Apps whichs only propose are to ping and only the first ping got ever answered
 2018-03-26 14:32:16 +04:30
M66B 180dd7dc7a Force remove storage permission 2018-03-26 11:11:31 +02:00
M66B f5ea6bd54d 2.191 release 2018-03-25 07:17:39 +02:00
M66B c1ebd474a9 Increase session limit to 1024 x 30% 2018-03-25 07:17:09 +02:00
M66B 630eee16a8 Crowdin sync 2018-03-25 07:16:46 +02:00
M66B decf2fee3c Out of memory is not own fault 2018-03-23 09:45:22 +01:00
M66B c2c0d62f28 2.190 release 2018-03-23 07:23:03 +01:00
M66B d1df09ff51 Disabled app icon caching 2018-03-23 07:22:17 +01:00
M66B e10c07d2fa 2.189 release 2018-03-22 10:11:02 +01:00
M66B f02c5950bf Crowdin sync 2018-03-22 10:10:52 +01:00
M66B e9fe933b3a Increase default window size 2018-03-22 10:07:45 +01:00
M66B 5c45632cce Strip interface name from DNS server name, Crowdin sync 2018-03-18 07:44:19 +01:00
M66B 6a0d70739e Disable app icon caching log 2018-03-11 13:08:14 +01:00
M66B dfb3f366f7 Crowdin sync 2018-03-11 12:49:10 +01:00
M66B c690080371 Updated libraries 2018-03-11 12:33:09 +01:00
M66B 2f4728abfc Disable Glide caching 2018-03-11 12:32:57 +01:00
M66B e7d747d1d6 Crowdin sync 2018-03-11 12:32:40 +01:00
M66B a505db4032 2.186 release 2018-02-24 09:49:36 +01:00
M66B c2162f55f5 Removed power saving 2018-02-24 09:49:23 +01:00
M66B b3a01d5c43 2.185 release 2018-02-22 08:57:15 +01:00
M66B c202a8263e Fixed user switching 2018-02-22 08:56:44 +01:00
M66B 6fdbecb531 2.184 release 2018-02-20 18:03:02 +01:00
M66B 6302690216 Crowdin sync 2018-02-20 17:58:59 +01:00
M66B 903c91794e Increase shown addresses 2018-02-20 13:22:23 +01:00
M66B bb1f8d699e Changed address lookup 2018-02-19 08:26:16 +01:00
M66B a561caf8c9 Storage permission is not needed anymore 2018-02-12 12:13:29 +01:00
M66B affaf91829 2.182 release 2018-02-08 17:27:40 +01:00
M66B a5910a6a41 Disable Xposed check 2018-02-08 17:27:23 +01:00
M66B 42741181b3 2.181 release 2018-02-07 15:34:32 +01:00
M66B 70651b96d0 Fixed accessibility services crash 2018-02-07 15:34:17 +01:00
M66B 26021a18c7 2.180 release 2018-02-06 18:44:56 +01:00
M66B 927dfab970 Refactoring 2018-02-06 18:41:50 +01:00
M66B 245b006864 2.179 release 2018-02-06 15:34:49 +01:00
M66B 354ce6c605 Let Glide auto clear 2018-02-06 15:34:32 +01:00
M66B adf92fb7bb 2.178 release 2018-02-06 11:47:34 +01:00
M66B a44fcc4154 Attempt to fix accessibility services crash 2018-02-06 11:46:32 +01:00
M66B 139801d233 2.177 release 2018-02-04 12:33:45 +01:00
M66B d8cbe18294 Block domains by correct IP version 2018-02-04 12:33:22 +01:00
M66B a89ecce786 2.176 release 2018-02-04 09:07:06 +01:00
M66B 742e017db3 Fixed potential crash 2018-02-04 09:04:59 +01:00
M66B 7f20bcc46f 2.175 release 2018-02-03 09:49:32 +01:00
M66B 76f567c75d Enabled TCP no delay 2018-02-03 09:49:04 +01:00
M66B 39b5aae08e 2.174 release 2018-02-02 20:06:03 +01:00
M66B 494e0123a7 Fixed Crowdin import 2018-02-02 17:59:06 +01:00
M66B ca6df65984 2.173 release 2018-02-02 11:06:12 +01:00
M66B c580c3843e Fixed blocking IP addresses without domain name 2018-02-02 11:05:28 +01:00
M66B 4d96ac8368 2.172 release 2018-02-01 14:46:23 +01:00
M66B e572edcef6 Crowdin sync 2018-02-01 14:46:14 +01:00
M66B fbf4d9ea46 Prevent scrolling 2018-02-01 14:42:56 +01:00
M66B 8d6da69180 Reduce memory usage 2018-02-01 14:29:40 +01:00
M66B 19c71580a5 Set maximum number of connections to 255 2018-02-01 14:28:00 +01:00
M66B 2fe4e8de4c 2.171 release 2018-01-23 12:42:58 +01:00
M66B 0871664613 Fixed send window calculation 2018-01-23 12:42:46 +01:00
M66B 28e30b7bdf Crowdin sync 2018-01-23 12:42:29 +01:00
M66B 69e05ac3d0 2.170 release 2018-01-21 10:07:45 +01:00
M66B ac0424c498 Attempt to fix upload problems 2018-01-21 09:57:36 +01:00
M66B 301e07652f Crowdin sync 2018-01-21 09:57:22 +01:00
M66B 32fa8cb47f 2.169 release 2018-01-12 07:27:41 +01:00
M66B 76cd3f351f Crowdin sync 2018-01-12 07:27:26 +01:00
M66B 54119a6259 Updated build tools and remove deprecated ABIs 2018-01-12 07:26:34 +01:00
M66B a064ed66e4 Fixed Xposed check 2018-01-12 07:26:24 +01:00
M66B e21e6c9c3e 2.168 release 2018-01-10 06:45:15 +01:00
M66B 72240041db Allow Xposed for GitHub installs 2018-01-10 06:44:53 +01:00
M66B 12a86a9216 Added copy to access log 2018-01-10 06:26:29 +01:00
M66B 9b27f8d120 Merge branch 'master' of github.com:M66B/NetGuard 2018-01-10 06:19:39 +01:00
M66B fddee65f20 Crowdin sync 2018-01-10 06:19:15 +01:00
Banny 4e62532919 Bug fix for sdk initializer. 2018-01-06 15:21:26 +08:00
M66B 49d0e1905b 2.167 release 2018-01-05 09:07:26 +01:00
M66B bbc1658e41 Added option to copy address/name, crowdin sync 2018-01-05 09:06:14 +01:00
M66B f0066af16a Use Glide to load app icons 
Loading vector images has been fixed now
 2018-01-05 08:49:50 +01:00
M66B b130571b89 Prepare for 2018 2017-12-24 10:12:10 +01:00
M66B 77a53b34da Retry interactive failed state change 2017-12-24 09:02:13 +01:00
M66B 0309cb187f Fixed warnings 2017-12-21 14:34:41 +01:00
M66B cf80f4a14e 2.166 release 
Added 64-bit ABIs, removed deprecated armeabi
 2017-12-20 17:39:16 +01:00
M66B c6d30af095 Crowdin sync 2017-12-20 17:29:40 +01:00
M66B ff6415846f 2.165 release 2017-12-17 09:29:18 +01:00
M66B 3d3d230b30 Crowdin sync 2017-12-17 09:29:09 +01:00
M66B d56c629159 Limit icon loading threads to number of available processors 2017-12-17 09:26:10 +01:00
M66B fe59be7e89 Updated build tools and libraries 2017-12-16 13:39:15 +01:00
M66B b7b2b45dd4 2.164 release 2017-11-28 13:34:04 +01:00
M66B 212fa3d33a Own fault 2017-11-28 13:33:52 +01:00
M66B 163df75104 2.163 release 2017-11-19 18:46:37 +01:00
M66B b855d0cc5d 2.162 release 2017-11-17 08:15:57 +01:00
M66B b53ced9ed7 Fixed crash with Xposed installed 2017-11-17 08:15:40 +01:00
M66B fe5ed84422 2.161 release 2017-11-15 09:01:16 +01:00
M66B 49a359053d Log/notify other apps only 2017-11-15 09:00:00 +01:00
M66B 2ad2e70815 2.160 release 2017-11-14 08:49:51 +01:00
M66B b31ef2cf8d Workaround bug in older Android versions 2017-11-11 10:38:06 +01:00
M66B d2a6042a6a Revert "Enable connectivity monitor on Android 6 or later only" 
This reverts commit 83ac6b7996.
 2017-11-11 10:36:02 +01:00
M66B 83ac6b7996 Enable connectivity monitor on Android 6 or later only 2017-11-11 10:21:47 +01:00
M66B e3509eb283 2.159 release 2017-11-11 08:48:10 +01:00
M66B 023fe81c10 Use normal priority for forwarding 2017-11-11 08:47:31 +01:00
M66B af5796f220 Always allow self 2017-11-11 08:42:57 +01:00
M66B 477a624682 Bring back the settings button, cleanup 2017-11-11 08:42:40 +01:00
M66B 66cf9dd012 Updated test device ID 2017-11-10 15:41:33 +01:00
M66B 3a56da08b4 2.158 release 2017-11-10 09:53:53 +01:00
M66B 9a683d6fb6 Fixed concurrency crash 2017-11-10 09:44:16 +01:00
M66B 5059739900 2.157 release 2017-11-10 08:07:31 +01:00
M66B 7b7d5caf3c Prevent sockets from lingering to long 2017-11-10 07:49:27 +01:00
M66B b64887dbfa Added JNI context 2017-11-09 19:07:08 +01:00
M66B 605b0fb756 Exclude broadcast address when allowing lan, route IPv6 unicast only 2017-11-09 17:05:11 +01:00
M66B eb4a7ff1f9 Report unhandled exceptions for Play store installs only 2017-11-09 16:24:37 +01:00
M66B c97958c072 Stop listing self 2017-11-09 15:59:09 +01:00
M66B e08ce49f63 Updated build tools 2017-11-09 13:51:02 +01:00
M66B 8450e9e5df 2.156 release 2017-11-09 10:52:09 +01:00
M66B 6e263c4126 Crowdin sync 2017-11-09 10:52:00 +01:00
M66B 77c347da03 Added connectivity monitoring 2017-11-09 10:51:42 +01:00
M66B 286fcfefd5 2.155 release 2017-11-07 21:37:13 +01:00
M66B 1e3965b58d 2.154 release 2017-11-07 16:29:18 +01:00
M66B 80c9d3d446 Fixed crash on stop (2) 2017-11-07 16:29:08 +01:00
M66B a18fa7b614 2.153 release 2017-11-07 16:14:43 +01:00
M66B 4c26a0b84c Fixed crash on stop 2017-11-07 16:14:30 +01:00
M66B e02820260c 2.152 release 2017-11-07 08:22:23 +01:00
M66B 96a580ce5d Crowdin sync 2017-11-07 08:22:15 +01:00
M66B 72941a9e88 Use manage thread for native code 2017-11-06 11:17:03 +01:00
M66B 0f37f52499 2.151 release 2017-11-06 07:05:50 +01:00
M66B 5658cf048f Crowdin sync 2017-11-06 07:05:32 +01:00
M66B 46a0378f19 Simplify icon loading 2017-11-05 20:36:55 +01:00
M66B 7735a3b228 Remove partial rule load 2017-11-05 18:26:41 +01:00
M66B 0cbf93d2e6 Updated signal icons 2017-11-05 17:43:24 +01:00
M66B e89437a315 Persistent app property cache 2017-11-05 16:43:51 +01:00
M66B 2d5302d215 Faster related packages 2017-11-05 15:38:28 +01:00
M66B 9f0cf42983 Removed dependency on application info 2017-11-05 15:17:09 +01:00
M66B eb7334814c Fixed crash on sort on name, removed dependency on Picasso, require Android 5.1 2017-11-05 10:56:25 +01:00
M66B d485ffa50e Crowdin sync 2017-11-05 08:09:45 +01:00
M66B 7bf9a707e4 More efficient service reload 2017-11-05 08:08:36 +01:00
M66B 928eab71a6 Cache uids 2017-11-05 08:08:20 +01:00
M66B 927c53b8bb Require Android 5.1 2017-11-04 16:48:21 +01:00
M66B 6e26fa19ff Better Xposed check, fixed Android version check 2017-11-04 16:39:06 +01:00
M66B 392825f36a 2.148 release 2017-11-04 09:58:40 +01:00
M66B 082b09398b Crowdin sync 2017-11-04 09:57:02 +01:00
M66B 334208b0f0 Check for Xposed 2017-11-04 09:52:16 +01:00
M66B cacd3307cc Android version 5.0 required 2017-11-03 07:44:20 +01:00
M66B a300bf0bf7 2.147 release 2017-10-28 16:18:40 +02:00
M66B 6b625e5634 Prevent crashes 2017-10-28 16:08:06 +02:00
M66B b1aecac20a 2.146 release 2017-10-27 16:48:32 +02:00
M66B 1d27b5723d Do not report exceptions to Android 2017-10-27 16:48:14 +02:00
M66B 7993b557de 2.145 release 2017-10-27 12:57:45 +02:00
M66B 6a6c3f7d0d Disable crash reporting 2017-10-27 12:57:32 +02:00
M66B 5aee9cbfc0 2.144 release 2017-10-26 22:03:00 +02:00
M66B 264040515c Crowdin sync 2017-10-26 22:02:53 +02:00
M66B a3b2876fa7 2.143 release 
Updated tools and libraries
Target SDK set to 27 (Android 8.1)
Minimum SDK set to 21 (Android 5.0)
 2017-10-25 21:24:53 +02:00
M66B 7e0ec6fadb Remove abort handler 2017-10-25 21:19:36 +02:00
M66B 39b09f731d Updated .gitignore 2017-10-23 22:09:45 +02:00
M66B 38e8c5698e Switch from Gradle experimental to cmake 2017-10-23 22:05:13 +02:00
M66B fd28060e9e 2.141 release 2017-10-22 09:39:26 +02:00
M66B 64e2730525 Attempt to continue after abort 2017-10-22 09:39:11 +02:00
M66B 97f994f075 2.140 release 2017-10-22 08:04:41 +02:00
M66B 3c6aab7299 Crowdin sync 2017-10-22 08:03:53 +02:00
M66B 7e0aa57e15 Reduce max number of sessions 2017-10-22 08:02:49 +02:00
M66B c5d583d425 Skip protect socket from Lollipop 2017-10-22 08:00:08 +02:00
M66B d8cb7939b0 Prevent ANR 2017-10-22 07:39:07 +02:00
M66B 8a79074e55 2.139 release 2017-10-15 15:05:51 +02:00
M66B 95c911c9a1 Crowdin sync 2017-10-15 15:05:08 +02:00
M66B b572773e3b Check for Always-on VPN 2017-10-15 15:03:56 +02:00
M66B 0f12b66914 2.138 release 2017-09-28 10:20:25 +02:00
M66B 56ca3ceee0 Added GPS daemon 2017-09-28 10:18:22 +02:00
M66B d00e51aced 2.137 release 2017-09-21 08:05:32 +02:00
M66B 489b13527c Fixed dependencies 2017-09-21 07:53:36 +02:00
M66B cfb7e98d06 Updated libraries 2017-09-20 09:54:28 +02:00
M66B dc1290d472 Fixed displaying blocked/allowed counts 2017-09-20 09:49:32 +02:00
M66B 97103736f2 2.136 release, updated libraries 2017-09-19 11:15:13 +02:00
M66B c493a4e3fa Fixed flickering 2017-09-19 11:14:57 +02:00
M66B 94b30e0fdd Crowdin sync 2017-09-19 11:14:23 +02:00
M66B 5f30bfa8ac 2.135 release 2017-09-12 07:33:24 +02:00
M66B 4d8431e706 Android Oreo fix 2017-09-12 07:22:40 +02:00
M66B 0525ed94b4 Crowdin sync 2017-09-12 07:11:21 +02:00
M66B 5c8b16ba32 2.134 release 2017-09-09 08:05:58 +02:00
M66B 23353234f2 Use network callbacks for Android 6 Marshmallow 2017-09-09 08:05:32 +02:00
M66B 9876388636 Fixed ipinfo 2017-09-09 08:04:57 +02:00
M66B 95447c48b3 2.133 release 2017-09-02 08:06:18 +02:00
M66B 72c73e35eb Changed download link 2017-09-01 13:43:44 +02:00
M66B ef77c98a72 2.132 release 2017-08-31 10:59:09 +02:00
M66B 4d10a3b3b2 Updated libraries 2017-08-31 10:59:00 +02:00
M66B 0b309d96e3 Crowdin sync 2017-08-31 10:48:05 +02:00
M66B 2671c34976 Prevent crash 2017-08-24 17:23:42 +02:00
M66B 84cdf13a78 2.131 release 2017-08-23 22:34:37 +02:00
M66B 639c25f3e1 Require Android 7 for network callbacks 2017-08-23 22:34:11 +02:00
M66B 22e59d6094 Crowdin sync 2017-08-23 22:32:23 +02:00
M66B 2271e38f21 2.130 release 2017-08-20 14:31:23 +02:00
M66B 7c1e8b0702 Use connectivity action for Android L 2017-08-20 14:31:05 +02:00
M66B 0dd3ad5b8f 2.129 release 2017-08-20 09:15:12 +02:00
M66B 16ab143f0e Crowdin sync 2017-08-20 09:14:56 +02:00
M66B 7b96f5a950 Added settings to reload on every connectivity change 2017-08-20 09:11:34 +02:00
M66B 16a34aafdf 2.128 release 2017-08-16 10:45:49 +02:00
M66B 9639ceeb4e Crowdin sync 2017-08-16 10:45:01 +02:00
M66B e5e5202862 Save last number of rules 2017-08-16 10:11:34 +02:00
M66B 2840824c70 Log no rules 2017-08-16 10:02:04 +02:00
M66B b26f40d391 Android O fix 2017-08-16 10:01:20 +02:00
M66B ae9677b82f 2.127 release 2017-08-15 18:41:11 +02:00
M66B 3adcdc5e58 Crowdin sync 2017-08-15 18:40:58 +02:00
M66B 68e64a9689 2.126 release 2017-08-15 06:49:54 +02:00
M66B 1b8ca1cdc6 Prevent lingering wake locks 2017-08-15 06:46:17 +02:00
M66B 549c9ad0dc Crowdin sync 2017-08-15 06:45:49 +02:00
M66B 3822d28a23 Added link to privacy policy 2017-08-14 09:22:34 +02:00
M66B aec83b4a58 2.125 release 2017-08-13 08:35:52 +02:00
M66B c2ef9594c1 Crowdin sync 2017-08-13 08:34:29 +02:00
M66B 26c1d10eef Close access list cursor 2017-08-12 16:26:39 +02:00
M66B 5f501f16e6 Clear on unload 2017-08-12 13:49:21 +02:00
M66B 51d6dac142 Limit number of sessions to 768 2017-08-12 13:49:02 +02:00
M66B 0f5fa4bfe9 Use default notification audio attributes 2017-08-12 13:12:43 +02:00
M66B 6aec469c76 2.124 release 2017-08-11 09:15:15 +02:00
M66B 7634df3c05 Reduce number of network callbacks 2017-08-11 09:09:44 +02:00
M66B a4f1024eeb Fallback to connectivity changes on exception 2017-08-10 19:13:05 +02:00
M66B 456773f6c7 Android Studio 3.0 beta 1 2017-08-10 14:04:24 +02:00
M66B 1674f704fd Updated adaptive icon 2017-08-10 14:03:20 +02:00
M66B b5551721b5 2.123 release 2017-08-10 08:10:01 +02:00
M66B 0c83753086 Require validated network before Android O 2017-08-10 08:05:03 +02:00
M66B a29070ee69 2.122 release 2017-08-09 19:01:04 +02:00
M66B a2edc3352c Stop self on stop while not enforcing 2017-08-09 18:57:51 +02:00
M66B 3a5eb01fbd 2.121 release 2017-08-09 15:09:45 +02:00
M66B 16888d4c19 Fixed initial state 2017-08-09 15:02:29 +02:00
M66B 906fb3ab13 Ignore start/reload commands while disabled 2017-08-09 14:13:44 +02:00
M66B d4ccc3d5eb Stop self 2017-08-09 13:11:42 +02:00
M66B 4437e4c6db 2.120 release 2017-08-08 18:06:33 +02:00
M66B 76e94aa3e6 Reload on link properties changed on Android O only 2017-08-08 18:05:47 +02:00
M66B dd7d7a55ef Crowdin sync 2017-08-08 17:55:45 +02:00
M66B 69eabce4d1 New icon design 
V4 by @Primokorn
 2017-08-08 17:22:27 +02:00
M66B 3fc3e888d6 2.119 release 2017-08-08 12:11:04 +02:00
M66B 3b217c09b9 Use connectivity change events before Android O 
Many devices seems to weak to handle all network changes
 2017-08-08 11:53:27 +02:00
M66B a86f281409 Refactoring 2017-08-08 11:10:51 +02:00
M66B b3e2a0de1f 2.118 release 2017-08-06 22:17:48 +02:00
M66B 6344a82211 Make Android ID recognizable 2017-08-06 17:35:59 +02:00
M66B 4205107f33 Image quality 2017-08-06 17:33:19 +02:00
M66B d5c22f455f Prevent crash 2017-08-06 17:33:08 +02:00
M66B 3cfd8cde23 Fixed warnings/deprecations 2017-08-05 10:49:34 +02:00
M66B 2292888243 2.117 release 2017-08-05 08:06:43 +02:00
M66B 48eb05be79 Added icon 2017-08-05 07:59:54 +02:00
M66B d1122951ff Set app category 2017-08-04 16:29:08 +02:00
M66B eea820e63f NetGuard adaptive icon 2017-08-04 12:47:16 +02:00
M66B 6e186d53a4 2.116 release 2017-08-04 09:59:53 +02:00
M66B 7c85c8a4b2 Access log since 2017-08-04 08:24:03 +02:00
M66B feb4430aa3 Scale icons to reduce memory usage 2017-08-04 08:23:43 +02:00
M66B 670c4599e1 Explicit intents 2017-08-03 22:09:33 +02:00
M66B 0c820c12fc Prevent crash 2017-08-03 22:09:21 +02:00
M66B 2c3f54d999 Cleanup manifest 2017-08-03 22:09:02 +02:00
M66B 76f8137c6c Fixed tiles/widgets 2017-08-03 18:09:41 +02:00
M66B 7074077291 Start foreground service 2017-08-03 11:11:24 +02:00
M66B c5f7b68dd8 Load adaptive icons 2017-08-03 10:59:32 +02:00
M66B 2e836b1266 Start foreground service early 
Android will force kill the service when this is not done timely
 2017-08-03 09:57:52 +02:00
M66B d5e2caa1d5 Merge branch 'master' into android-o 
Conflicts:
	app/build.gradle
	app/src/main/res/values/strings.xml
 2017-08-03 09:08:58 +02:00