Android Shape: Fix possible memory leaks

Fixe as per https://developer.android.com/reference/android/content/ContextWrapper#getApplicationContext()

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java
index 557482de86fc4dcffbc4b5b7430902d090eee2d8..8a13a3904faa08e90df40ecf27feba7df9ebc40b 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java
@@ -104,7 +104,7 @@ public class PublisherActivity extends Activity {
                SHAPE_HEIGHT = (int) (this.getWindowManager().getDefaultDisplay().getHeight() * 45 / BoxType.DESTINATION_HEIGHT);
                
                // From Robot_Demo project.
-               wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+               wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
                wifiLock = (WifiLock) wifiManager.createWifiLock((
                                        (android.os.Build.VERSION.SDK_INT >= 12)
                                        ? WifiManager.WIFI_MODE_FULL_HIGH_PERF

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java
index 0478f4d852ead0bbc8ddb8ac275453e2691d333d..adf735c95027b78673181038cad0545e18c07fe6 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java
@@ -45,7 +45,7 @@ public class SettingsActivity extends PreferenceActivity
                super.onCreate(savedInstanceState);
                addPreferencesFromResource(R.layout.activity_settings);
                
-               WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+               WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
                EditTextPreference pref = (EditTextPreference) findPreference("prefManagers");
 
                //TODO should be done in respect to @strings