[IOT-2306] Direct pairing removed from provisioning java sample
authorsaurabh.s9 <saurabh.s9@samsung.com>
Fri, 19 May 2017 08:37:28 +0000 (14:07 +0530)
committerRandeep Singh <randeep.s@samsung.com>
Fri, 19 May 2017 12:18:54 +0000 (12:18 +0000)
Change-Id: I91d58d4f015cb12d114d995afbbe4e60649cf8c7
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20107
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
java/examples-android/provisioningclient/src/main/java/org/iotivity/base/examples/provisioningclient/ProvisioningClient.java

index 26b446e..f39558c 100644 (file)
@@ -348,27 +348,7 @@ OcSecureResource.DoOwnershipTransferListener, OcSecureResource.ProvisionPairwise
 
 
     private void doDPProvisioning() {
-        try {
-            logMessage(TAG + "Provision direct pairing for " + ownedDeviceList.get(0).getDeviceID());
-            newSecureResource = ownedDeviceList.get(0);
-            String pin = "00000000";
-            List<OcPrmType> prmTypes = new ArrayList<OcPrmType>();
-            prmTypes.add(OcPrmType.DP_PRE_CONFIGURED);
-            boolean edp = true;
-            List<String> resources = new ArrayList<String>();
-            List<String> periods = new ArrayList<String>();
-            List<String> recurrences = new ArrayList<String>();
-            resources.add(StringConstants.DEFAULT_RESOURCES);
-            OicSecPdAcl pdAcl = new OicSecPdAcl(recurrences, periods,
-                    StringConstants.DEFAULT_PERMISSION, resources);
-            OicSecPdAcl[] oicSecPdAcls = new OicSecPdAcl[1];
-            oicSecPdAcls[0] = pdAcl;
-            newSecureResource.doProvisionDirectPairing(pin, oicSecPdAcls, prmTypes, edp,
-                    provisionDPListener);
-        } catch (Exception e) {
-            logMessage(TAG + "Direct Pairing Provisioning error: " + e.getMessage());
-            Log.e(TAG, e.getMessage());
-        }
+        new GetLinkedDevicesAsyncTask().execute();
     }
 
 
@@ -873,11 +853,6 @@ OcSecureResource.DoOwnershipTransferListener, OcSecureResource.ProvisionPairwise
 
         @Override
             protected void onPostExecute(String s) {
-
-
-                if (ownedDeviceList.size() == 1 && "success".equals(s)) {
-                    doDPProvisioning();
-                }
                 if (ownedDeviceList.size() > 1 && "success".equals(s)) {
                     doPairwiseProvisioning();
                 }