Browse Source

OBT OwnedDevice menu was changed.

Trishia 4 years ago
parent
commit
de9aaac100

+ 1 - 1
OnBoardingTool/app/libs/.gitignore

@@ -1,3 +1,3 @@
-*.jar
+
 *.so
 

BIN
OnBoardingTool/app/libs/iotivity-lite.jar


+ 4 - 4
OnBoardingTool/app/src/main/java/org/iotivity/onboardingtool/OnBoardingActivity.java

@@ -637,7 +637,7 @@ public class OnBoardingActivity extends AppCompatActivity {
                                     }).start();
                                     break;
 
-                                case 6: // Provision role RW access to NCRs
+                                case 7: // Provision role RW access to NCRs
                                     AlertDialog.Builder roleDialogBuilder = new AlertDialog.Builder(OnBoardingActivity.this);
 
                                     LinearLayout layout = new LinearLayout(OnBoardingActivity.this);
@@ -717,7 +717,7 @@ public class OnBoardingActivity extends AppCompatActivity {
                                     roleDialog.show();
                                     break;
 
-                                case 7: // Provision identity certificate
+                                case 8: // Provision identity certificate
                                     AlertDialog.Builder idCertDialogBuilder = new AlertDialog.Builder(OnBoardingActivity.this);
                                     idCertDialogBuilder.setTitle(uuid);
                                     idCertDialogBuilder.setMessage(getResources().getStringArray(R.array.ownedDeviceActions)[which]);
@@ -751,12 +751,12 @@ public class OnBoardingActivity extends AppCompatActivity {
                                     idCertDialog.show();
                                     break;
 
-                                case 8: // Provision role certificate
+                                case 9: // Provision role certificate
                                     RoleCertificateHelper roleCertificateHelper = new RoleCertificateHelper(OnBoardingActivity.this, obt, uuid, new ProvisionRoleCertificateHandler(OnBoardingActivity.this));
                                     roleCertificateHelper.getRoles(null); // calls provisionRoleCertificate()
                                     break;
 
-                                case 9: // Reset Device
+                                case 6: // Reset Device
                                     AlertDialog.Builder resetDialogBuilder = new AlertDialog.Builder(OnBoardingActivity.this);
                                     resetDialogBuilder.setTitle(uuid);
                                     resetDialogBuilder.setMessage(getResources().getStringArray(R.array.ownedDeviceActions)[which]);

BIN
OnBoardingTool/app/src/main/jniLibs/arm64-v8a/libiotivity-lite-jni.so


BIN
OnBoardingTool/app/src/main/jniLibs/x86/libiotivity-lite-jni.so


+ 2 - 2
OnBoardingTool/app/src/main/res/values/strings.xml

@@ -56,9 +56,9 @@
         <item>Provision auth-crypt RW access to NCRs</item>
         <item>Retrieve /oic/sec/cred</item>
         <item>Retrieve /oic/sec/acl2</item>
-        <item>Provision role RW access to NCRs</item>
+        <!--<item>Provision role RW access to NCRs</item>
         <item>Provision identity certificate</item>
-        <item>Provision role certificate</item>
+        <item>Provision role certificate</item>-->
         <item>Reset device (Hard Reset)</item>
     </string-array>
     <string-array name="wildcardOptions">