Preparing a hotfix release

Android's Storage Access Framework abstraction wants us to use mimetypes
instead of file extensions, but for some file types it can't guess a useful
mimetype. In those cases, provide the extension as part of the base name.

BUG: 376638

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="1600"
-    android:versionName="1.6">
+    android:versionCode="1610"
+    android:versionName="1.6.1">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="22" />

res/layout/activity_device.xml

@@ -70,7 +70,7 @@
     </LinearLayout>
 
     <TextView
-        android:id="@+id/unpair_message"
+        android:id="@+id/not_reachable_message"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:drawableStart="@drawable/ic_error_outline_black_48dp"
@@ -82,6 +82,19 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
+    <TextView
+        android:id="@+id/on_data_message"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:drawableStart="@drawable/ic_error_outline_black_48dp"
+        android:drawableLeft="@drawable/ic_error_outline_black_48dp"
+        android:drawablePadding="8dip"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="@string/on_data_message"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        />
+
     <ListView
         android:id="@+id/buttons_list"
         android:layout_width="match_parent"

res/values-ca/strings.xml

@@ -165,6 +165,7 @@
   <string name="device_rename_confirm">Reanomena</string>
   <string name="refresh">Refresca</string>
   <string name="unreachable_description">Aquest dispositiu aparellat no és accessible. Assegureu-vos que està connectat a la mateixa xarxa.</string>
+  <string name="on_data_message">Sembla que esteu amb una connexió de dades mòbils. El KDE Connect només funciona amb xarxes locals.</string>
   <string name="no_file_browser">No hi ha instal·lat cap explorador de fitxers.</string>
   <string name="pref_plugin_telepathy">Envia un SMS</string>
   <string name="pref_plugin_telepathy_desc">Envia missatges de text des de l\'escriptori</string>

res/values-en-rGB/strings.xml

@@ -165,6 +165,7 @@
   <string name="device_rename_confirm">Rename</string>
   <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="on_data_message">It looks like you are on a mobile data connection. KDE Connect only works on local networks.</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>

res/values-pl/strings.xml

@@ -159,6 +159,7 @@
   <string name="device_rename_confirm">Zmień nazwę</string>
   <string name="refresh">Odśwież</string>
   <string name="unreachable_description">To sparowane urządzenie jest nieosiągalne. Upewnij się, że jest podłączone do tej samej sieci.</string>
+  <string name="on_data_message">Wygląda na to, że korzystasz z internetu mobilnego. KDE Connect działa tylko na lokalnych sieciach.</string>
   <string name="no_file_browser">Nie wgrano żadanych przeglądarek plików.</string>
   <string name="pref_plugin_telepathy">Wyślij SMS-a</string>
   <string name="pref_plugin_telepathy_desc">Wyślij wiadomość tekstową z komputera</string>

res/values-pt/strings.xml

@@ -165,6 +165,7 @@
   <string name="device_rename_confirm">Mudar o Nome</string>
   <string name="refresh">Actualizar</string>
   <string name="unreachable_description">Este dispositivo emparelhado não está acessível. Certifique-se que está ligado à mesma rede que você.</string>
+  <string name="on_data_message">Parece que está com uma ligação de dados móveis. O KDE Connect só se liga em redes locais.</string>
   <string name="no_file_browser">Não existem gestores de ficheiros instalados.</string>
   <string name="pref_plugin_telepathy">Enviar um SMS</string>
   <string name="pref_plugin_telepathy_desc">Enviar mensagens de texto a partir do seu ambiente de trabalho</string>

res/values-sk/strings.xml

@@ -165,6 +165,7 @@
   <string name="device_rename_confirm">Premenovať</string>
   <string name="refresh">Obnoviť</string>
   <string name="unreachable_description">Toto spárované zariadenie nie je dosiahnuteľné. Prosím, uistite sa, že je pripojené do rovnakej siete.</string>
+  <string name="on_data_message">Zdá sa, že ste na mobilom dátovom pripojení. KDE Connect funguje iba na lokálnej sieti.</string>
   <string name="no_file_browser">Nie sú nainštalované žiadne prehliadače.</string>
   <string name="pref_plugin_telepathy">Poslať SMS</string>
   <string name="pref_plugin_telepathy_desc">Posielať textové správy z vášho počítača</string>

res/values-sv/strings.xml

@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Dela klippbordets innehåll</string>
   <string name="pref_plugin_mousepad">Fjärrinmatning</string>
   <string name="pref_plugin_mousepad_desc">Använd telefonen eller surfplattan som mus och tangentbord</string>
+  <string name="pref_plugin_remotekeyboard">Ta emot fjärrtangentnedtryckningar</string>
+  <string name="pref_plugin_remotekeyboard_desc">Ta emot tangentnedtryckningar från fjärrenheter</string>
   <string name="pref_plugin_mpris">Multimediakontroller</string>
   <string name="pref_plugin_mpris_desc">Tillhandahåller en fjärrkontroll för mediaspelaren</string>
   <string name="pref_plugin_runcommand">Kör kommando</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Du måste ge rättighet att komma åt underrättelser</string>
   <string name="send_ping">Skicka ping</string>
   <string name="open_mpris_controls">Kontroll av multimedia</string>
+  <string name="remotekeyboard_editing_only_title">Hantera bara fjärrtangenter vid redigering</string>
+  <string name="remotekeyboard_not_connected">Det finns ingen aktiv fjärrtangentbordsanslutning, upprätta en i KDE-anslut</string>
+  <string name="remotekeyboard_connected">Fjärrtangentbordsanslutning är aktiv</string>
+  <string name="remotekeyboard_multiple_connections">Det finns mer än en fjärrtangentbordsanslutning, välj enhet att anpassa</string>
   <string name="open_mousepad">Fjärrinmatning</string>
   <string name="mousepad_info">Flytta fingret på skärmen för att röra muspekaren. Rör för att klicka, och använd två eller tre fingrar för höger- och mittenknapparna. Använd en längre beröring för drag och släpp.</string>
   <string name="mousepad_double_tap_settings_title">Ställ in åtgärd vid två fingerberöringar</string>
@@ -159,6 +165,7 @@
   <string name="device_rename_confirm">Byt namn</string>
   <string name="refresh">Uppdatera</string>
   <string name="unreachable_description">Den här ihopparade apparaten kan inte nås. Försäkra dig om att den är ansluten till samma nätverk.</string>
+  <string name="on_data_message">Det verkar som om du använder en mobil dataanslutning. KDE-anslut fungerar bara på lokala nätverk.</string>
   <string name="no_file_browser">Det finns inga filbläddrare installerade.</string>
   <string name="pref_plugin_telepathy">Skicka SMS</string>
   <string name="pref_plugin_telepathy_desc">Skicka textmeddelanden från skrivbordet</string>

res/values-uk/strings.xml

@@ -165,6 +165,7 @@
   <string name="device_rename_confirm">Перейменувати</string>
   <string name="refresh">Оновити</string>
   <string name="unreachable_description">Цей пов’язаний пристрій недоступний. Переконайтеся, що його з’єднано з вашою мережею.</string>
+  <string name="on_data_message">Здається, мережа працює у режимі мобільного з’єднання. KDE Connect може працювати лише у локальних мережах.</string>
   <string name="no_file_browser">Програм для навігації файловою системою не встановлено.</string>
   <string name="pref_plugin_telepathy">Надіслати SMS</string>
   <string name="pref_plugin_telepathy_desc">Надсилати текстові повідомлення з вашої робочої станції</string>

res/values/strings.xml

@@ -193,6 +193,7 @@
     <string name="device_rename_confirm">Rename</string>
     <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="on_data_message">It looks like you are on a mobile data connection. KDE Connect only works on local networks.</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>

src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java

@@ -31,6 +31,7 @@ import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.StringsHelper;
 import org.kde.kdeconnect.NetworkPackage;
@@ -68,18 +69,18 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     final static int MAX_PORT = 1764;
     final static int PAYLOAD_TRANSFER_MIN_PORT = 1739;
 
-    private final Context context;
+    final Context context;
 
     private final HashMap<String, LanLink> visibleComputers = new HashMap<>();  //Links by device id
 
-    private ServerSocket tcpServer;
+    ServerSocket tcpServer;
     private DatagramSocket udpServer;
     private DatagramSocket udpServerOldPort;
 
-    private boolean listening = false;
+    boolean listening = false;
 
     // To prevent infinte loop between Android < IceCream because both device can only broadcast identity package but cannot connect via TCP
-    private ArrayList<InetAddress> reverseConnectionBlackList = new ArrayList<>();
+    ArrayList<InetAddress> reverseConnectionBlackList = new ArrayList<>();
 
     @Override // SocketClosedCallback
     public void linkDisconnected(LanLink brokenLink) {
@@ -89,7 +90,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     }
 
     //They received my UDP broadcast and are connecting to me. The first thing they sned should be their identity.
-    public void tcpPackageReceived(Socket socket) throws Exception {
+    void tcpPackageReceived(Socket socket) throws Exception {
 
         NetworkPackage networkPackage;
         try {
@@ -112,7 +113,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     }
 
     //I've received their broadcast and should connect to their TCP socket and send my identity.
-    protected void udpPacketReceived(DatagramPacket packet) throws Exception {
+    void udpPacketReceived(DatagramPacket packet) throws Exception {
 
         final InetAddress address = packet.getAddress();
 
@@ -171,7 +172,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         }
     }
 
-    private void configureSocket(Socket socket) {
+    void configureSocket(Socket socket) {
         try {
             socket.setKeepAlive(true);
         } catch (SocketException e) {
@@ -360,7 +361,12 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         throw new IOException("No ports available");
     }
 
-    void broadcastUdpPackage() {
+    private void broadcastUdpPackage() {
+
+        if (NetworkHelper.isOnMobileNetwork(context)) {
+            Log.w("LanLinkProvider", "On 3G network, not sending broadcast.");
+            return;
+        }
 
         new Thread(new Runnable() {
             @Override

src/org/kde/kdeconnect/BackgroundService.java

@@ -119,7 +119,7 @@ public class BackgroundService extends Service {
         }
     };
 
-    private void onDeviceListChanged() {
+    public void onDeviceListChanged() {
         for(DeviceListChangedCallback callback : deviceListChangedCallbacks.values()) {
             callback.onDeviceListChanged();
         }

src/org/kde/kdeconnect/Helpers/NetworkHelper.java

@@ -0,0 +1,18 @@
+package org.kde.kdeconnect.Helpers;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.util.Log;
+
+public class NetworkHelper {
+
+    public static boolean isOnMobileNetwork(Context context) {
+        return false; //This looks a bit dangerous and I prefer not to use it in the next stable release.
+        /*final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo info = connMgr.getActiveNetworkInfo();
+        return (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE);
+        */
+    }
+
+}

src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java

@@ -67,6 +67,7 @@ public class KdeConnectBroadcastReceiver extends BroadcastReceiver
                 BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
                     @Override
                     public void onServiceStart(BackgroundService service) {
+                        service.onDeviceListChanged();
                         service.onNetworkChange();
                     }
                 });

src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java

@@ -119,11 +119,15 @@ public class SharePlugin extends Plugin {
                 final String defaultPath = ShareSettingsActivity.getDefaultDestinationDirectory().getAbsolutePath();
                 final String filename = customDestination? originalFilename : FilesHelper.findNonExistingNameForNewFile(defaultPath, originalFilename);
 
-                final String nameWithoutExtension = FilesHelper.getFileNameWithoutExt(filename);
+                String displayName = FilesHelper.getFileNameWithoutExt(filename);
                 final String mimeType = FilesHelper.getMimeTypeFromFile(filename);
 
+                if ("*/*".equals(mimeType)) {
+                    displayName = filename;
+                }
+
                 final DocumentFile destinationFolderDocument = ShareSettingsActivity.getDestinationDirectory(context);
-                final DocumentFile destinationDocument = destinationFolderDocument.createFile(mimeType, nameWithoutExtension);
+                final DocumentFile destinationDocument = destinationFolderDocument.createFile(mimeType, displayName);
                 final OutputStream destinationOutput = context.getContentResolver().openOutputStream(destinationDocument.getUri());
                 final Uri destinationUri = destinationDocument.getUri();
 

src/org/kde/kdeconnect/UserInterface/DeviceFragment.java

@@ -40,6 +40,7 @@ import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.UserInterface.List.CustomItem;
@@ -130,10 +131,6 @@ public class DeviceFragment extends Fragment {
 
                 refreshUI();
 
-                //TODO: Is this needed?
-                //if (!device.hasPluginsLoaded() && device.isReachable()) {
-                //    device.reloadPluginsFromSettings();
-                //}
             }
         });
 
@@ -296,21 +293,6 @@ public class DeviceFragment extends Fragment {
     public void onResume() {
         super.onResume();
 
-        //TODO: Is this needed?
-        /*
-        BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
-            @Override
-            public void onServiceStart(BackgroundService service) {
-                if (mDeviceId != null) {
-                    Device device = service.getDevice(mDeviceId);
-                    if (device != null && device.isReachable()) {
-                        device.reloadPluginsFromSettings();
-                    }
-                }
-            }
-        });
-        */
-
         getView().setFocusableInTouchMode(true);
         getView().requestFocus();
         getView().setOnKeyListener(new View.OnKeyListener() {
@@ -352,9 +334,11 @@ public class DeviceFragment extends Fragment {
 
                     boolean paired = device.isPaired();
                     boolean reachable = device.isReachable();
+                    boolean onData = NetworkHelper.isOnMobileNetwork(getContext());
 
                     rootView.findViewById(R.id.pairing_buttons).setVisibility(paired ? View.GONE : View.VISIBLE);
-                    rootView.findViewById(R.id.unpair_message).setVisibility((paired && !reachable) ? View.VISIBLE : View.GONE);
+                    rootView.findViewById(R.id.not_reachable_message).setVisibility((paired && !reachable && !onData) ? View.VISIBLE : View.GONE);
+                    rootView.findViewById(R.id.on_data_message).setVisibility((paired && !reachable && onData) ? View.VISIBLE : View.GONE);
 
                     try {
                         ArrayList<ListAdapter.Item> items = new ArrayList<>();

src/org/kde/kdeconnect/UserInterface/PairingFragment.java

@@ -36,6 +36,7 @@ import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.PairingDeviceItem;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
@@ -60,6 +61,8 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
     boolean listRefreshCalledThisFrame = false;
 
+    TextView headerText;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -74,10 +77,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
         rootView = inflater.inflate(R.layout.activity_list, container, false);
 
-        TextView text = new TextView(inflater.getContext());
-        text.setText(getString(R.string.pairing_description));
-        text.setPadding(0, (int) (16 * getResources().getDisplayMetrics().density), 0, (int) (12 * getResources().getDisplayMetrics().density));
-        ((ListView) rootView).addHeaderView(text);
+        headerText = new TextView(inflater.getContext());
+        headerText.setText(getString(R.string.pairing_description));
+        headerText.setPadding(0, (int) (16 * getResources().getDisplayMetrics().density), 0, (int) (12 * getResources().getDisplayMetrics().density));
+        ((ListView) rootView).addHeaderView(headerText);
 
         return rootView;
     }
@@ -104,6 +107,8 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
                         }
                         listRefreshCalledThisFrame = true;
 
+                        headerText.setText(getString(NetworkHelper.isOnMobileNetwork(getContext()) ? R.string.on_data_message : R.string.pairing_description));
+
                         try {
                             Collection<Device> devices = service.getDevices().values();
                             final ArrayList<ListAdapter.Item> items = new ArrayList<>();