Browse Source

exit button was added and setting certificates in factory reset was removed.

Trishia 4 years ago
parent
commit
27207f63ed

+ 2 - 2
OnBoardingTool/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "org.iotivity.onboardingtool"
         applicationId "org.iotivity.onboardingtool"
         minSdkVersion 23
         minSdkVersion 23
         targetSdkVersion 26
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     }
     buildTypes {
     buildTypes {

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


+ 1 - 1
OnBoardingTool/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         android:theme="@style/AppTheme">
         android:theme="@style/AppTheme">
         <activity
         <activity
             android:name=".OnBoardingActivity"
             android:name=".OnBoardingActivity"
-            android:screenOrientation="portrait">
+            android:screenOrientation="fullSensor">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MAIN" />
 
 

+ 3 - 7
OnBoardingTool/app/src/main/java/org/iotivity/onboardingtool/FactoryPresetsHandler.java

@@ -25,15 +25,11 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
     public void handler(long deviceIndex) {
     public void handler(long deviceIndex) {
         Log.d(TAG, "inside the FactoryPresetsHandler, deviceIndex  = " + deviceIndex);
         Log.d(TAG, "inside the FactoryPresetsHandler, deviceIndex  = " + deviceIndex);
 
 
-        // Shutdown and re-init instance
-        if (activity.getObt() != null) {
-            activity.getObt().shutdown();
-        }
         activity.ownedDeviceList.clear();
         activity.ownedDeviceList.clear();
         activity.unownedDeviceList.clear();
         activity.unownedDeviceList.clear();
         activity.setObt(new OcObt());
         activity.setObt(new OcObt());
 
 
-        setPKISecurityMfgCert(deviceIndex);
+        //TODO : setPKISecurityMfgCert(deviceIndex);
     }
     }
 
 
     private void setPKISecurityMfgCert(long deviceIndex) {
     private void setPKISecurityMfgCert(long deviceIndex) {
@@ -89,7 +85,7 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             return;
             return;
         }
         }
 
 
-        /*// load Root CA 2
+        // load Root CA 2
         byte[] rootCa2 = getFileBytes("pki_certs/rootca2.pem");
         byte[] rootCa2 = getFileBytes("pki_certs/rootca2.pem");
         if (rootCa2 == null) {
         if (rootCa2 == null) {
             Log.e(TAG, "Failed to read root ca2 certificate");
             Log.e(TAG, "Failed to read root ca2 certificate");
@@ -103,7 +99,7 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             Log.e(TAG, "Error installing root ca2 certificate");
             Log.e(TAG, "Error installing root ca2 certificate");
             return;
             return;
         }
         }
-        */
+
         // load Root CA 3
         // load Root CA 3
         byte[] rootCa3 = getFileBytes("pki_certs/rootca3.pem");
         byte[] rootCa3 = getFileBytes("pki_certs/rootca3.pem");
         if (rootCa3 == null) {
         if (rootCa3 == null) {

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

@@ -216,11 +216,11 @@ public class OnBoardingActivity extends AppCompatActivity {
                     public void onClick(DialogInterface dialog, int which) {
                     public void onClick(DialogInterface dialog, int which) {
                         obtPlatform.reset();
                         obtPlatform.reset();
                         obt.shutdown();
                         obt.shutdown();
+                        obt = null ;
                         ownedDeviceList.clear();
                         ownedDeviceList.clear();
                         ownedArrayAdapter.notifyDataSetChanged();
                         ownedArrayAdapter.notifyDataSetChanged();
                         unownedDeviceList.clear();
                         unownedDeviceList.clear();
                         unownedArrayAdapter.notifyDataSetChanged();
                         unownedArrayAdapter.notifyDataSetChanged();
-                        //obt = new OcObt();
                     }
                     }
                 });
                 });
 
 
@@ -234,6 +234,8 @@ public class OnBoardingActivity extends AppCompatActivity {
                 resetObtDialog.show();
                 resetObtDialog.show();
                 return true;
                 return true;
             }
             }
+            case R.id.action_exit :
+                onBackPressed();
             default:
             default:
                 return super.onOptionsItemSelected(item);
                 return super.onOptionsItemSelected(item);
         }
         }

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


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


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


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


+ 6 - 0
OnBoardingTool/app/src/main/res/menu/actionbar_actions.xml

@@ -29,4 +29,10 @@
         android:icon="@drawable/ic_search_white_48dp"
         android:icon="@drawable/ic_search_white_48dp"
         android:title="Search"
         android:title="Search"
         app:showAsAction="ifRoom"/>-->
         app:showAsAction="ifRoom"/>-->
+
+    <item
+        android:id="@+id/action_exit"
+        android:icon="@android:drawable/ic_lock_power_off"
+        android:title="Exit"
+        app:showAsAction="ifRoom"/>
 </menu>
 </menu>