From ba4751012fb3dd440fb292a3a4a3dae3228eb4cc Mon Sep 17 00:00:00 2001
From: lankamadan <lanka.madan@samsung.com>
Date: Mon, 7 Mar 2016 13:46:53 +0900
Subject: [PATCH] [Mediator] Removed hard-coded Secure Flag from android
 application

Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5441
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 815da513484596845e08fb0ac80346930b662343)

Change-Id: Ifa96ff1d2a2a3e11a2916755495af2c32106d79e
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
---
 .../src/main/java/org/iotivity/service/easysetup/MainActivity.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
index 3735dc3..b11876e 100755
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
@@ -84,6 +84,7 @@ public class MainActivity extends Activity {
 
     private static final int BUFFER_SIZE = 1024;
     private String filePath = "";
+    private boolean isSecurityEnabled = false;
     //create platform config
     PlatformConfig cfg;
 
@@ -234,7 +235,7 @@ public class MainActivity extends Activity {
             @Override
             public void onClick(View v) {
                 filePath = getFilesDir().getPath() + "/";
-
+                isSecurityEnabled = true;
                 //copy json when application runs first time
                 SharedPreferences wmbPreference = PreferenceManager.getDefaultSharedPreferences
                         (getApplicationContext());
@@ -382,7 +383,7 @@ public class MainActivity extends Activity {
 
                         mWiFiProvConfig = new WiFiProvConfig(mEnrollerSsid,
                                 mEnrollerPassword);
-                        mWiFiProvConfig.setSecured(true);
+                        mWiFiProvConfig.setSecured(isSecurityEnabled);
                         mDevice = mDeviceFactory
                                 .newEnrolleeDevice(mWiFiProvConfig);
                             Thread thread = new Thread() {
@@ -405,7 +406,7 @@ public class MainActivity extends Activity {
 
                         mWiFiProvConfig = new WiFiProvConfig(mEnrollerSsid,
                                 mEnrollerPassword);
-                        mWiFiProvConfig.setSecured(true);
+                        mWiFiProvConfig.setSecured(isSecurityEnabled);
                         mWiFiOnBoardingConfig = new WiFiOnBoardingConfig();
 
                         /*
-- 
2.7.4