From 7f8f1bee30c35c3e8e740dcf1d4b8a84fdfb9296 Mon Sep 17 00:00:00 2001
From: Juan David Vega <jdvr.93@hotmail.com>
Date: Sun, 27 Oct 2019 20:40:17 +0100
Subject: [PATCH 1/3] T8539 - Create a new flow to manage trusted networks

Summary: I have created a new activity that allows you to trust all networks or add networks one by one to a list when you are connected to that network

Test Plan:
Test Cases:
1. By default everything should works like it works before, If you uncheck the "Allow all" option in trusted network menu and there isn't any ssid in the trusted
network list the app doesn't send the first udp package and log "Current WiFi isn't a Trusted Network"
2. With the "Allow all" uncheck, use "Add: YOUR_SSID_NAME" button to add your current ssid to the trusted networks list, once you added, go back and the app should
works as always

{F6152314}

1 -> https://youtu.be/ZpCEFTstbJI

2 -> https://youtu.be/cVB1LXlFVyk

Reviewers: #kde_connect, jdvr

Subscribers: sredman, albertvaka, nicolasfella, apol, kdeconnect

Tags: #kde_connect

Maniphest Tasks: T8539

Differential Revision: https://phabricator.kde.org/D13505
---
 AndroidManifest.xml                           |  15 +-
 res/layout/trusted_network_list.xml           |  38 +++++
 res/menu/pairing.xml                          |   6 +
 res/values/strings.xml                        |   6 +
 .../Backends/LanBackend/LanLinkProvider.java  |  11 ++
 .../Helpers/TrustedNetworkHelper.java         |  82 ++++++++++
 .../UserInterface/PairingFragment.java        |   4 +
 .../TrustedNetworksActivity.java              | 148 ++++++++++++++++++
 8 files changed, 309 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/trusted_network_list.xml
 create mode 100644 src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
 create mode 100644 src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 63639f28..48f008c8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,6 +15,7 @@
         android:name="android.hardware.telephony"
         android:required="false" />
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
@@ -28,11 +29,12 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:icon="@drawable/icon"
@@ -267,8 +269,19 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
         </activity>
+
         <activity android:name="org.kde.kdeconnect.Plugins.PhotoPlugin.PhotoActivity" />
 
+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.TrustedNetworksActivity"
+            android:label="@string/trusted_networks"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/res/layout/trusted_network_list.xml b/res/layout/trusted_network_list.xml
new file mode 100644
index 00000000..5bd6fe61
--- /dev/null
+++ b/res/layout/trusted_network_list.xml
@@ -0,0 +1,38 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
+
+
+    <CheckBox
+            android:text="@string/allow_all_networks_text"
+            android:layout_width="match_parent"
+            android:checked="true"
+            android:layout_height="wrap_content"
+            android:id="@+id/trust_all_networks_checkBox"/>
+
+    <TextView
+            android:id="@+id/trusted_network_list_empty"
+            android:layout_width="fill_parent"
+            android:layout_height="100dp"
+            android:text="@string/empty_trusted_networks_list_text"
+            android:gravity="center" />
+
+    <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+
+    <Button
+        android:id="@android:id/button1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+</LinearLayout>
diff --git a/res/menu/pairing.xml b/res/menu/pairing.xml
index 453dad6a..30a274d4 100644
--- a/res/menu/pairing.xml
+++ b/res/menu/pairing.xml
@@ -14,4 +14,10 @@
         android:title="@string/custom_device_list"
         kdeconnect:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_trusted_networks"
+        android:orderInCategory="900"
+        android:title="@string/trusted_networks"
+        kdeconnect:showAsAction="never" />
+
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0b3eba0f..93f88049 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -337,8 +337,14 @@
     <string name="plugin_photo_desc">Launch the camera app to ease taking and transferring pictures</string>
 
     <string name="findmyphone_preference_key_ringtone" translatable="false">findmyphone_ringtone</string>
+
     <string name="no_app_for_opening">No suitable app found to open this file</string>
     <string name="remote_keyboard_service">KDE Connect Remote Keyboard</string>
     <string name="presenter_pointer">Pointer</string>
 
+    <string name="trusted_networks">Trusted networks</string>
+    <string name="add_trusted_network">Add %1$s</string>
+    <string name="empty_trusted_networks_list_text">You haven\'t added any trusted network yet</string>
+    <string name="allow_all_networks_text">Allow all</string>
+
 </resources>
diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
index 70c4fedf..08995aa6 100644
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -33,6 +33,7 @@ import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.StringsHelper;
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
 import org.kde.kdeconnect.NetworkPacket;
 import org.kde.kdeconnect.UserInterface.CustomDevicesActivity;
 
@@ -117,6 +118,11 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     //I've received their broadcast and should connect to their TCP socket and send my identity.
     private void udpPacketReceived(DatagramPacket packet) {
 
+        if (TrustedNetworkHelper.isNotTrustedNetwork(context)) {
+            Log.w("LanLinkProvider", "Current WiFi isn't a Trusted Network");
+            return;
+        }
+
         final InetAddress address = packet.getAddress();
 
         try {
@@ -364,6 +370,11 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         }
         lastBroadcast = System.currentTimeMillis();
 
+        if (TrustedNetworkHelper.isNotTrustedNetwork(context)) {
+            Log.w("LanLinkProvider", "Current WiFi isn't a Trusted Network");
+            return;
+        }
+
         new Thread(() -> {
             ArrayList<String> iplist = CustomDevicesActivity
                     .getCustomDeviceList(PreferenceManager.getDefaultSharedPreferences(context));
diff --git a/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
new file mode 100644
index 00000000..048af1ce
--- /dev/null
+++ b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
@@ -0,0 +1,82 @@
+package org.kde.kdeconnect.Helpers;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import android.content.Context;
+import android.net.wifi.SupplicantState;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+public class TrustedNetworkHelper {
+
+    private static final String KEY_CUSTOM_TRUSTED_NETWORKS = "trusted_network_preference";
+    private static final String KEY_CUSTOM_TRUST_ALL_NETWORKS = "trust_all_network_preference";
+    private static final String NETWORK_SSID_DELIMITER = "#_#";
+    private static final String NOT_AVAILABLE_SSID_RESULT = "<unknown ssid>";
+
+
+    private final Context context;
+
+    public TrustedNetworkHelper(Context context) {
+        this.context = context;
+    }
+
+    public List<String> read() {
+        String serializeTrustedNetwork = PreferenceManager.getDefaultSharedPreferences(context).getString(
+                KEY_CUSTOM_TRUSTED_NETWORKS, "");
+        if (serializeTrustedNetwork.isEmpty())
+            return Collections.emptyList();
+        return Arrays.asList(serializeTrustedNetwork.split(NETWORK_SSID_DELIMITER));
+    }
+
+    public void update(List<String> trustedNetworks) {
+        String serialized = TextUtils.join(NETWORK_SSID_DELIMITER, trustedNetworks);
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(
+                KEY_CUSTOM_TRUSTED_NETWORKS, serialized).apply();
+    }
+
+    public Boolean allAllowed() {
+        return PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getBoolean(KEY_CUSTOM_TRUST_ALL_NETWORKS, Boolean.TRUE);
+    }
+
+    public void allAllowed(boolean isChecked) {
+        PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .edit()
+                .putBoolean(KEY_CUSTOM_TRUST_ALL_NETWORKS, isChecked)
+                .apply();
+    }
+
+    public String currentSSID() {
+        WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        Log.d("Fou", "get");
+        if (wifiManager == null) return "";
+        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+        if (wifiInfo.getSupplicantState() != SupplicantState.COMPLETED) {
+            Log.d("Fou", "fooo");
+            return "";
+        }
+        String ssid = wifiInfo.getSSID();
+        if (ssid.equalsIgnoreCase(NOT_AVAILABLE_SSID_RESULT)){
+            Log.d("Fou", "navail");
+            return "";
+        }
+        Log.d("Fou", "retn");
+        return ssid;
+    }
+
+    public static boolean isNotTrustedNetwork(Context context) {
+        TrustedNetworkHelper trustedNetworkHelper = new TrustedNetworkHelper(context);
+        if (trustedNetworkHelper.allAllowed()){
+            return false;
+        }
+        return trustedNetworkHelper.read().indexOf(trustedNetworkHelper.currentSSID()) == -1;
+    }
+}
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index 7411ae64..329e3f42 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -299,6 +299,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
             case R.id.menu_custom_device_list:
                 startActivity(new Intent(mActivity, CustomDevicesActivity.class));
                 break;
+            case R.id.menu_trusted_networks:
+                startActivity(new Intent(mActivity, TrustedNetworksActivity.class));
+                break;
+
             default:
                 break;
         }
diff --git a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
new file mode 100644
index 00000000..f8cf817e
--- /dev/null
+++ b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
@@ -0,0 +1,148 @@
+package org.kde.kdeconnect.UserInterface;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kde.kdeconnect.BackgroundService;
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
+import org.kde.kdeconnect_tp.R;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.*;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class TrustedNetworksActivity extends AppCompatActivity {
+
+    private ListView trustedNetworksView;
+    private List<String> trustedNetworks;
+
+    private boolean dialogAlreadyShown = false;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        TrustedNetworkHelper trustedNetworkHelper = new TrustedNetworkHelper(getApplicationContext());
+        super.onCreate(savedInstanceState);
+        trustedNetworks = new ArrayList<>(trustedNetworkHelper.read());
+        ThemeUtil.setUserPreferredTheme(this);
+        setContentView(R.layout.trusted_network_list);
+        trustedNetworksView = findViewById(android.R.id.list);
+        emptyListMessage(trustedNetworkHelper);
+
+        trustedNetworkListView(trustedNetworkHelper);
+
+        CheckBox allowAllCheckBox = findViewById(R.id.trust_all_networks_checkBox);
+        allowAllCheckBox.setChecked(trustedNetworkHelper.allAllowed());
+        allowAllCheckBox.setOnCheckedChangeListener((v, isChecked) -> {
+            trustedNetworkHelper.allAllowed(isChecked);
+            trustedNetworkListView(trustedNetworkHelper);
+        });
+
+    }
+
+    private void emptyListMessage(TrustedNetworkHelper trustedNetworkHelper) {
+        boolean isVisible = trustedNetworks.isEmpty() && !trustedNetworkHelper.allAllowed();
+        findViewById(R.id.trusted_network_list_empty)
+                .setVisibility(isVisible ? VISIBLE : GONE );
+    }
+
+    private void trustedNetworkListView(TrustedNetworkHelper trustedNetworkHelper) {
+        Boolean allAllowed = trustedNetworkHelper.allAllowed();
+        emptyListMessage(trustedNetworkHelper);
+//        trustedNetworksView.setVisibility(allAllowed ? GONE : VISIBLE);
+        trustedNetworksView.setVisibility(allAllowed ? VISIBLE : VISIBLE);
+//        if (allAllowed){
+//            return;
+//        }
+        trustedNetworksView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, trustedNetworks));
+        trustedNetworksView.setOnItemClickListener(onItemClickGenerator(trustedNetworkHelper));
+        addNetworkButton(trustedNetworkHelper);
+    }
+
+    @NonNull
+    private AdapterView.OnItemClickListener onItemClickGenerator(TrustedNetworkHelper trustedNetworkHelper) {
+        return (parent, view, position, id) -> {
+            if (dialogAlreadyShown) {
+                return;
+            }
+            String targetItem = trustedNetworks.get(position);
+
+            // remove touched item after confirmation
+            DialogInterface.OnClickListener confirmationListener = (dialog, which) -> {
+                switch (which) {
+                    case DialogInterface.BUTTON_POSITIVE:
+                        trustedNetworks.remove(position);
+                        trustedNetworkHelper.update(trustedNetworks);
+                        ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
+                        addNetworkButton(trustedNetworkHelper);
+                        emptyListMessage(trustedNetworkHelper);
+                        break;
+                    case DialogInterface.BUTTON_NEGATIVE:
+                        break;
+                }
+            };
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setMessage("Delete " + targetItem + " ?");
+            builder.setPositiveButton("Yes", confirmationListener);
+            builder.setNegativeButton("No", confirmationListener);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { //DismissListener
+                dialogAlreadyShown = true;
+                builder.setOnDismissListener(dialog -> dialogAlreadyShown = false);
+            }
+
+            builder.show();
+        };
+    }
+
+    private void addNetworkButton(TrustedNetworkHelper trustedNetworkHelper) {
+        String currentSSID = trustedNetworkHelper.currentSSID();
+        if (!currentSSID.isEmpty() && trustedNetworks.indexOf(currentSSID) == -1) {
+            Button addButton = (Button) findViewById(android.R.id.button1);
+            String buttonText = getString(R.string.add_trusted_network, currentSSID);
+            addButton.setText(buttonText);
+            addButton.setOnClickListener(saveCurrentSSIDAsTrustedNetwork(currentSSID, trustedNetworkHelper));
+            addButton.setVisibility(VISIBLE);
+        }
+    }
+
+
+    @NonNull
+    private View.OnClickListener saveCurrentSSIDAsTrustedNetwork(String ssid, TrustedNetworkHelper trustedNetworkHelper) {
+        return v -> {
+            if (trustedNetworks.indexOf(ssid) != -1){
+                return;
+            }
+            trustedNetworks.add(ssid);
+            trustedNetworkHelper.update(trustedNetworks);
+            ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
+            v.setVisibility(GONE);
+        };
+    }
+
+
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        BackgroundService.addGuiInUseCounter(this);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        BackgroundService.removeGuiInUseCounter(this);
+    }
+
+}

From 1448814ed7f5916dc0071cb38f9e15decdd0d252 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Sun, 27 Oct 2019 23:37:40 +0100
Subject: [PATCH 2/3] Ask for permission, add to settings and notify in main
 activity

---
 res/drawable/ic_warning.xml                   |   9 +
 .../pairing_explanation_not_trusted.xml       |  16 ++
 res/values/strings.xml                        |   6 +-
 .../Helpers/TrustedNetworkHelper.java         |  17 +-
 .../UserInterface/PairingFragment.java        |  22 +-
 .../UserInterface/SettingsFragment.java       |  28 ++-
 .../TrustedNetworksActivity.java              | 190 ++++++++----------
 7 files changed, 168 insertions(+), 120 deletions(-)
 create mode 100644 res/drawable/ic_warning.xml
 create mode 100644 res/layout/pairing_explanation_not_trusted.xml

diff --git a/res/drawable/ic_warning.xml b/res/drawable/ic_warning.xml
new file mode 100644
index 00000000..d633ad87
--- /dev/null
+++ b/res/drawable/ic_warning.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
diff --git a/res/layout/pairing_explanation_not_trusted.xml b/res/layout/pairing_explanation_not_trusted.xml
new file mode 100644
index 00000000..7feb2e6f
--- /dev/null
+++ b/res/layout/pairing_explanation_not_trusted.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:drawablePadding="8dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="12dp"
+    android:text="@string/on_non_trusted_message"
+    android:drawableStart="@drawable/ic_warning"
+    android:drawableTint="?attr/colorControlNormal"
+    android:clickable="false"
+    >
+
+</TextView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93f88049..bb287460 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,7 @@
     <string name="refresh">Refresh</string>
     <string name="unreachable_description">This paired device is not reachable. Make sure it is connected to your same network.</string>
     <string name="no_wifi">You\'re not connected to a Wi-Fi network, so you may not be able to see any devices. Click here to enable Wi-Fi.</string>
+    <string name="on_non_trusted_message">Not on a trusted network: autodiscovery is disabled.</string>
     <string name="no_file_browser">There are no file browsers installed.</string>
     <string name="pref_plugin_telepathy">Send SMS</string>
     <string name="pref_plugin_telepathy_desc">Send text messages from your desktop</string>
@@ -343,8 +344,11 @@
     <string name="presenter_pointer">Pointer</string>
 
     <string name="trusted_networks">Trusted networks</string>
-    <string name="add_trusted_network">Add %1$s</string>
+    <string name="trusted_networks_desc">Restrict autodiscovery to known networks</string>
+    <string name="add_trusted_network">Add %1s</string>
     <string name="empty_trusted_networks_list_text">You haven\'t added any trusted network yet</string>
     <string name="allow_all_networks_text">Allow all</string>
 
+    <string name="location_permission_needed_title">Permission required</string>
+    <string name="location_permission_needed_desc">Android requires the Location permission to identify your WiFi network</string>
 </resources>
diff --git a/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
index 048af1ce..7f677493 100644
--- a/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
@@ -4,7 +4,9 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import android.Manifest;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -12,6 +14,11 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.core.content.ContextCompat;
+
+import org.kde.kdeconnect.UserInterface.PermissionsAlertDialogFragment;
+import org.kde.kdeconnect_tp.R;
+
 public class TrustedNetworkHelper {
 
     private static final String KEY_CUSTOM_TRUSTED_NETWORKS = "trusted_network_preference";
@@ -40,7 +47,10 @@ public class TrustedNetworkHelper {
                 KEY_CUSTOM_TRUSTED_NETWORKS, serialized).apply();
     }
 
-    public Boolean allAllowed() {
+    public boolean allAllowed() {
+        if (!hasPermissions()) {
+            return true;
+        }
         return PreferenceManager
                 .getDefaultSharedPreferences(context)
                 .getBoolean(KEY_CUSTOM_TRUST_ALL_NETWORKS, Boolean.TRUE);
@@ -54,6 +64,11 @@ public class TrustedNetworkHelper {
                 .apply();
     }
 
+    public boolean hasPermissions() {
+        int result = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION);
+        return (result == PackageManager.PERMISSION_GRANTED);
+    }
+
     public String currentSSID() {
         WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         Log.d("Fou", "get");
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index 329e3f42..9fd7c73f 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -41,8 +41,13 @@ import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.PairingDeviceItem;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
@@ -51,10 +56,6 @@ import org.kde.kdeconnect_tp.R;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
 
 /**
  * The view that the user will see when there are no devices paired, or when you choose "add a new device" from the sidebar.
@@ -72,6 +73,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
     private TextView headerText;
     private TextView noWifiHeader;
+    private TextView notTrustedText;
     private Object networkChangeListener;
 
     @Override
@@ -91,6 +93,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
         mSwipeRefreshLayout.setOnRefreshListener(
                 this::updateComputerListAction
         );
+
+        notTrustedText = (TextView) inflater.inflate(R.layout.pairing_explanation_not_trusted, null);
+        notTrustedText.setOnClickListener(null);
+        notTrustedText.setOnLongClickListener(null);
         headerText = (TextView) inflater.inflate(R.layout.pairing_explanation_text, null);
         headerText.setOnClickListener(null);
         headerText.setOnLongClickListener(null);
@@ -179,12 +185,16 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
             ((ListView) rootView.findViewById(R.id.devices_list)).removeHeaderView(headerText);
             ((ListView) rootView.findViewById(R.id.devices_list)).removeHeaderView(noWifiHeader);
-
+            ((ListView) rootView.findViewById(R.id.devices_list)).removeHeaderView(notTrustedText);
             ConnectivityManager connManager = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
             NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
             //Check if we're on Wi-Fi. If we still see a device, don't do anything special
             if (someDevicesReachable || wifi.isConnected()) {
-                ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(headerText);
+                if (TrustedNetworkHelper.isNotTrustedNetwork(getContext())) {
+                    ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(notTrustedText);
+                } else {
+                    ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(headerText);
+                }
             } else {
                 ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(noWifiHeader);
             }
diff --git a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
index 1b830510..09cc24ad 100644
--- a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
@@ -63,10 +63,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
         screen.addPreference(renameDevice);
 
-
-        //TODO: Trusted wifi networks settings should go here
-
-
         // Dark mode
         final TwoStatePreference darkThemeSwitch = new SwitchPreferenceCompat(context);
         darkThemeSwitch.setPersistent(false);
@@ -120,6 +116,30 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             screen.addPreference(notificationSwitch);
         }
 
+
+        // Trusted Networks
+        Preference trustedNetworkPref = new Preference(context);
+        trustedNetworkPref.setPersistent(false);
+        trustedNetworkPref.setTitle(R.string.trusted_networks);
+        trustedNetworkPref.setSummary(R.string.trusted_networks_desc);
+        screen.addPreference(trustedNetworkPref);
+        trustedNetworkPref.setOnPreferenceClickListener(preference -> {
+            startActivity(new Intent(context, TrustedNetworksActivity.class));
+            return true;
+        });
+
+        // Add device by IP
+        Preference devicesByIpPreference = new Preference(context);
+        devicesByIpPreference.setPersistent(false);
+        devicesByIpPreference.setTitle(R.string.custom_device_list);
+        screen.addPreference(devicesByIpPreference);
+        devicesByIpPreference.setOnPreferenceClickListener(preference -> {
+
+            startActivity(new Intent(context, CustomDevicesActivity.class));
+            return true;
+        });
+
+
         // More settings text
         Preference moreSettingsText = new Preference(context);
         moreSettingsText.setPersistent(false);
diff --git a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
index f8cf817e..bdb96dd0 100644
--- a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
@@ -1,148 +1,122 @@
 package org.kde.kdeconnect.UserInterface;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
+import android.Manifest;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ListView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
+import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
+import org.kde.kdeconnect_tp.R;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.kde.kdeconnect.BackgroundService;
-import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
-import org.kde.kdeconnect_tp.R;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.*;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
 public class TrustedNetworksActivity extends AppCompatActivity {
 
-    private ListView trustedNetworksView;
     private List<String> trustedNetworks;
 
-    private boolean dialogAlreadyShown = false;
-
+    private ListView trustedNetworksView;
+    private CheckBox allowAllCheckBox;
+    private TrustedNetworkHelper trustedNetworkHelper;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        TrustedNetworkHelper trustedNetworkHelper = new TrustedNetworkHelper(getApplicationContext());
-        super.onCreate(savedInstanceState);
-        trustedNetworks = new ArrayList<>(trustedNetworkHelper.read());
         ThemeUtil.setUserPreferredTheme(this);
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.trusted_network_list);
         trustedNetworksView = findViewById(android.R.id.list);
-        emptyListMessage(trustedNetworkHelper);
 
-        trustedNetworkListView(trustedNetworkHelper);
+        trustedNetworkHelper = new TrustedNetworkHelper(getApplicationContext());
+        trustedNetworks = new ArrayList<>(trustedNetworkHelper.read());
 
-        CheckBox allowAllCheckBox = findViewById(R.id.trust_all_networks_checkBox);
-        allowAllCheckBox.setChecked(trustedNetworkHelper.allAllowed());
+        allowAllCheckBox = findViewById(R.id.trust_all_networks_checkBox);
         allowAllCheckBox.setOnCheckedChangeListener((v, isChecked) -> {
-            trustedNetworkHelper.allAllowed(isChecked);
-            trustedNetworkListView(trustedNetworkHelper);
-        });
 
+            if (trustedNetworkHelper.hasPermissions()) {
+                trustedNetworkHelper.allAllowed(isChecked);
+                updateTrustedNetworkListView();
+                addNetworkButton();
+            } else {
+                allowAllCheckBox.setChecked(true); // Disable unchecking it
+                new PermissionsAlertDialogFragment.Builder()
+                        .setTitle(R.string.location_permission_needed_title)
+                        .setMessage(R.string.location_permission_needed_desc)
+                        .setPositiveButton(R.string.ok)
+                        .setNegativeButton(R.string.cancel)
+                        .setPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION})
+                        .setRequestCode(0)
+                        .create().show(getSupportFragmentManager(), null);
+            }
+        });
+        allowAllCheckBox.setChecked(trustedNetworkHelper.allAllowed());
+
+        updateTrustedNetworkListView();
     }
 
-    private void emptyListMessage(TrustedNetworkHelper trustedNetworkHelper) {
+    private void updateEmptyListMessage() {
         boolean isVisible = trustedNetworks.isEmpty() && !trustedNetworkHelper.allAllowed();
         findViewById(R.id.trusted_network_list_empty)
-                .setVisibility(isVisible ? VISIBLE : GONE );
+                .setVisibility(isVisible ? View.VISIBLE : View.GONE );
     }
 
-    private void trustedNetworkListView(TrustedNetworkHelper trustedNetworkHelper) {
+    private void updateTrustedNetworkListView() {
         Boolean allAllowed = trustedNetworkHelper.allAllowed();
-        emptyListMessage(trustedNetworkHelper);
-//        trustedNetworksView.setVisibility(allAllowed ? GONE : VISIBLE);
-        trustedNetworksView.setVisibility(allAllowed ? VISIBLE : VISIBLE);
-//        if (allAllowed){
-//            return;
-//        }
+        updateEmptyListMessage();
+        trustedNetworksView.setVisibility(allAllowed ? View.GONE : View.VISIBLE);
+        if (allAllowed){
+            return;
+        }
         trustedNetworksView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, trustedNetworks));
-        trustedNetworksView.setOnItemClickListener(onItemClickGenerator(trustedNetworkHelper));
-        addNetworkButton(trustedNetworkHelper);
-    }
-
-    @NonNull
-    private AdapterView.OnItemClickListener onItemClickGenerator(TrustedNetworkHelper trustedNetworkHelper) {
-        return (parent, view, position, id) -> {
-            if (dialogAlreadyShown) {
-                return;
-            }
+        trustedNetworksView.setOnItemClickListener((parent, view, position, id) -> {
             String targetItem = trustedNetworks.get(position);
+            new AlertDialog.Builder(TrustedNetworksActivity.this)
+                .setMessage("Delete " + targetItem + " ?")
+                .setPositiveButton("Yes", (dialog, which) -> {
+                    trustedNetworks.remove(position);
+                    trustedNetworkHelper.update(trustedNetworks);
+                    ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
+                    addNetworkButton();
+                    updateEmptyListMessage();
+                })
+                .setNegativeButton("No", null)
+                .show();
 
-            // remove touched item after confirmation
-            DialogInterface.OnClickListener confirmationListener = (dialog, which) -> {
-                switch (which) {
-                    case DialogInterface.BUTTON_POSITIVE:
-                        trustedNetworks.remove(position);
-                        trustedNetworkHelper.update(trustedNetworks);
-                        ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
-                        addNetworkButton(trustedNetworkHelper);
-                        emptyListMessage(trustedNetworkHelper);
-                        break;
-                    case DialogInterface.BUTTON_NEGATIVE:
-                        break;
-                }
-            };
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setMessage("Delete " + targetItem + " ?");
-            builder.setPositiveButton("Yes", confirmationListener);
-            builder.setNegativeButton("No", confirmationListener);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { //DismissListener
-                dialogAlreadyShown = true;
-                builder.setOnDismissListener(dialog -> dialogAlreadyShown = false);
-            }
-
-            builder.show();
-        };
+        });
+        addNetworkButton();
     }
 
-    private void addNetworkButton(TrustedNetworkHelper trustedNetworkHelper) {
-        String currentSSID = trustedNetworkHelper.currentSSID();
+
+    private void addNetworkButton() {
+        Button addButton = findViewById(android.R.id.button1);
+        if (trustedNetworkHelper.allAllowed()) {
+            addButton.setVisibility(View.GONE);
+            return;
+        }
+        final String currentSSID = trustedNetworkHelper.currentSSID();
         if (!currentSSID.isEmpty() && trustedNetworks.indexOf(currentSSID) == -1) {
-            Button addButton = (Button) findViewById(android.R.id.button1);
             String buttonText = getString(R.string.add_trusted_network, currentSSID);
             addButton.setText(buttonText);
-            addButton.setOnClickListener(saveCurrentSSIDAsTrustedNetwork(currentSSID, trustedNetworkHelper));
-            addButton.setVisibility(VISIBLE);
+            addButton.setOnClickListener(v -> {
+                if (trustedNetworks.indexOf(currentSSID) != -1){
+                    return;
+                }
+                trustedNetworks.add(currentSSID);
+                trustedNetworkHelper.update(trustedNetworks);
+                ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
+                v.setVisibility(View.GONE);
+                updateEmptyListMessage();
+            });
+            addButton.setVisibility(View.VISIBLE);
+        } else {
+            addButton.setVisibility(View.GONE);
         }
     }
 
-
-    @NonNull
-    private View.OnClickListener saveCurrentSSIDAsTrustedNetwork(String ssid, TrustedNetworkHelper trustedNetworkHelper) {
-        return v -> {
-            if (trustedNetworks.indexOf(ssid) != -1){
-                return;
-            }
-            trustedNetworks.add(ssid);
-            trustedNetworkHelper.update(trustedNetworks);
-            ((ArrayAdapter) trustedNetworksView.getAdapter()).notifyDataSetChanged();
-            v.setVisibility(GONE);
-        };
-    }
-
-
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        BackgroundService.addGuiInUseCounter(this);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        BackgroundService.removeGuiInUseCounter(this);
-    }
-
 }

From 235e49c80f66b0bfdd7bea3cfea9f9b1d27afe33 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Sun, 5 Jan 2020 17:27:16 +0100
Subject: [PATCH 3/3] Fixes as per code review

---
 .../Backends/LanBackend/LanLinkProvider.java  | 21 +++++++++----------
 .../Helpers/TrustedNetworkHelper.java         | 10 +++------
 .../UserInterface/PairingFragment.java        |  6 +++---
 .../TrustedNetworksActivity.java              | 16 ++++++++++++++
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
index 08995aa6..ebf45f48 100644
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -118,11 +118,6 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     //I've received their broadcast and should connect to their TCP socket and send my identity.
     private void udpPacketReceived(DatagramPacket packet) {
 
-        if (TrustedNetworkHelper.isNotTrustedNetwork(context)) {
-            Log.w("LanLinkProvider", "Current WiFi isn't a Trusted Network");
-            return;
-        }
-
         final InetAddress address = packet.getAddress();
 
         try {
@@ -370,15 +365,19 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         }
         lastBroadcast = System.currentTimeMillis();
 
-        if (TrustedNetworkHelper.isNotTrustedNetwork(context)) {
-            Log.w("LanLinkProvider", "Current WiFi isn't a Trusted Network");
-            return;
-        }
-
         new Thread(() -> {
             ArrayList<String> iplist = CustomDevicesActivity
                     .getCustomDeviceList(PreferenceManager.getDefaultSharedPreferences(context));
-            iplist.add("255.255.255.255"); //Default: broadcast.
+
+            if (TrustedNetworkHelper.isTrustedNetwork(context)) {
+                iplist.add("255.255.255.255"); //Default: broadcast.
+            } else {
+                Log.i("LanLinkProvider", "Current network isn't trusted, not broadcasting");
+            }
+
+            if (iplist.isEmpty()) {
+                return;
+            }
 
             NetworkPacket identity = NetworkPacket.createIdentityPacket(context);
             int port = (tcpServer == null || !tcpServer.isBound()) ? MIN_PORT : tcpServer.getLocalPort();
diff --git a/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
index 7f677493..040ca644 100644
--- a/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/TrustedNetworkHelper.java
@@ -71,27 +71,23 @@ public class TrustedNetworkHelper {
 
     public String currentSSID() {
         WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        Log.d("Fou", "get");
         if (wifiManager == null) return "";
         WifiInfo wifiInfo = wifiManager.getConnectionInfo();
         if (wifiInfo.getSupplicantState() != SupplicantState.COMPLETED) {
-            Log.d("Fou", "fooo");
             return "";
         }
         String ssid = wifiInfo.getSSID();
         if (ssid.equalsIgnoreCase(NOT_AVAILABLE_SSID_RESULT)){
-            Log.d("Fou", "navail");
             return "";
         }
-        Log.d("Fou", "retn");
         return ssid;
     }
 
-    public static boolean isNotTrustedNetwork(Context context) {
+    public static boolean isTrustedNetwork(Context context) {
         TrustedNetworkHelper trustedNetworkHelper = new TrustedNetworkHelper(context);
         if (trustedNetworkHelper.allAllowed()){
-            return false;
+            return true;
         }
-        return trustedNetworkHelper.read().indexOf(trustedNetworkHelper.currentSSID()) == -1;
+        return trustedNetworkHelper.read().contains(trustedNetworkHelper.currentSSID());
     }
 }
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index 9fd7c73f..2f4d5c23 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -190,10 +190,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
             NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
             //Check if we're on Wi-Fi. If we still see a device, don't do anything special
             if (someDevicesReachable || wifi.isConnected()) {
-                if (TrustedNetworkHelper.isNotTrustedNetwork(getContext())) {
-                    ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(notTrustedText);
-                } else {
+                if (TrustedNetworkHelper.isTrustedNetwork(getContext())) {
                     ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(headerText);
+                } else {
+                    ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(notTrustedText);
                 }
             } else {
                 ((ListView) rootView.findViewById(R.id.devices_list)).addHeaderView(noWifiHeader);
diff --git a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
index bdb96dd0..e6ad33b8 100644
--- a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
@@ -1,6 +1,7 @@
 package org.kde.kdeconnect.UserInterface;
 
 import android.Manifest;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -8,6 +9,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -25,6 +27,20 @@ public class TrustedNetworksActivity extends AppCompatActivity {
     private CheckBox allowAllCheckBox;
     private TrustedNetworkHelper trustedNetworkHelper;
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean grantedPermission = false;
+        for (int result : grantResults) {
+            if (result == PackageManager.PERMISSION_GRANTED) {
+                grantedPermission = true;
+                break;
+            }
+        }
+        if (grantedPermission) {
+            allowAllCheckBox.setChecked(false);
+        }
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {