Increased version number to release

Trying raising it to 500 (maximum is 999).

BUG: 342215

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="806"
-    android:versionName="0.8f">
+    android:versionCode="807"
+    android:versionName="0.8g">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="21" />

res/values-ca/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">S\'està enviant el fitxer a %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Fitxer rebut des de %1s</string>
+  <string name="received_file_fail_title">Ha fallat en rebre el fitxer des de %1s</string>
   <string name="received_file_text">Puntegeu per obrir «%1s»</string>
   <string name="sent_file_title">Envia el fitxer a %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-cs/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Odesílám soubor do %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Přijat soubor od %1s</string>
+  <string name="received_file_fail_title">Selhalo přijímání souboru od %1s</string>
   <string name="received_file_text">Ťukněte pro otevření \'%1s\'</string>
   <string name="sent_file_title">Soubor byl odeslán do %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-fi/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Lähetetään tiedostoa laitteeseen %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Vastaanotettiin tiedosto lähettäjältä %1s</string>
+  <string name="received_file_fail_title">Ei voitu vastaanottaa tiedostoa lähettäjältä %1s</string>
   <string name="received_file_text">Avaa ”%1s” napauttamalla</string>
   <string name="sent_file_title">Tiedosto lähetetty laitteeseen %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-it/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Invio file a %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">File ricevuto da %1s</string>
+  <string name="received_file_fail_title">Ricezione file da %1s non riuscita</string>
   <string name="received_file_text">Tocca per aprire «%1s»</string>
   <string name="sent_file_title">File inviato a %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-nl/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Bezig bestand te verzenden naar %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Bestand ontvangen van %1s</string>
+  <string name="received_file_fail_title">Bestand ontvangen van %1s is mislukt</string>
   <string name="received_file_text">Tap om \'%1s\' te openen</string>
   <string name="sent_file_title">Bestand verzonden naar %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-pt-rBR/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Enviando arquivo para %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Arquivo recebido de %1s</string>
+  <string name="received_file_fail_title">Falha ao receber o arquivo de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
   <string name="sent_file_title">Enviar arquivo para %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-pt/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">A enviar o ficheiro para o %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Ficheiro recebido de %1s</string>
+  <string name="received_file_fail_title">Falhou a recepção do ficheiro de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
   <string name="sent_file_title">O ficheiro foi enviado para %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-sk/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Posielam súbor pre %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Prijatý súbor od %1s</string>
+  <string name="received_file_fail_title">Zlyhalo prijatie súboru od %1s</string>
   <string name="received_file_text">Ťuknite na otvorenie \'%1s\'</string>
   <string name="sent_file_title">Poslať súbor pre %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-sv/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Skickar fil till %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Tog emot fil från %1s</string>
+  <string name="received_file_fail_title">Misslyckades ta emot fil från %1s</string>
   <string name="received_file_text">Rör för att öppna \'%1s\'</string>
   <string name="sent_file_title">Skickade fil till %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-uk/strings.xml

@@ -62,6 +62,7 @@
   <string name="outgoing_file_title">Надсилаємо файл до %1s</string>
   <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Отримано файл з %1s</string>
+  <string name="received_file_fail_title">Не вдалося отримати файл з %1s</string>
   <string name="received_file_text">Натисніть, щоб відкрити «%1s»</string>
   <string name="sent_file_title">Файл надіслано до %1s</string>
   <string name="sent_file_text">%1s</string>

res/values-v11/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>

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

@@ -99,17 +99,8 @@ public class LanLink extends BaseLink {
                 OutputStream socket = null;
                 try {
                     //Wait a maximum of 10 seconds for the other end to establish a connection with our socket, close it afterwards
-                    Timer timeout = new Timer();
-                    timeout.schedule(new TimerTask() {
-                        @Override
-                        public void run() {
-                            Log.e("KDE/sendPackage","Timeout");
-                            try { server.close(); } catch (Exception e) { }
-                            callback.sendFailure(new TimeoutException("Timed out waiting for other end to establish a connection to receive the payload."));
-                        }
-                    },10*1000);
+                    server.setSoTimeout(10*1000);
                     socket = server.accept().getOutputStream();
-                    timeout.cancel();
 
                     Log.i("KDE/LanLink", "Beginning to send payload");
 
@@ -127,7 +118,7 @@ public class LanLink extends BaseLink {
                     }
                     socket.flush();
                     stream.close();
-                    Log.i("KDE/LanLink", "Finished sending payload");
+                    Log.i("KDE/LanLink", "Finished sending payload ("+progress+" bytes written)");
                 } catch (Exception e) {
                     Log.e("KDE/sendPackage", "Exception: "+e);
                     callback.sendFailure(e);

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

@@ -25,7 +25,6 @@ import android.app.AlertDialog;
 import android.app.Notification;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -35,19 +34,16 @@ import android.util.Log;
 import android.widget.Button;
 
 import org.kde.kdeconnect.Helpers.AppsHelper;
-import org.kde.kdeconnect.Helpers.ImagesHelper;
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.UserInterface.DeviceActivity;
 import org.kde.kdeconnect.UserInterface.SettingsActivity;
 import org.kde.kdeconnect_tp.R;
 
-import java.io.ByteArrayOutputStream;
-
 public class NotificationsPlugin extends Plugin implements NotificationReceiver.NotificationListener {
-
+/*
     private boolean sendIcons = false;
-
+*/
     @Override
     public String getPluginName() {
         return "plugin_notifications";
@@ -253,7 +249,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
             np.set("silent", true);
             np.set("requestAnswer", true); //For compatibility with old desktop versions of KDE Connect that don't support "silent"
         }
-
+/*
         if (sendIcons) {
             try {
                 Drawable drawableAppIcon = AppsHelper.appIconLookup(context, packageName);
@@ -270,7 +266,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
                 Log.e("NotificationsPlugin", "Error retrieving icon");
             }
         }
-
+*/
         np.set("id", id.serialize());
         np.set("appName", appName == null? packageName : appName);
         np.set("isClearable", statusBarNotification.isClearable());
@@ -329,11 +325,11 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
     @Override
     public boolean onPackageReceived(final NetworkPackage np) {
         if (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_NOTIFICATION)) return false;
-
+/*
         if (np.getBoolean("sendIcons")) {
             sendIcons = true;
         }
-
+*/
         if (np.getBoolean("request")) {
 
             NotificationReceiver.RunCommand(context, new NotificationReceiver.InstanceCallback() {

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

@@ -207,6 +207,7 @@ public class TelephonyPlugin extends Plugin {
     public boolean onCreate() {
         //Log.e("TelephonyPlugin", "onCreate");
         IntentFilter filter = new IntentFilter("android.provider.Telephony.SMS_RECEIVED");
+        filter.setPriority(500);
         filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
         context.registerReceiver(receiver, filter);
         return true;

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

@@ -45,10 +45,6 @@ import java.util.Collection;
 
 public class MainActivity extends ActionBarActivity {
 
-    //
-    // Action bar
-    //
-
     private MenuItem menuProgress;
 
     @Override