From d052c13bde9c9efb64503108e429a08fcbb195bd Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 Jun 2016 22:01:30 +0200 Subject: [PATCH] Revert "Allow switch off from notfication" This reverts commit 1a1f4494dc3fd3f269f76545fc02dcf1e8a4ccf1. Refs #432 --- .../eu/faircode/netguard/ActivitySettings.java | 5 ++--- .../eu/faircode/netguard/ServiceSinkhole.java | 10 +--------- .../ic_power_settings_new_white_24dp.png | Bin 427 -> 0 bytes .../ic_power_settings_new_white_24dp.png | Bin 274 -> 0 bytes .../ic_power_settings_new_white_24dp.png | Bin 556 -> 0 bytes .../ic_power_settings_new_white_24dp.png | Bin 787 -> 0 bytes .../ic_power_settings_new_white_24dp.png | Bin 1074 -> 0 bytes app/src/main/res/values/strings.xml | 1 - 8 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_power_settings_new_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_power_settings_new_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_power_settings_new_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_power_settings_new_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_power_settings_new_white_24dp.png diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index 4c8939d6..b353559a 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -649,11 +649,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere if (prefs.getBoolean("pcap", false)) ServiceSinkhole.setPcap(true, this); - } else if ("show_stats".equals(name)) { - ((TwoStatePreference) getPreferenceScreen().findPreference(name)).setChecked(prefs.getBoolean(name, false)); + } else if ("show_stats".equals(name)) ServiceSinkhole.reloadStats("changed " + name, this); - } else if ("stats_frequency".equals(name)) + else if ("stats_frequency".equals(name)) getPreferenceScreen().findPreference(name).setTitle(getString(R.string.setting_stats_frequency, prefs.getString(name, "1000"))); else if ("stats_samples".equals(name)) diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java index bc134949..0617cb86 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java @@ -143,7 +143,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS private static final int SERVICE_HOUSEHOLDING = 1; private static final int SERVICE_GRAPH_ON = 2; private static final int SERVICE_GRAPH_OFF = 3; - private static final int SERVICE_OFF = 4; private static final int NOTIFY_ENFORCING = 1; private static final int NOTIFY_WAITING = 2; @@ -339,8 +338,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS break; case stop: - if ("off".equals(option)) - prefs.edit().putBoolean("enabled", false).apply(); stop(); break; @@ -1965,6 +1962,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS .setPriority(Notification.PRIORITY_MIN); } + if (IAB.isPurchased(ActivityPro.SKU_SPEED, this)) { Intent riGraph = new Intent(this, ServiceSinkhole.class); riGraph.putExtra(ServiceSinkhole.EXTRA_COMMAND, ServiceSinkhole.Command.stats); @@ -1973,12 +1971,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS builder.addAction(R.drawable.ic_equalizer_white_24dp, getString(R.string.title_graph), piGraph); } - Intent riOff = new Intent(this, ServiceSinkhole.class); - riOff.putExtra(ServiceSinkhole.EXTRA_COMMAND, ServiceSinkhole.Command.stop); - riOff.putExtra(ServiceSinkhole.EXTRA_OPTION, "off"); - PendingIntent piOff = PendingIntent.getService(this, SERVICE_OFF, riOff, PendingIntent.FLAG_UPDATE_CURRENT); - builder.addAction(R.drawable.ic_power_settings_new_white_24dp, getString(R.string.title_off), piOff); - if (allowed > 0 || blocked > 0 || hosts > 0) { NotificationCompat.BigTextStyle notification = new NotificationCompat.BigTextStyle(builder); notification.bigText(getString(R.string.msg_started)); diff --git a/app/src/main/res/drawable-hdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index 24c35093f85d69493d4cbcff37cc11e31bbfd2a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 427 zcmV;c0aX5pP)}T)p{`;$ih0gR}cK(^2>HT^94@0@!P%oT4U73UYuR^Px&}s~{=fuq*bjzu6 z7xWaIxYi2woq{JJXrKgdEVV*cya%P*ZBSwgK3NKumih{&l4fWNoLTF9>~-g0s~P$L zUPiUQ0EbP`ia9E4QBYrnODlC~2);!Rpq5Jj64(1GOG_}7(r60xIP+@MlX&^s>ohWDw4w@(XAvkkA;(IQ@W;2wS zfzQ$)lR66jv^{q%z}oYY9RiuNjz}q5&+B{*p&RvfxK#HB$FB0upDYP)gktwbr^k8%Le@_7~>|@ zv;iKgV1;%Pbg-&|4;&;x6Q3byCP9ued{QSlp)QtT)3-@5#3=mMwWDbIu`MoQgPZ;g zZtpxZ!#uVcJ504|)n_Q2#FuY}H+RnDa$Q4P6w&4TzGa~v^Jw)w)c4>;skAf-TK$Xh Y1*I$TG2FA{E&u=k07*qoM6N<$f{-+Df&c&j diff --git a/app/src/main/res/drawable-xhdpi/ic_power_settings_new_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_power_settings_new_white_24dp.png deleted file mode 100644 index 6ea9162ab26b1b42311d505e934cd8df5bc4d06e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmV+{0@MA8P)aauG1uq2Pqh?xOaN=EEc6$Bv0q0%p#*bh?_`QCSX?H800MTUaxquh)5ky_(3 zs3R+>2crIfqzFIgvg)E93X&Z22c$)|W_u6VkYw7=zC}a@+N=Q`>g<~JfEke-yWC_> zB|WVNY>Q;p2{0$=9X;SiBz;bReo5cz0k0xyZ~`<*`b`hWi=@H{P+4kmJ>Xp=F(-g0 z>AW8BCXyy6Ktj^F;6v_r+988dozY8nMKb3ESdi+i;EQ(R1SpM}lwQ)N#%{Z{eW#3y zA}xNh3qh<~12zqYT_nPU8h71R_PuJKG?aTJ7W*=NbMwMj!&w^g{bKnxs^q)5JtjY>((4lF}O?9;JMBJt; z8n~hyMNXM#fCL^M2?kkE*Q)gPaofJGW)0I=HU2q2AR{~lnm-zKj?cXq=Ui)^CK=fG uMwnKn*yfrXdGh4Qutmyu=7bT(AI2wuPj3$EJQURc0000v(hAmMNB?bz06PQX23KDeF%a9<{ZG@FC z*q>3zXhuntT6SeqTIP+Kq0-CDP<^}T;`xn&{O0@~1L1tm{qRN4>+^&H>H>j408_~I zaQ*>;pde^h2Gy$s)$0U#Tm_QOK|R1_JoljMe3kSWBslm_5NBP2j*u_m zE9exa&m8s}^gHXACivM`(67v3dc$x2f>N07@tyB~S&T=RZu$v2hUqCkIi1wM@DfvV zp+QkzA>Q$)^JV`x8N>@p3JW@ksZ-^~cp6iCAwfl?5t9_D1Vwm)n8mXX+KcIbwP#ra zrvL1Nh7k``AFk7g0o$N3tBB*OL2Za-JiDNO5E;H#4Jspt_{%P+3vo;ReJF)U*aZzE z&Zq~SM-18p-9;Qw4?2jrV;8i5_(MIY5;1QV^cL}hdQcf+!!GC(BCH-1L433e${|YB zgQAG6UC=5brXCbWtk?z3BP!K{st|K_L1TzRgp`j)M9MDc8seOKP!iE+7u1OuRSz03 z{LxX1$nc|TPK+F)+AhfBHR6P7PzPek{snCa@lZ8r3ej&Lv`l{T)>6iO@@5E zZZk%Y8*Dbse#_h7V>TOfpTb5MW~)isw;5r@=wOPih6rm6&OI(7M3&nmX{3rcQKH1D zqLC!y;f@;Tonf|eRgMy$SC(Nz~#4HO#Ng=q|>5sQk3ItmWp6Q4r$8y)ci-bOWT^jc^R)thkw+9)IaMYqv_ zUaCloB%=o$L-mgF%jrC-qtOGt@P8wX2Xt}^>1xz~9z3K;D>pQGB#(!p1xz5-*<&T( z0UAi-(E>h4`o!8T<)=uqQ38@wke;^|FpTskiSPjfNDX#c3rN#MIuJf!4CyPYPbI!V zdL?|oMWpww223G+5I$fIX~b&438dNZ0Y4%=Wi{X+QYn1EGE%SAfPSQ<@BuZX4yyra zq)PaJO{DEs0}@EB_yKKJ1KQ&UtRwBQ8jwM%#NUat|F@m^2GTQD19I^XqjUa~xy5Y^ zX(oKYhe+qF223HH4<9g&^qtj!>qw*F1D-@`vCG=>@ADnR2cq22)R11V7BGxdAra-4 z@+#72)&edeU5R#2{5sMG_gh(hh6d800zB zb0<(u8V|^$8i^jTgWE_|dW|l>pBmCKsptXz?;}hb4Y(ZqKaU=;n>AG9#+E;UYK3&% zS4?lAs&l}|@(0;Kbte8hvUV0wEz+lb`43Y@HBVBS zjMLU-f;1R1G4OO8k04df(i!2JCr^za9>+|LoV|)iu;0m(330((V3lAVqb7&`j??77 zG??ZkcHiY@ahRDqe#SA=W0!}N-C5P*d!{%^j(#$<(@utda*Q#>4{UNLYYf>KeBI9t zOepcFt;yXTe1u*e7f9J1J${Z~&}E+7R?JSf@dm5JwZa*aTQ~f@i+8z2RLe|~-umhF z6fg579$|P~V}#VbG=AU11anlmn+jJrP4~U}`+)?5oa6$tlvtulixw4@C^5r%Mj0Ss s=l28lHy2=ka{(^E1-Jkg-~wF0-#Q6Y<49dt_5c6?07*qoM6N<$f()|p`~Uy| diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b6d3c5da..1c9c59f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -209,7 +209,6 @@ Your internet traffic is not being sent to a remote VPN server. Allow Block Graph - Off root mediaserver nobody