Major update for Android runtime support and camera devices. #116

koush · 2020-11-27T09:01:24Z

Pull Request Checklist

Please confirm that you've done the following when opening a new pull request:

[X ] For fixes and other improvements, please reference the GitHub issue that your change addresses.
[X ] For fixes, optimizations and new features, please add an entry to the CHANGES.md file.
[X ] Run mvn compile before committing, so that the auto-code formatter will format your changes consistently with the rest of the project.

koush · 2020-11-27T09:02:39Z

I had forked this repository a couple years ago and never contributed back. I basically hand picked all my changes�/fixes and cleaned them up to apply them to this repo (which had a large refactor and package rename).

I'll leave comments inline.

Note that this just exposes the camera services, configurations, and makes it easy to respond with camera snapshots (just a byte array of a jpeg). It's up to the implementer to parse the TLV and actually manage the setupEndpoints and selectedRTP characteristic setters. I use FFMPEG, similar to Homebridge.

koush · 2020-11-28T07:07:07Z

Unclear why travis is failing. I think the gradle wrapper is correct and working properly on a clean checkout from my machine.

koush · 2020-11-28T07:09:02Z

Fixes this. #117

yfre · 2020-12-08T22:55:22Z

@koush thank you for PRs.
it has many very good things, e.g.

upgrade of bouncycastle which we have tried several times without success (see Support Bouncycastle's BC-Prov 1.60 #80)
camere support
async http request handling
android support

maybe you could it split in several PRs so that it is easier to review and easier to get CI working

koush · 2020-12-09T21:14:55Z

I doubt I'll have the time to break this up into separate changes, as I had to basically implement it as one big patch to simply get everything working again (due to the package rename). The old cherry picks are for the pre-rename code.

I think the reason CI is failing is because it detects the build.gradle which is necessary for compiling+debugging on android. I think deleting that file would fix the CI. The CI needs to ignore it. It may be possible to delete it, but then Android would not compile. the mvn built jars should work on Android too though.

The patch is fairly non-intrusive and actually not that large. The majority of the files are the gradle wrapper and the various data types for video (which are unused anyways).

gjvanderheiden · 2020-12-11T08:29:15Z

I agree this could use a split up.

BouncyCastle could be updated to 1.67, with a small modification
if (!Arrays.constantTimeAreEqual(calculatedMAC, receivedMAC)) {
throw new TlsFatalAlert(AlertDescription.bad_record_mac);
}
TlsFatalAlert could be converted into IOException, because TlsFatalAlert doesn't exist anymore in .67. TlsFatalAlert is just an IOException, no biggie.

I also was a bit surprised there is no TLV object in HAP-java. You introduced it, but now it isn't used in the server packages.
So it is a really nice addition and should be exploited in the server package with some extra methods (getState(), getMethod() etc).

gjvanderheiden · 2020-12-16T10:50:12Z

Could you maybe rename the gradle file for now, so that the build doesn't fail?

gjvanderheiden · 2020-12-16T11:00:31Z

src/main/java/io/github/hapjava/characteristics/impl/base/BaseCharacteristic.java

@@ -113,7 +113,7 @@ public BaseCharacteristic(
                      .add("type", shortType)
                      .add("perms", perms.build())
                      .add("format", format)
-                      .add("ev", false)
+                      //                      .add("ev", false)


Was it your intention to comment this out? Looks like a rather common piece of code.

gjvanderheiden · 2020-12-16T11:00:55Z

pom.xml

@@ -101,19 +101,19 @@
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>srp6a</artifactId>
-			<version>1.5.2</version>
+			<version>2.0.2</version>


2.1.0 is the newest

gjvanderheiden · 2020-12-16T11:01:07Z

pom.xml

 		</dependency>

 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.51</version>
+			<version>1.60</version>


1.67 is the newest

gjvanderheiden · 2020-12-16T11:04:00Z

README.md

@@ -32,7 +32,7 @@ Current implementation fully supports 37 HomeKit accessory/services.
 |  Air Quality Sensor               |     :white_check_mark:    |
 |  Audio Stream Management          |     :x:                   |
 |  Battery Service                  |     :white_check_mark:    |
-|  Camera RTP Stream Management     |     :x:                   |
+|  Camera RTP Stream Management     |      :white_check_mark:   |


needs update from hap-java/hap-java

And this text needs update:
Current implementation fully supports 37 HomeKit accessory/services.

gjvanderheiden · 2020-12-16T11:10:36Z

CHANGES.md

@@ -27,3 +27,5 @@
 * Occupancy sensor support [#59](https://github.com/hap-java/HAP-Java/pull/59)
 * Leak sensors and valve support added [#52](https://github.com/hap-java/HAP-Java/pull/52)
 * Notifications are batched now, when possible [#66](https://github.com/hap-java/HAP-Java/pull/66)
+# Android Support
+# Camera Support


should be an asterisk instead of a hash

gjvanderheiden · 2020-12-16T11:10:38Z

CHANGES.md

@@ -27,3 +27,5 @@
 * Occupancy sensor support [#59](https://github.com/hap-java/HAP-Java/pull/59)
 * Leak sensors and valve support added [#52](https://github.com/hap-java/HAP-Java/pull/52)
 * Notifications are batched now, when possible [#66](https://github.com/hap-java/HAP-Java/pull/66)
+# Android Support


should be an asterisk instead of a hash

gjvanderheiden · 2020-12-16T11:13:43Z

src/main/java/io/github/hapjava/server/impl/crypto/ChachaEncoder.java

-    // NOTE: The BC implementation puts 'r' after 'k'
-    System.arraycopy(firstBlock, 0, firstBlock, 32, 16);
-    KeyParameter macKey = new KeyParameter(firstBlock, 16, 32);
+    // NOTE: The older BC implementation puts 'r' after 'k'0


Is this comment still applicable?

gjvanderheiden · 2020-12-16T11:14:01Z

src/main/java/io/github/hapjava/server/impl/crypto/ChachaDecoder.java

-    // NOTE: The BC implementation puts 'r' after 'k'
-    System.arraycopy(firstBlock, 0, firstBlock, 32, 16);
-    KeyParameter macKey = new KeyParameter(firstBlock, 16, 32);
+    // NOTE: The older BC implementation puts 'r' after 'k'


is this comment still applicable?

gjvanderheiden · 2020-12-16T16:11:48Z

src/main/java/io/github/hapjava/server/impl/json/AccessoryController.java

-          .write(Json.createObjectBuilder().add("accessories", accessories).build());
+      JsonWriter writer = Json.createWriter(baos);
+      writer.write(Json.createObjectBuilder().add("accessories", accessories).build());
+      writer.close();


JsonWriter is an AutoClosable, makes more sense to use the try block:

try {(ByteArrayOutputStream baos = new ByteArrayOutputStream();
JsonWriter writer = Json.createWriter(baos))

gjvanderheiden · 2020-12-16T16:11:58Z

src/main/java/io/github/hapjava/server/impl/json/CharacteristicsController.java

+      JsonWriter writer = Json.createWriter(baos);
+      writer.write(
+          Json.createObjectBuilder().add("characteristics", characteristics.build()).build());
+      writer.close();


JsonWriter is an AutoClosable, makes more sense to use the try block:

try {(ByteArrayOutputStream baos = new ByteArrayOutputStream();
JsonWriter writer = Json.createWriter(baos))

koush force-pushed the master branch 15 times, most recently from 09897d5 to 879c9d1 Compare November 28, 2020 07:01

koush force-pushed the master branch 5 times, most recently from 58feab6 to 66d0b75 Compare December 2, 2020 19:08

Major update for Android runtime support and camera devices.

4c96051

koush force-pushed the master branch from 66d0b75 to 4c96051 Compare December 9, 2020 21:12

koush closed this Dec 9, 2020

koush reopened this Dec 9, 2020

gjvanderheiden reviewed Dec 16, 2020

View reviewed changes

gjvanderheiden mentioned this pull request Dec 23, 2020

update crypto libs and json #130

Closed

andylintner mentioned this pull request May 8, 2021

When matching, "OSStatus 200500" error is returned #144

Open

gradle

3488437

This was referenced Nov 18, 2021

close JsonWriters #148

Closed

Close JsonWriters. Caused speed up? #149

Closed

yfre mentioned this pull request Jan 27, 2022

project still alive? new maintainers needed? #153

Closed

koush closed this Mar 25, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Major update for Android runtime support and camera devices. #116

Major update for Android runtime support and camera devices. #116

koush commented Nov 27, 2020

koush commented Nov 27, 2020 •

edited

Loading

koush commented Nov 28, 2020

koush commented Nov 28, 2020

yfre commented Dec 8, 2020

koush commented Dec 9, 2020

gjvanderheiden commented Dec 11, 2020

gjvanderheiden commented Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

gjvanderheiden Dec 16, 2020

Major update for Android runtime support and camera devices. #116

Major update for Android runtime support and camera devices. #116

Conversation

koush commented Nov 27, 2020

Pull Request Checklist

koush commented Nov 27, 2020 • edited Loading

koush commented Nov 28, 2020

koush commented Nov 28, 2020

yfre commented Dec 8, 2020

koush commented Dec 9, 2020

gjvanderheiden commented Dec 11, 2020

gjvanderheiden commented Dec 16, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koush commented Nov 27, 2020 •

edited

Loading