From 8a0112b2ed0c65ca56cac1582d7e56242174c416 Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Sun, 30 Oct 2016 20:56:11 +0000
Subject: [PATCH] Inter-app settings screen and Accept Treatments option

---
 .../dexdrip/NSClientReceiver.java             |  30 ++++++++------
 .../ic_open_in_app_grey600_48dp.png           | Bin 0 -> 774 bytes
 .../main/res/xml/pref_advanced_settings.xml   |  38 ++++++++++++------
 3 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_open_in_app_grey600_48dp.png

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java
index cd1f6a9bfc..690e8655e3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/NSClientReceiver.java
@@ -72,26 +72,30 @@ public void onReceive(Context context, Intent intent) {
                         process_SGV_json(sgv_json);
                     }
                 } else {
-                    Log.e(TAG, "Ignoring SGV data as we are not a follower");
+                    Log.d(TAG, "Ignoring SGV data as we are not a follower");
                 }
                 break;
 
             case Intents.ACTION_NEW_TREATMENT:
                 if (bundle == null) break;
-                final String treatment_json = bundle.getString("treatment", "");
-                if (treatment_json.length() > 0) {
-                    process_TREATMENT_json(treatment_json);
-                }
-                final String treatments_json = bundle.getString("treatments", "");
-                if (treatments_json.length() > 0) {
-                    try {
-                        final JSONArray jsonArray = new JSONArray(treatments_json);
-                        for (int i = 0; i < jsonArray.length(); i++) {
-                            process_TREATMENT_json(jsonArray.getString(i));
+                if (prefs.getBoolean("accept_nsclient_treatments", true)) {
+                    final String treatment_json = bundle.getString("treatment", "");
+                    if (treatment_json.length() > 0) {
+                        process_TREATMENT_json(treatment_json);
+                    }
+                    final String treatments_json = bundle.getString("treatments", "");
+                    if (treatments_json.length() > 0) {
+                        try {
+                            final JSONArray jsonArray = new JSONArray(treatments_json);
+                            for (int i = 0; i < jsonArray.length(); i++) {
+                                process_TREATMENT_json(jsonArray.getString(i));
+                            }
+                        } catch (JSONException e) {
+                            Log.e(TAG, "Json exception with sgvs: " + e.toString());
                         }
-                    } catch (JSONException e) {
-                        Log.e(TAG, "Json exception with sgvs: " + e.toString());
                     }
+                } else {
+                    Log.d(TAG, "Ignoring nsclient treatment data due to preference");
                 }
                 break;
 
diff --git a/app/src/main/res/drawable-xhdpi/ic_open_in_app_grey600_48dp.png b/app/src/main/res/drawable-xhdpi/ic_open_in_app_grey600_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b84396c4eedd4b7857fb293b2d1da4b207ded89
GIT binary patch
literal 774
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}8pX7+2iB`GtXjX`-i#V@SoVw|8vwgdHW0eM~p&NINSkU@LNm
zG5D#3L!%3`RQBl{uhZHq7HK%eG_%P!DSheCK9Z+Y+0NA8qV&md^J|;;51wC-Je6nk
z{(g4k$0`Ov1o(M>=R)<2S<f=>f6r&|VYFck*et#^Ih(<rQD^n4UpDj4*Yj9LmNjh4
zm0x%Lbw9&BrWH4W6<;#WxmNmjVeakIbA(e^Z}9!sZV-RNDY0?Q>t6=yPS=dfw?@@A
zwf*1zvP|vdr1cE%{~ABPQ_jHtCRBPer=rdKUGHq3E_kAS!1BA4)W7{QA)#NjzAl(E
zeSv26(y&&6xMgyag&!DJFKkmiucm%L`I{E6_q?<F_SKs^GoBD>@PQL=4&G3Y(GhF5
zPu`GYHoMjE{Bmt1S+Ke_FBtCqR(}6i@b`O(MK?g~=P|G6WPA4oq%>Ik`LW{($5GZD
zR)1Dp;c#W$k@q98Q?QG(;P!{bmy|>VAFMmv@70xH=kV&o;vl6Nd=sqytZ3m#W9E^q
zOR;S_$&k!zze(m`OvA=@`N-Y`tpn@Y<Rg0$)DElz^1Bn14%7nWMH=NE>;v*U4Sv-+
zuH3cGnysMb`uzQG_szNV&U;Zj<8ME>ZxH@MW9dBq+`xTjgZ{Y-?=Qal_5Wvb{rT@*
z-B*~4)-}Xi$2h#4ls<WL=6&;TT5C_u^et-G_kKUajSb@27t*X}tDIy6+R3jtXJdG_
zFULcj((?fdpJOki7*+BooQ&I|c>1l+q*T_7+ut^=d+p4i{$q3F*L|-T=RA2Q&C9bx
rH}yC7eN*4!Rc~Lrx*)*1@6s#oA6~z1ZA2z8l`?p``njxgN@xNAaKcVD

literal 0
HcmV?d00001

diff --git a/app/src/main/res/xml/pref_advanced_settings.xml b/app/src/main/res/xml/pref_advanced_settings.xml
index 1f695a313f..d4a806313b 100644
--- a/app/src/main/res/xml/pref_advanced_settings.xml
+++ b/app/src/main/res/xml/pref_advanced_settings.xml
@@ -147,13 +147,32 @@
     <PreferenceCategory
         android:key="other_category"
         android:title="@string/other_settings">
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="broadcast_data_through_intents"
-            android:summary="@string/pref_summary_broadcast_enabled"
-            android:switchTextOff="@string/short_off_text_for_switches"
-            android:switchTextOn="@string/short_on_text_for_switches"
-            android:title="@string/pref_title_broadcast_enabled" />
+        <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+            android:key="xdrip_intrer_app_settings"
+            android:summary="For interacting with other compatible apps"
+            android:icon="@drawable/ic_open_in_app_grey600_48dp"
+            android:title="Inter-app settings">
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="broadcast_data_through_intents"
+                android:summary="@string/pref_summary_broadcast_enabled"
+                android:switchTextOff="@string/short_off_text_for_switches"
+                android:switchTextOn="@string/short_on_text_for_switches"
+                android:title="@string/pref_title_broadcast_enabled" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="broadcast_data_through_intents"
+                android:key="broadcast_data_through_intents_without_permission"
+                android:summary="Send broadcasts without locking to the older permission model"
+                android:title="@string/compatible_broadcast" />
+            <SwitchPreference
+                android:defaultValue="true"
+                android:key="accept_nsclient_treatments"
+                android:summary="Process treatment data received from NSClient app"
+                android:switchTextOff="@string/short_off_text_for_switches"
+                android:switchTextOn="@string/short_on_text_for_switches"
+                android:title="Accept Treatments" />
+        </PreferenceScreen>
         <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
             android:key="xdrip_less_common_settings"
             android:summary="@string/debug_and_other_misc_options"
@@ -241,11 +260,6 @@
                 android:key="aggressive_service_restart"
                 android:summary="Repeatedly restart the collection service at any hint of missing data. Enable only if you are getting data loss."
                 android:title="Aggressive service restarts" />
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="broadcast_data_through_intents_without_permission"
-                android:summary="Send broadcasts without locking to the older permission model"
-                android:title="@string/compatible_broadcast" />
             <CheckBoxPreference
                 android:defaultValue="false"
                 android:dependency="engineering_mode"