Trishia 4 роки тому
батько
коміт
5a568c52b2

+ 1 - 1
app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion '29.0.2'
     defaultConfig {
         applicationId "org.iotivity.bridge.homeserver"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 26
         versionCode 2
         versionName "1.0"

+ 0 - 4
app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     package="org.iotivity.bridge.homeserver">
 
     <uses-feature android:name="android.hardware.nfc" />
-
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -15,7 +14,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.NFC" />
-
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
@@ -31,7 +29,6 @@
             android:screenOrientation="fullSensor">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -42,7 +39,6 @@
             </intent-filter>
         </service>
 
-        <!--<receiver android:name=".AlarmReceiver" />-->
         <receiver android:name=".BootCompletedReceiver" android:exported="false" android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />

+ 0 - 15
app/src/main/java/org/iotivity/bridge/homeserver/BridgeServerActivity.java

@@ -301,21 +301,6 @@ public class BridgeServerActivity extends AppCompatActivity {
         }
     };
 
-    /*private static final int BUMP_MSG = 1;
-
-    private Handler mHandler = new Handler() {
-        @Override public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case BUMP_MSG:
-                    msg("Received from service: " + msg.arg1);
-                    break;
-                default:
-                    super.handleMessage(msg);
-            }
-        }
-
-    };
-*/
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.actionbar_actions, menu) ;

+ 2 - 3
app/src/main/java/org/iotivity/bridge/homeserver/BridgeService.java

@@ -870,8 +870,7 @@ public class BridgeService extends IntentService {
                     Log.d(TAG, "DeviceDiscovery ScheduledTask per 90sec was called.");
                 }
             }
-        }, 10, 90, TimeUnit.SECONDS); //90 sec interval after 10sec delay
-
+        }, 10, 90, TimeUnit.SECONDS); // 90 sec interval after 10sec delay
     }
 
     public void stopScheduledTaskForPairwised() {
@@ -897,7 +896,7 @@ public class BridgeService extends IntentService {
                 discoverAllLightControlDevices();
                 doGetLightControlResources();
             }
-        }, 30, 180, TimeUnit.SECONDS); // 30sec interval after 30sec delay
+        }, 30, 180, TimeUnit.SECONDS); // 180sec interval after 30sec delay
 
     }
 

+ 0 - 5
app/src/main/java/org/iotivity/bridge/homeserver/handler/BridgeInitHandler.java

@@ -44,11 +44,6 @@ public class BridgeInitHandler implements OCMainInitHandler {
         if (ret >= 0) {
             // Create the devices and add them to the platform
             ret = OCBridge.addBridgeDevice(bridge.getName(), "ocf.2.0.5", "ocf.res.1.3.0,ocf.sh.1.3.0");
-            /*, new OCAddDeviceHandler() {
-                        public void handler() {
-                            Log.d(TAG, "inside OcBridge.OCAddDeviceHandler.handler()");
-                        }
-                    });*/
         } else {
             Log.e(TAG, "Error in platformInit, return value = " + ret);
         }

+ 0 - 6
app/src/main/java/org/iotivity/bridge/homeserver/handler/FactoryPresetsHandler.java

@@ -29,14 +29,8 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
     public void handler(long deviceIndex) {
         Log.d(TAG, "inside the FactoryPresetsHandler, deviceIndex  = " + deviceIndex);
 
-        // TODO : when attempting to add an identity certificate chain, could not parse identity cert's private key
         setPKISecurityMfgCert(deviceIndex);
 
-        /*
-        boolean isMfgCertSupport = true;
-        if (isMfgCertSupport && deviceIndex != 0)
-            return; // TODO : Only Bridge will use pki certs in this case
-        */
     }
 
     private void setPKISecurityMfgCert(long deviceIndex) {