Merge pull request #322 from Intermodalics/release/v1.2

Release/v1.2
Intermodalics · Jun 20, 2017 · 6f75838 · 6f75838
2 parents 6206c4d + 35df499
commit 6f75838
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/TangoRosStreamer/app/src/main/AndroidManifest.xml b/TangoRosStreamer/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="eu.intermodalics.tango_ros_streamer"
-    android:versionCode="20"
-    android:versionName="1.1.1">
+    android:versionCode="21"
+    android:versionName="1.2.0">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

diff --git a/...mer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java b/...mer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java
@@ -209,6 +209,7 @@ public void run() {
                             new View.OnClickListener() {
                                 @Override
                                 public void onClick(View view) {
+                                    mRunLocalMaster = mSharedPref.getBoolean(getString(R.string.pref_master_is_local_key), false);
                                     mMasterUri = mSharedPref.getString(getString(R.string.pref_master_uri_key),
                                             getResources().getString(R.string.pref_master_uri_default));
                                     mUriTextView.setText(mMasterUri);
@@ -721,7 +722,7 @@ public void onShutdown(NodeMainExecutorService nodeMainExecutorService) {
             // e.g. 'http://android-c90553518bc67cf5:1131'.
             // Instead of showing this to the user, we show the IP address of the device,
             // which is also correct and less confusing.
-            WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+            WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
             String deviceIP = Formatter.formatIpAddress(wifiManager.getConnectionInfo().getIpAddress());
             mUriTextView = (TextView) findViewById(R.id.master_uri);
             mUriTextView.setText("http://" + deviceIP + ":11311");

diff --git a/TangoRosStreamer/package.xml b/TangoRosStreamer/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>tango_ros_streamer</name>
-  <version>1.1.1</version>
+  <version>1.2.0</version>
   <description>This package wraps Tango Ros Streamer application</description>
 
   <maintainer email="ruben@intermodalics.eu">Ruben Smits</maintainer>