Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[amazonechocontrol] Add support for announcement on echo show and echo spot and some other small features #5590

Merged
merged 29 commits into from
Jul 4, 2019
Merged

[amazonechocontrol] Add support for announcement on echo show and echo spot and some other small features #5590

merged 29 commits into from
Jul 4, 2019

Conversation

mgeramb
Copy link
Member

@mgeramb mgeramb commented May 11, 2019 •
edited
Loading

Add support for anncounment on echo show and echo spot
Add Apple music and iHeart music provider
Add customer id to info page
Introduce new concept for channel handling in a more object oriented way

Michael Geramb added 5 commits May 11, 2019 13:12
[amazonechocontrol]
7c839a7 
Fix json parsing
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
28cf64d 
Add announcement, Fix problem with bad request calls
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
b8f8eed 
Remove beta tag
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
7e6c789 
Add apple music and iHeartRadio id
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
3b0fdcb 
Add apple music and iHeartRadio id
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
@mgeramb mgeramb changed the title [amazonechocontrol] Add support for announcement on echo show and echo spot [amazonechocontrol] Add support for announcement on echo show and echo spot and some other small features May 11, 2019
Michael Geramb added 10 commits May 12, 2019 08:19
[amazonechocontrol]
35154c1 
Improve error handling
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
f41a5ad 
Improved Error Handling
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
e6638cc 
Remove unused Exception
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
94494da 
Remove unused Exception
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
b427723 
Improved Error Handling
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
7410059 
Add more debug info
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
f484f36 
Add more debug info
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)

Signed-off-by: Michael Geramb <mail@michael-geramb.at>
Merge branch 'master' of https://github.com/openhab/openhab2-addons
d75261f
[amazonechocontrol]
254aad5 
Fix spoken text to multiple devices
Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
d29879e 
Merge master and FixSpokenTextToMultipleDevices
Signed-off-by: Michael Geramb <mail@michael-geramb.at>
martinvw
martinvw reviewed May 17, 2019
View reviewed changes
Copy link
Member

@martinvw martinvw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR! I added some comments

...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Outdated Show resolved Hide resolved
...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Outdated Show resolved Hide resolved
...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Outdated Show resolved Hide resolved
...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Outdated Show resolved Hide resolved
...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Outdated Show resolved Hide resolved
...rg/openhab/binding/amazonechocontrol/internal/channelhandler/ChannelHandlerAnnouncement.java Outdated Show resolved Hide resolved
...ontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java Outdated Show resolved Hide resolved
bundles/org.openhab.binding.amazonechocontrol/src/main/resources/ESH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
Michael Geramb added 10 commits May 20, 2019 20:00
[amazonechocontrol]
2454181 
Use diamond operator
Handle new line at the file end
Fix string compare
Add comment to version handling of deserialization
Signed-off-by: Michael Geramb <mail@michael-geramb.at>
Merge branch 'master' of https://github.com/openhab/openhab2-addons
eef3b2e
[amazonechocontrol]
b915b22 
merge master
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
decfd06 
Merge master
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
8b54c9f 
Use diamond operator
Handle new line at the file end
Fix string compare
Add comment to version handling of deserialization
Signed-off-by: Michael Geramb <mail@michael-geramb.at>
[amazonechocontrol]
215862c 
Remove hashtable
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
bb67800 
Merge master
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
e16f490 
Change tryGetBootstrap
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
ffe59b3 
Fix build error
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
9f8d88a 
Correct formatting
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
@wborn wborn added the enhancement An enhancement or new feature for an existing add-on label May 24, 2019
@martinvw martinvw requested a review from a team May 29, 2019 18:45
[amazonechocontrol]
88fba7e 
Sleep removed
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
@mgeramb mgeramb requested a review from martinvw June 22, 2019 11:49
@mgeramb
Copy link
Member Author

mgeramb commented Jun 22, 2019

What is missing here for a merge?

martinvw
martinvw reviewed Jun 23, 2019
View reviewed changes
Copy link
Member

@martinvw martinvw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to look into @J-N-K comment, its a fair point and gson instances can be shared easily, if there is a reason not to plese mention, this could also be improved later in another PR if really needed.

I also added two minor comments, nothing critical there.

...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Show resolved Hide resolved
...azonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java Show resolved Hide resolved
Michael Geramb added 3 commits June 23, 2019 13:02
[amazonechocontrol]
f89296a 
Single Gson instance
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
b71d8f8 
Add final
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
[amazonechocontrol]
56924a4 
Fix formatting and add trace
Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
@mgeramb mgeramb added this to the 2.5 milestone Jun 23, 2019
@mgeramb
Copy link
Member Author

mgeramb commented Jul 3, 2019

@martinvw I have already done all changes including the suggestion @J-N-K to share the Gson.
Can we do the merge now or is there anything open?

@J-N-K
Copy link
Member

J-N-K commented Jul 3, 2019

@mgeramb, can you follow the instructions at „Details“ under DCO? You miss some sign-offs.

@martinvw
Copy link
Member

martinvw commented Jul 4, 2019

@mgeramb, can you follow the instructions at „Details“ under DCO? You miss some sign-offs.

I see them all there, maybe some of the commits where made with another email or its about the merge commits?

@martinvw martinvw merged commit b761a62 into openhab:master Jul 4, 2019
@martinvw
Copy link
Member

martinvw commented Jul 4, 2019

@martinvw I have already done all changes including the suggestion @J-N-K to share the Gson.
Can we do the merge now or is there anything open?

Sorry I forgot about you 😭

sprehn pushed a commit to sprehn/openhab-addons that referenced this pull request Aug 21, 2019
@sprehn
[amazonechocontrol] Add support for announcement on echo show and ech…
bb16ba3 
…o spot and some other small features (openhab#5590)

Add apple music and iHeartRadio id

Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
ne0h pushed a commit to ne0h/openhab-addons that referenced this pull request Sep 15, 2019
@ne0h
[amazonechocontrol] Add support for announcement on echo show and ech…
ba193f2 
…o spot and some other small features (openhab#5590)

Add apple music and iHeartRadio id

Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Signed-off-by: Maximilian Hess <mail@ne0h.de>
@mgeramb mgeramb deleted the Announcement branch October 16, 2019 18:10
Pshatsillo pushed a commit to Pshatsillo/openhab-addons that referenced this pull request Dec 8, 2019
@Pshatsillo
[amazonechocontrol] Add support for announcement on echo show and ech…
624a767 
…o spot and some other small features (openhab#5590)

Add apple music and iHeartRadio id

Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
tmrobert8 pushed a commit to tmrobert8/openhab-addons that referenced this pull request Jan 21, 2020
@tmrobert8
[amazonechocontrol] Add support for announcement on echo show and ech…
3042226 
…o spot and some other small features (openhab#5590)

Add apple music and iHeartRadio id

Signed-off-by: Michael Geramb <mail@michael-geramb.at> (github: mgeramb)
Signed-off-by: Tim Roberts <timmarkroberts@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvw martinvw martinvw left review comments

@J-N-K J-N-K J-N-K left review comments

@davidgraeff davidgraeff davidgraeff approved these changes

Assignees
No one assigned
Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Milestone
2.5
Development

Successfully merging this pull request may close these issues.
5 participants
@mgeramb @J-N-K @martinvw @davidgraeff @wborn