mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixing conflict in SinkholeService

This commit is contained in:
Marco 2015-11-13 12:12:49 +01:00
parent b533b2c98a aee85ebc8a
commit 8b1883d3d6
101 changed files with 104 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -111,8 +111,10 @@ public class SinkholeService extends VpnService {
}
if (vpn == null)
prefs.edit().putBoolean("enabled", false).apply();
removeDisabledNotification();
Widget.updateWidgets(SinkholeService.this);
else {
removeDisabledNotification();
Widget.updateWidgets(SinkholeService.this);
}
break;
case reload:

1
infer-out/classnames/android/support/v7/appcompat/R$anim.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$attr.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$bool.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$color.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$dimen.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$drawable.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$id.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$integer.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$layout.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$string.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$style.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R$styleable.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/appcompat/R.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/recyclerview/R$attr.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/recyclerview/R$dimen.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/recyclerview/R$id.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/recyclerview/R$styleable.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/android/support/v7/recyclerview/R.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/com/android/vending/billing/IInAppBillingService$Stub$Proxy.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/com/android/vending/billing/IInAppBillingService$Stub.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/com/android/vending/billing/IInAppBillingService.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$1$1.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$1$2.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$1.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$10$1.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$10.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$11.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$12.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$13.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$14.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$15$1.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$15.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$16.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$17.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$18.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$2.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$3.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$4.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$5.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$6.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$7.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$8.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain$9.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivityMain.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivitySettings$1.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivitySettings$2.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivitySettings$3.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivitySettings$4.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivitySettings$XmlImportHandler.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ActivitySettings.java Normal file
View File

@ -0,0 +1 @@
1447412020.

1
infer-out/classnames/eu/faircode/netguard/ApplicationEx$1.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/ApplicationEx.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/BuildConfig.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/FragmentSettings.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Packet$IPv4Header.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Packet$TCP.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Packet$UDPHeader.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Packet$Util.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Packet.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$anim.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$attr.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$bool.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$color.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$dimen.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$drawable.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$id.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$integer.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$layout.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$menu.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$mipmap.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$string.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$style.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$styleable.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R$xml.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/R.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Receiver.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/Rule.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$1.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$2.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$3.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$4.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$5.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$6.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$7.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$ViewHolder$1.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$ViewHolder$2.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter$ViewHolder.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/RuleAdapter.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$1.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$2.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$3.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$4.java Normal file
View File

@ -0,0 +1 @@
1447412022.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$5.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$Command.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService$ServiceHandler.java Normal file
View File

@ -0,0 +1 @@
1447412021.

1
infer-out/classnames/eu/faircode/netguard/SinkholeService.java Normal file
View File

@ -0,0 +1 @@
1447412022.

1
infer-out/classnames/eu/faircode/netguard/Util$1.java Normal file
View File

@ -0,0 +1 @@
1447412022.

1
infer-out/classnames/eu/faircode/netguard/Util$2.java Normal file
View File

@ -0,0 +1 @@
1447412022.

1
infer-out/classnames/eu/faircode/netguard/Util.java Normal file
View File

@ -0,0 +1 @@
1447412022.

Some files were not shown because too many files have changed in this diff Show More