sdremote: LibreOffice Remote for Impress version 2.1.3sdremote-2.1.3

fixes crash on startup with nullpointer exception

Change-Id: Iacc35f4aa80cdae4ad4362c7d9d6e9be4e3359e3

3 files changed, 10 insertions, 10 deletions

diff --git a/android/sdremote/build.gradle b/android/sdremote/build.gradle
index 6d2aad2..e26cdee 100644
--- a/android/sdremote/build.gradle
+++ b/android/sdremote/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0-rc1'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 
diff --git a/android/sdremote/mobile/build.gradle b/android/sdremote/mobile/build.gradle
index 54ce412..98da42d 100644
--- a/android/sdremote/mobile/build.gradle
+++ b/android/sdremote/mobile/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "org.libreoffice.impressremote"
         minSdkVersion 9
         targetSdkVersion 20
-        versionCode 12
-        versionName "2.1.2"
+        versionCode 13
+        versionName "2.1.3"
     }
 
     lintOptions {
@@ -18,6 +18,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.2'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.android.support:support-v4:20.0.0'
+    compile 'com.android.support:appcompat-v7:20.0.0'
 }
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
index 103b771..9f9696d 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -130,14 +130,14 @@ public class ComputersActivity extends ActionBarActivity implements ActionBar.Ta
     @Override
     public boolean onPrepareOptionsMenu(Menu aMenu) {
         aMenu.findItem(R.id.menu_add_computer)
-            .setVisible(getSupportActionBar().getSelectedTab().equals(wifiTab));
+            .setVisible(wifiTab.equals(getSupportActionBar().getSelectedTab()));
 
         MenuItem btDiscovery = aMenu.findItem(R.id.menu_start_discovery);
         if( btAdapter != null && btAdapter.isDiscovering()) {
             btDiscovery.setEnabled(false);
             MenuItemCompat.setActionView(btDiscovery, R.layout.progress);
         }
-        btDiscovery.setVisible(getSupportActionBar().getSelectedTab().equals(btTab));
+        btDiscovery.setVisible(btTab.equals(getSupportActionBar().getSelectedTab()));
 
         return super.onPrepareOptionsMenu(aMenu);
     }
@@ -174,8 +174,8 @@ public class ComputersActivity extends ActionBarActivity implements ActionBar.Ta
 
         SharedPreferences sharedPref = getPreferences(Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sharedPref.edit();
-        editor.putBoolean(SELECT_BLUETOOTH, getSupportActionBar()
-                .getSelectedTab().equals(btTab));
+        editor.putBoolean(SELECT_BLUETOOTH, btTab.equals(getSupportActionBar()
+                .getSelectedTab()));
         editor.commit();
     }