adding-retrys #4

pi · 2025-11-11T01:52:54+01:00

pi commented

2025-11-11 01:52:54 +01:00

added editable retries and correct error handleing

pi changed target branch from master to child-monitor-multiple-clients

2025-11-11 01:54:56 +01:00

pi added 246 commits 2025-11-11 01:54:56 +01:00

Initial commit 8b1b1a7414

Add StartActivity - landing page of baby monitor 7bd19f2325

The StartActivity is the first activity which will be launched
in the baby monitor, and in the future will list the two main
options: become a monitor or a listener.

Add MonitorActivity - for registering on network and sending audio 11bf3822b6

This commit adds the shell of the MonitorActivity. This activity
will register its service on the local network, wait for a connection,
then send audio data.

Register ProtectBabyMonitor service via mDNS 716d82dc1c

When the MonitorActivity is started it will create a ServerSocket.
The assigned port is then advertised over mDNS for a
"ProtectBabyMonitor" service.

Eventually, when something connects to the ServerSocket audio
data will be streamed out.

Stub for servicing connection to ProtectBabyMonitor service 7819c31275

If a client connects to the advertised ProtectBabyMonitor service,
attempt to service the connection.

For now, simply close the connection instead of sending data.

Stream audio data to connected clients 828e6a16f6

While connected, send packets of audio data to connected clients.

Set the TCP send buffer size to avoid buffering audio 4635a78574

If the send buffer size is large and the receiver is unable
to keep up, then audio samples will collect on the monitor
and lag will accumulate. As only the most recent sample is
important, reduce the send buffer size to the minimum
AudioRecord buffer size.

Add DiscoverActivity - lists of baby monitors on the network eb9cd75c3a

This is the stub of the DiscoverActivity, which is responsible for
discovering all available ProtectBabyMonitor services on the
local network.

Discover ProtectBabyMonitor service providers on the network 8d448d0ecc

Attempt to discover any providers of the ProtectBabyMonitor
service on the local network, resolving any which are found.
For now nothing is done with the information on found
providers.

Populate list with ProtectBabyMonitor providers 1f7f6f04fe

Add ListenActivity for playing audio from ProtectBabyMonitor services 2e164c0fb2

This activity will eventually receive audio from the MonitorActivity
of another Android device and play it.

Allow launch of ListenActivity from found ProtectBabyMonitor service 00049d4b2f

If any ProtectBabyMonitor services are found on the network, clicking
on one will start a ListenActivity with information on the service.

Receive audio from ProtectBabyMonitor, discarding it 936410e851

When connected to a ProtectBabyMonitor service, accept
audio over the network. However, for now, discard the audio
instead of playing it.

Add AudioPlayer thread for playing audio samples from a queue 8bcfe2af67

This thread will be used for playing audio samples. The samples
will be provided by a blocking queue.

It is assumed that the configuration of the passed AudioTrack and
the samples from the blocking queue are compatible.

Pass received audio samples to the AudioPlayer for processing 6901745d5b

Whenever a sample is received from the socket, pass it to
the AudioPlayer thread via a blocking queue. The AudioPlayer
thread will then play the sample and wait for more input.

Update README.md c962228e86

Change terminology to child and parent devices f2a13c9160

The "monitor" and "connect to monitor" descriptions may
have been confusing. Changing the terminology to refer to
a child and parent device.

Update app name to Protect Baby Monitor 21b59fde84

Simply StartActivity to two buttons 592c55c156

Simplify MonitorActivity to only list relevant text in tables b1a0044fda

Mention name of connected device on ListenActivity eac8bfeed6

Change app launcher icon to a camera 7273e4231f

Use Holo theme 429c3005a9

Improve start activity layout with LinearLayout and helper text eb1eac8111

Improve monitor activity with LinearLayout and helper text ea29a0f4eb

Improve layout of dicover activity with Linear Layout dd737c0be5

Replace \\032 in reported service name with " " 72d5c75357

When mDNS returns the service name, any spaces are replaced
with \\032. Change this back into a space

Use buttons to list available child devices c455e966cd

It may not have been obvious that the labels were clickable before.

Improve listen activity layout with Linear Layout 2e9ca0de88

Use Travis CI to build project 9eaf90fcda

Merge pull request #1 from brarcher/staging 133baf9a48

Improve layout and appearance of application

Allow volume control to adjust playback volume 516ba5a225

The AudioTrack for playing audio from the child device
was sending audio to the voice call stream. It is more
appropriate to use the music stream. In addition, suggest
that the activity control the music stream's volume with
the hardware controls.

Prevent child device from sleeping if listening 7f604c47ce

If the screen turns off, the child device will be unable to
record from the microphone. Keep the screen on in the monitor
activity to keep microphone on.

Prevent screen rotation or resize from destroying activities 6af9dff004

If the screen is rotated by default Android destroys the
activity and recreates it. This causes issues if a child and
parent are already paired, as the connection is lost.

To prevent Android from destroying the Activity, instead
invoke a configuration change on an orientation or resize.

Merge pull request #2 from brarcher/staging 14118499fa

Improve usability - volume control, survive screen rotation, screen stays on

Create wrapper function for unregistering baby monitor service 0c45351c5a

This will eventually be called in multiple places

Cleanup AudioRecord if socket throws an exception 375242d6fb

Previously an IOException would prevent the AudioRecord
from being cleaned up.

Allow child device to establish new connection after parent disconnects c25b0fdeba

Previously the monitor activity would only support one connection,
after which the activity would need to be restarted. With this change,
if a connection is established with a parent device but is eventually
disconnected the child device will begin advertising again.

Note that because the child device can only support one connection
at a time currently, after the connection is established it will
now stop advertising. When a connection is lost and advertising
starts again, it may end up advertising as another service. E.g.
  ProtectBabyMonitor (2)
instead of
  ProtectBabyMonitor

improve logging for service discovery 6dd26b70fe

Only post message if connection to child was lost 0d829708c7

If the connection to the child was intentionally severed, do not
post a "disconnected" message, as the activity is likely closing.

Play audio alert if child is disconnected e35126096f

If the child device disconnects unexpectedly, alert the
user, in case they were not expecting the disconnect.

The audio file being played is originally from here:
https://freesound.org/people/pan14/sounds/263655/

Explicitly list some methods private cfddbf22c1

These methods are not needed outside of this class

Remove unused import cb4c48d5fb

Update README.md, removing some improvements which are complete c022fa8168

Merge pull request #3 from brarcher/staging 8f5b0cc4d2

Better recovery from connection disconnects

Create NEWS 039cf0447d

Merge pull request #4 from brarcher/add-news f1c34274c5

Create NEWS

Update versionName to be 0.1 for initial release 68d9c69a01

Merge pull request #5 from brarcher/update-versionName 0f99fec0eb

Update versionName to be 0.1 for initial release

Use a ListView to store discovered child devices a4f8adf7a5

The previous approach was to list buttons in a TableLayout.
However, this approach does not work well if there are more
items than can fit on the screen.

To allow scrolling of items, and also a better presentation
of said items, use a ListView.

Merge branch 'master' into use-list-view ec9d22301e

Merge pull request #6 from brarcher/use-list-view 07892afea1

Use a ListView to store discovered child devices

simplify playback of audio without AudioPlayer bd2726370f

The additional thread to feed the AudioTrack was unnecessary.
Because the AudioTrack API is blocking when data is written,
and internally it buffers data, writing the data as soon
as it is received from the network leads to better playback
performance. It is also much simpler.

Increase TCP send buffer size to the minimum audio buffer size f49e6be777

The original buffer sized used was 1/2 what was intended.

Change variables which never should change to 'final' f2007e1693

Use byteBufferSize instead of bufferSize*2 b361d56539

byteBufferSize is already defined to be bufferSize*2

Replace \032 in a service name with " " 1603ff11bb

Some implementations of mDNS on Android display a space as
  \\032
and some display it as
  \032

Attempt to convert both types to a " " before displaying it

Merge pull request #7 from brarcher/improve-audio d2528f0f79

Improve audio

Added Japanese translation 378ecd7fe8

Create AUTHORS file aa336c4cdb

Merge pull request #9 from brarcher/authors-file 2ad4780557

Create AUTHORS file

Update NEWS 800439457b

Merge pull request #10 from brarcher/update-news 7f9023d281

Update NEWS

Use camel case for variable name fddb8ceede

Display IP Address and port of child device 7cb2138d13

Later, the parent will be able to use this information to pair
with the child device, as an alternative to using mDNS

Initial attempt at pairing with child device with address/port 562a2bb164

On some networks or some mDNS implementations child discovery may not
work well. As an alternative, allow a parent to connect to a device
directly with an IP Address and port.

Allow parent device to pair to child via IP Address and port c032e9f642

If mDNS fails to locate the child device, allow the parent device
to enter an IP address and port to connect.

Merge pull request #11 from brarcher/enter-address d5ee75a143

Allow parent to enter child's address and port to connect

Merge remote-tracking branch 'upstream/master' 7d9ad919be

Updated Japanese translation 057ec17e28

Merge pull request #8 from naofum/master c4333c59fd

Added Japanese translation

Mention Japanese translations in NEWS d1e0c60be1

prepare for release e7681624cf

Merge pull request #12 from brarcher/release 51b56fd59c

Prepare 0.2 release

Correct source of app icon in README.md 871ce134f1

The source of the app icon was Icons4Android. Mentioning WPZOOM instead was a typo.

Merge pull request #13 from brarcher/correct-icon-location ac7f1aa855

Correct source of app icon in README.md

Improvements to README.md 781c8143df

Merge pull request #15 from brarcher/readme 149c137271

Improvements to README.md

README: add Transifex info d6d230ec77

Merge pull request #17 from brarcher/readme ffee8003f0

README: add Transifex info

Convert project from ant to gradle 3a63c45015

Merge pull request #21 from brarcher/gradle e3540e4ab7

Convert project from ant to gradle

Change TAG field to be static 4d3360b04e

Add support for running FindBugs c88fc677ac

Merge pull request #22 from brarcher/findbugs 90ef44977d

Add support for FindBugs

Reduce min SDK to 16 fd7fa95c7d

It turns out that the min SDK the application will support is
16, as the NsdManager is available only at SDK 16 and above.

Remove usage of listPreferredItemPaddingStart/End 80fcd4d44e

These are only available in SDK 17

Add paddingLeft/Right 9ba6a9434a

This is to support SDK 16 and below

Merge pull request #23 from brarcher/min-sdk 585abee4ef

Reduce min SDK to 16

Updated README with SDK 16 0322cd1ae4

Merge pull request #24 from johanehnberg/master b022b27f46

Updated README with SDK 16

Upgrade gradle to 3.0.1 (current android-studio version) 38dd1e6664

Add google maven repository, to allow importing compatibility libs

Add notification icon for listening and disconnected events 0009c3bbdd

TODO: Change icon color/details for connected vs. disconnected status

Fix a leak in the wifiManager usage in Android version smaller than N 053cf34ea2

Update the SDK version to match the version in gradle.

Update travis to use Android tools 26.0.2 51dc915512

Fix comments from pull-request review e19f1cc09a

Cosmetics 64db907c2b

Merge pull request #26 from shacharr/master e4debe7dd8

Implement Persistent Notification

Update for v0.3 a9d36258fa

The version name and code were not brought over
from the AndroidManafest.xml file. Previously they
were for v0.2.

Merge pull request #27 from brarcher/pre-v0.3 8e8fdc6bec

Update for v0.3

Add privacy policy 86bc8195d8

Merge pull request #28 from brarcher/privacy-policy d84b27adc8

Add privacy policy

Use white icon for notifications 388b9b378f

Set ongoing status for notifications 043c26481a

remove unnecessary Runnable in onCreate() 1c64b15c00

onCreate is already running on the UI thread, no need
to create a separate runnable.

Merge pull request #30 from brarcher/notification 859d402db6

Notification updates

Create CONTRIBUTING.md 45456ce18e

Merge pull request #31 from brarcher/contributing d2f96e364a

Create CONTRIBUTING.md

Workaround install crash on Android 5 and below 3e321d6049

The aapt2 tool, new to Android Studio 3, creates an APK which fails
to install on Android 5 and below if it contains the following bug:

  https://issuetracker.google.com/issues/64434571

Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting
the bug.

Merge pull request #32 from brarcher/install-crash-workaround 17792c2a69

Workaround install crash on Android 5 and below

Add German translations 75c065fd23

Translations contributed by Alexander Muro on Transifex

Merge pull request #34 from brarcher/german 2c9d02019d

Add German translations

Remove unused settings menu e1c44ca66a

The settings menu was present in the Child Device view, but
did not do anything when selected.

Merge pull request #36 from brarcher/settings 618c674477

Remove unused settings menu

Add Transifex config file 5b7e87b877

Update translations 25caeb3fa4

Merge pull request #38 from brarcher/transifex a123b1d09a

Transifex config file and translation updates

Add Dutch translations e7b4330d9c

Merge pull request #39 from brarcher/transifex f6bc4824b7

Add Dutch translations

Update privacy policy cdac5f4fa1

Merge pull request #40 from brarcher/privacy 34829bf9e3

Update privacy policy

Update translation instructions in README cab3916e06

Merge pull request #44 from brarcher/readme 7ff065149d

Update translation instructions in README

Mention hiatus in README 1f69082ca5

Merge pull request #48 from brarcher/brarcher-readme 92bfb5db5f

Mention hiatus in README

Update gradle config and fix minSdkVersion problems in manifest 816f4554bb

First prototype for volume visualization 3991687565

Reduce volume indicator flickering when volume is low cb067be24c

Statically listen on port 10000 d124158ad3

Visualize volume over time 1848126888

Close serverSocket more reliably a4c6d39265

Fix first y coordinate in volume graph 4ab2b83eb5

Initialize member vars in onCreate 8c8e711f3b

Reduce member variable visibility 1f36cb7938

Check for audio recording permissions before opening MonitorActivity 471e4ead82

Smarter relative volume computation 10f2d0a253

Change project name to "Child Monitor" d0ed6c1bba

Change Icon 8045151603

Change Icon f79d1a487f

Remove acknowledgement to app icons da87a67e37

Add acknowledgement to brarcher 9b5857e2c8

List all listening network interfaces b2df26e13b

Replace icon e81c5692a2

Add metadata for f-droid in fastlane folder structure b662391db5

Add German translation to fastlane folder structure f07230bced

Move metadata from fdroid to fastlane structure 086a999738

ptbr translation dda00cfbe3

string in ptbr

Merge pull request #3 from ghost/master 40fd35c20e

ptbr translation

Fix service discovery on android 12 6ceda0b022

Remember last entered child device address & port 7bd4416193

Update gradle 27bbfc73b7

v0.5 4a79fa637a

add gradle distribution checksum aacadfd689

upgrade gradle 0fc379c25b

Add AudioCompression (ulaw) 9ec30c33da

Enforce client disconnect when closing monitoring view 5d2fd1fba8

Update dependency type compile -> implementation a52bebc8ab

optimize imports d1e7c1b239

Fix another crash and some reformatting f98526b4fb

Set port field by default b8c78797e4

Reduce sampling frequency to 8000 Hz db032437dd

Fix some warnings 1625d50359

Reenable build errors on lintFailure 4571b06b23

Remove redundant article in license text 3d0cf2444c

Reenable build failure on lintErrors 9d052fae2f

Upgrade gradle 37b21ad495

Add hint regarding version incompatibility eaeec23986

v1.1 b61a6f5ba8

Prevent inserting duplicate entries into child device list f27e30f524

Adopt settings from Android Studio b339602184

It doesn't change any functionality, only the format and
settings according to the recommendations of Android Studio

Split out ListenService and VolumeHistory f6a429e545

This moves the model of the historic volume to its own class (VolumeHistory),
and extracts the listening out of the ListenActivity to the ListenService.

Avoid synchronized by scheduling writes on the main event loop a9f5b233e6

Get last length elements, not first 7fd7451700

Store child device name as member var that can be queried later 5b0ccaa8a1

Fix notification click handler 7359716c09

Fix volume monitor scrolling 0ae2ca4a65

Taking snapshots of volume view no longer needed 703406b517

Delete unused method e95a554717

Fix possible NullPointerExceptions 43a7a66caa

Remove unused entry from strings.xml 8a75044153

Post error message from Listening Thread d7e6ba2b5a

Fix ArrayIndexOutOfBoundsException 6b6458b04b

Merge pull request #9 from fwiesel/foreground-service f01aaaf196

Move listening to ListenService

Add missing license headers 8e754557fa

Make paint member final c9c4cdc282

Make all license comments non-javadoc 3be08d09f0

Fix inappropriate canvas.getHeight/Width 2190ef1c94

Remove member var name m prefixes 6edc59236a

Reduce TAG visibility 2818384c6e

Use more arbitrary ID f412e43e02

Fix possible NullPointerException 7473fffa8a

Merge branch 'master' into feature/listen-service 1ac22e872b

Split-off MonitorService 523ee93d75

Same motivation as for the parent device:
The monitor activity will be quickly destroyed,
unless it is connected to a foreground service.

By moving the thread and audio listener to a service,
this should be avoided.

Only log the exception when unexpected 77c8456d45

The socket is closed in another thread to stop the transmission.
That causes an exception, but that is the expected behaviour, so
do not log it.

Minor fixup in MonitorService.java 1077b2e527

Minor fixup MonitorActivity.java 30a0c26826

More specific log message in ListenActivity.java 9526f23c0c

Merge pull request #10 from fwiesel/foreground-service-child 946de1d65b

Move Monitor Mode for Child to its own Service

WIP: Modernize the Stack Kotlin Edition cd6c4b60a6

v1.2 775cea84a4

Merge branch 'master' into kotlin 9101c01af6

Move kotlin files into its own directory 2d57b16226

G711UCodec: Drop unused function getSampleCount cf790b330b

G711UCodec move cod out of inner run() b8025b2300

Change AudioCodecDefines to simple object 029e82941e

Use foojay-resolver and set all java version to 21 dee59d4735

G711UCode: Rename variable to avoid shadowing 5d17453c14

Unused arguments and unnessecary null checks c5b542a333

Move DiscoverActivity constant to companion object fa6e4da2c5

Use ?.let instead if-null-test, avoid runnable 58095bc67b

Move service name to constructor c6c60d9dbd

Wrap java exceptions in runCatching blocks 41506bc601

Use lateinit for notificationManager and nsdManager 32235302c6

Added comment about modifications d7ac99665d

Changed G711UCodec license comment b9964d24d2

Various style fixes f5aa9da84c

Missing closing brace 03b7aff579

Remove unnessary unit from function eba51360c1

Made volumeHistory public 282753854f

Use try-catch where appropriate ea8357bb3c

Missed to log the exception be2b9084cb

Removed public modifier 019c5e6e9f

Undo refactoring in ListenService a784eed506

ListenService: Wrap Socket in a Result 3588622bd2

This way we can handle the IOException in the same place
as in the java version, without throwing passing unchecked exceptions

Merge pull request #12 from fwiesel/kotlin 4bc2b0f8a7

Modernize the Stack Kotlin Edition

Refactor error handling in ListenService 1018ded2d9

Fix wrong success state upon reading zero bytes b874584cf7

Set socket timeout to properly detect when remote end loses network connection 72830e020e

v1.3 33a7a82a6a

Normalize volume for brightness 4200a19378

Undo an unintentional change done in f6a429e.
The brightness was calculated from the normalized volume, but when factoring
the norm out in the history, that norm was dropped.

Remove setters, and rename callbacks for onSomething 1305eca655

- Setters are rather java-esque, and ...
- callbacks in the Android ecosystem are usually more
  called on&lt;EventName&gt; than &lt;EventName&gt;Callback.

Merge pull request #14 from fwiesel/less_setters 4d9c805b96

Remove setters, and rename callbacks for onSomething

Merge pull request #13 from fwiesel/normalize_relative_brightness 9c8e0b881f

Normalize volume for brightness

More tolerant socket timeout ebe395fc8f

v1.4 01f357a985

Update CONTRIBUTING.md 79165dfe5e

No more translations please

Delete unsupported .tx/config 6baa9eb203

Merge pull request #27 from yurtpage/rm_tx 06d793fe16

Delete unsupported .tx/config for Transifex

Add VPN hint to README.md a08967059b

klappt mit multiplen vom originalen child monitor 46cf690ba3

now correct "streaming" notice adafa6279a

3 retys added frst attempt cb7e9ac8ac

play alert at the end + english comments 62f44a1654

added retries and fixxed status update 130906a6b0

corrected version number 453e265963

Merge remote-tracking branch 'child-monitor-multiple-clients/adding-retrys' into adding-retrys 3073f03323

pi closed this pull request

2025-11-11 01:56:58 +01:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pi/babyphone#4