Increased version number to release

Revert "SVN_SILENT made messages (after extraction)"

This reverts commit f3fbe4d035.

src/main/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="730"
-    android:versionName="0.7.3">
+    android:versionCode="732"
+    android:versionName="0.7.3.2">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="19" />
@@ -138,6 +138,8 @@
             android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
             android:label="@string/remote_control"
+            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="fullSensor"
             android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
             >

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

@@ -167,6 +167,10 @@ public class LanLinkProvider extends BaseLinkProvider {
         String deviceId = identityPackage.getString("deviceId");
         Log.i("LanLinkProvider","addLink to "+deviceId);
         LanLink oldLink = visibleComputers.get(deviceId);
+        if (oldLink == link) {
+            Log.e("KDEConnect", "LanLinkProvider: oldLink == link. This should not happen!");
+            return;
+        }
         visibleComputers.put(deviceId, link);
         connectionAccepted(identityPackage, link);
         if (oldLink != null) {

src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java

@@ -6,6 +6,8 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
@@ -22,7 +24,7 @@ public class KeyListenerView extends View  {
         int i = 0;
         SpecialKeysMap.put(KeyEvent.KEYCODE_DEL, ++i);              // 1
         SpecialKeysMap.put(KeyEvent.KEYCODE_TAB, ++i);              // 2
-        SpecialKeysMap.put(KeyEvent.KEYCODE_ENTER, ++i);            // 3
+        SpecialKeysMap.put(KeyEvent.KEYCODE_ENTER, 12); ++i;        // 3 is not used, return is 12 instead
         SpecialKeysMap.put(KeyEvent.KEYCODE_DPAD_LEFT, ++i);        // 4
         SpecialKeysMap.put(KeyEvent.KEYCODE_DPAD_UP, ++i);          // 5
         SpecialKeysMap.put(KeyEvent.KEYCODE_DPAD_RIGHT, ++i);       // 6
@@ -49,6 +51,12 @@ public class KeyListenerView extends View  {
         setFocusableInTouchMode(true);
     }
 
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
+        return null;
+    }
+
     @Override
     public boolean onCheckIsTextEditor() {
         return true;

src/main/java/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java

@@ -1,8 +1,8 @@
 package org.kde.kdeconnect.Plugins.MousePadPlugin;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.view.GestureDetector;
 import android.view.inputmethod.InputMethodManager;
 import android.view.Menu;
@@ -14,7 +14,7 @@ import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect_tp.R;
 
-public class MousePadActivity extends Activity implements GestureDetector.OnGestureListener, GestureDetector.OnDoubleTapListener, MousePadGestureDetector.OnGestureListener {
+public class MousePadActivity extends ActionBarActivity implements GestureDetector.OnGestureListener, GestureDetector.OnDoubleTapListener, MousePadGestureDetector.OnGestureListener {
 
     String deviceId;
 
@@ -48,7 +48,6 @@ public class MousePadActivity extends Activity implements GestureDetector.OnGest
 
         keyListenerView = (KeyListenerView)findViewById(R.id.keyListener);
         keyListenerView.setDeviceId(deviceId);
-
     }
 
     @Override
@@ -248,7 +247,7 @@ public class MousePadActivity extends Activity implements GestureDetector.OnGest
 
     private void showKeyboard() {
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(keyListenerView, InputMethodManager.SHOW_IMPLICIT);
+        imm.toggleSoftInputFromWindow(keyListenerView.getWindowToken(), 0, 0);
     }
 
 }

src/main/java/org/kde/kdeconnect/UserInterface/DeviceActivity.java

@@ -144,6 +144,7 @@ public class DeviceActivity extends ActionBarActivity {
             @Override
             public void onServiceStart(BackgroundService service) {
                 Device device = service.getDevice(deviceId);
+                if (device == null) return;
                 device.removePluginsChangedListener(pluginsChangedListener);
             }
         });

src/main/java/org/kde/kdeconnect/UserInterface/PairActivity.java

@@ -76,6 +76,7 @@ public class PairActivity extends ActionBarActivity {
             @Override
             public void onServiceStart(BackgroundService service) {
                 device = service.getDevice(deviceId);
+                if (device == null) return;
                 setTitle(device.getName());
                 NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
                 notificationManager.cancel(device.getNotificationId());
@@ -94,6 +95,7 @@ public class PairActivity extends ActionBarActivity {
                     @Override
                     public void onServiceStart(BackgroundService service) {
                         device = service.getDevice(deviceId);
+                        if (device == null) return;
                         device.requestPairing();
                     }
                 });
@@ -134,6 +136,8 @@ public class PairActivity extends ActionBarActivity {
         BackgroundService.RunCommand(PairActivity.this, new BackgroundService.InstanceCallback() {
             @Override
             public void onServiceStart(BackgroundService service) {
+                device = service.getDevice(deviceId);
+                if (device == null) return;
                 device.addPairingCallback(pairingCallback);
             }
         });

src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java

@@ -19,13 +19,18 @@ import java.util.Set;
 
 public class SettingsActivity extends PreferenceActivity {
 
+    static private String deviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set.
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(this);
         setPreferenceScreen(preferenceScreen);
 
-        final String deviceId = getIntent().getStringExtra("deviceId");
+        if (getIntent().hasExtra("deviceId")) {
+            deviceId = getIntent().getStringExtra("deviceId");
+        }
+
         BackgroundService.RunCommand(getApplicationContext(), new BackgroundService.InstanceCallback() {
             @Override
             public void onServiceStart(BackgroundService service) {

src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java

@@ -204,7 +204,7 @@ public class ShareToReceiver extends ActionBarActivity {
                     String path = cursor.getString(column_index);
                     np.set("filename", Uri.parse(path).getLastPathSegment());
                     np.set("size", (int)new File(path).length());
-                } catch(Exception _) {
+                } catch(Exception unused) {
 
                     Log.e("ShareToReceiver", "Could not resolve media to a file, trying to get info as media");
 

src/main/res/menu/menu_mousepad.xml

@@ -2,6 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
 
+    <item android:id="@+id/menu_show_keyboard"
+        android:title="@string/show_keyboard"
+        android:icon="@drawable/ic_action_keyboard"
+        kdeconnect:showAsAction="ifRoom" />
+
     <item android:id="@+id/menu_right_click"
         android:title="@string/right_click"
         kdeconnect:showAsAction="never" />
@@ -10,7 +15,4 @@ xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
         android:title="@string/middle_click"
         kdeconnect:showAsAction="never" />
 
-    <item android:id="@+id/menu_show_keyboard"
-        android:title="@string/show_keyboard"
-        kdeconnect:showAsAction="never" />
 </menu>

src/main/res/values-pl/strings.xml

@@ -85,6 +85,12 @@
   <string name="shareplugin_text_saved">Otrzymano tekst, zapisano do schowka</string>
   <string name="share_notification_preference">Hałaśliwe powiadomienia</string>
   <string name="share_notification_preference_summary">Zadrżyj i odegraj dźwięk przy odebraniu pliku</string>
+  <string name="sftp_internal_storage">"Pamięć wewnętrzna "</string>
+  <string name="sftp_all_files">Wszystkie pliki</string>
+  <string name="sftp_sdcard_num">Karta SD %d</string>
+  <string name="sftp_sdcard">Karta SD</string>
+  <string name="sftp_readonly">(tylko do odczytu)</string>
+  <string name="sftp_camera">Zdjęcia z aparatu</string>
   <string-array name="mpris_time_entries">
     <item>10 sekund</item>
     <item>20 sekund</item>