mirror of
https://github.com/markqvist/Sideband.git
synced 2025-04-19 07:05:50 -04:00
Compare commits
No commits in common. "main" and "1.4.0" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,7 +6,6 @@ sbapp/bin
|
||||
sbapp/app_storage
|
||||
sbapp/RNS
|
||||
sbapp/LXMF
|
||||
sbapp/LXST
|
||||
sbapp/precompiled
|
||||
sbapp/*.DS_Store
|
||||
sbapp/*.pyc
|
||||
|
||||
78
README.md
78
README.md
@ -1,7 +1,7 @@
|
||||
Sideband <img align="right" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg"/>
|
||||
=========
|
||||
|
||||
Sideband is an extensible LXMF messaging and LXST telephony client, situational awareness tracker and remote control and monitoring system for Android, Linux, macOS and Windows. It allows you to communicate with other people or LXMF-compatible systems over Reticulum networks using LoRa, Packet Radio, WiFi, I2P, Encrypted QR Paper Messages, or anything else Reticulum supports.
|
||||
Sideband is an extensible LXMF messaging client, situational awareness tracker and remote control and monitoring system for Android, Linux, macOS and Windows. It allows you to communicate with other people or LXMF-compatible systems over Reticulum networks using LoRa, Packet Radio, WiFi, I2P, Encrypted QR Paper Messages, or anything else Reticulum supports.
|
||||
|
||||
|
||||
|
||||
@ -13,11 +13,10 @@ This also means that Sideband operates differently than what you might be used t
|
||||
|
||||
Sideband provides many useful and interesting functions, such as:
|
||||
|
||||
- **Secure** and **self-sovereign** messaging and voice calls using the LXMF and LXST protocols over Reticulum.
|
||||
- **Secure** and **self-sovereign** messaging using the LXMF protocol over Reticulum.
|
||||
- **Image** and **file transfers** over all supported mediums.
|
||||
- **Audio messages** that work even over **LoRa** and **radio links**, thanks to [Codec2](https://github.com/drowe67/codec2/) and [Opus](https://github.com/xiph/opus) encoding.
|
||||
- Secure and direct P2P **telemetry and location sharing**. No third parties or servers ever have your data.
|
||||
- The telemetry system is **completely extensible** via [simple plugins](#creating-plugins).
|
||||
- Situation display on both online and **locally stored offline maps**.
|
||||
- Geospatial awareness calculations.
|
||||
- Exchanging messages through **encrypted QR-codes on paper**, or through messages embedded directly in **lxm://** links.
|
||||
@ -40,7 +39,7 @@ Sideband can run on most computing devices, but installation methods vary by dev
|
||||
|
||||
## On Android
|
||||
|
||||
For your Android devices, you can download an [APK on the latest release page](https://github.com/markqvist/Sideband/releases/latest).
|
||||
For your Android devices, you can install Sideband through F-Droid, by adding the [Between the Borders Repo](https://reticulum.betweentheborders.com/fdroid/repo/), or you can download an [APK on the latest release page](https://github.com/markqvist/Sideband/releases/latest). Both sources are signed with the same release keys, and can be used interchangably.
|
||||
|
||||
After the application is installed on your Android device, it is also possible to pull updates directly through the **Repository** section of the application.
|
||||
|
||||
@ -48,8 +47,9 @@ After the application is installed on your Android device, it is also possible t
|
||||
|
||||
On all Linux-based operating systems, Sideband is available as a `pipx`/`pip` package. This installation method **includes desktop integration**, so that Sideband will show up in your applications menu and launchers. Below are install steps for the most common recent Linux distros. For Debian 11, see the end of this section.
|
||||
|
||||
#### Basic Installation
|
||||
You will first need to install a few dependencies for voice calls, audio messaging and Codec2 support to work:
|
||||
**Please note!** The very latest Python release, Python 3.13 is currently **not** compatible with the Kivy framework, that Sideband uses to render its user interface. If your Linux distribution uses Python 3.13 as its default Python installation, you will need to install an earlier version as well. Using [the latest release of Python 3.12](https://www.python.org/downloads/release/python-3127/) is recommended.
|
||||
|
||||
You will first need to install a few dependencies for audio messaging and Codec2 support to work:
|
||||
|
||||
```bash
|
||||
# For Debian (12+), Ubuntu (22.04+) and derivatives
|
||||
@ -68,6 +68,10 @@ Once those are installed, install the Sideband application itself:
|
||||
```bash
|
||||
# Finally, install Sideband using pipx:
|
||||
pipx install sbapp
|
||||
|
||||
# If you need to specify a specific Python version,
|
||||
# use something like the following:
|
||||
pipx install sbapp --python python3.12
|
||||
```
|
||||
|
||||
After installation, you can now run Sideband in a number of different ways:
|
||||
@ -80,10 +84,7 @@ After installation, you can now run Sideband in a number of different ways:
|
||||
pipx ensurepath
|
||||
|
||||
# The first time you run Sideband, you will need to do it
|
||||
# from the terminal, for the application launcher item to
|
||||
# show up. On some distros you may also need to log out
|
||||
# and back in again, or simply reboot the machine for the
|
||||
# application entry to show up in your menu.
|
||||
# from the terminal:
|
||||
sideband
|
||||
|
||||
# At the first launch, it will add an application icon
|
||||
@ -100,9 +101,6 @@ sideband --daemon
|
||||
sideband -v
|
||||
```
|
||||
|
||||
If you do not already have Reticulum connectivity set up on your computer or local network, you will probably want to edit the Reticulum configuration file at `~/.reticulum/config` and [add any interfaces](https://reticulum.network/manual/interfaces.html) you need for connectivity.
|
||||
|
||||
#### Advanced Installation
|
||||
You can also install Sideband in various alternative ways:
|
||||
|
||||
```bash
|
||||
@ -137,17 +135,17 @@ You can install Sideband on all Raspberry Pi models that support 64-bit operatin
|
||||
|
||||
Aditionally, the `pycodec2` package needs to be installed manually. I have provided a pre-built version, that you can download and install with a single command, or if you don't want to trust my pre-built version, you can [build and install it from source yourself](https://github.com/gregorias/pycodec2/blob/main/DEV.md).
|
||||
|
||||
The install instructions below assume that you are installing Sideband on 64-bit Raspberry Pi OS (based on Debian Bookworm or later). If you're running something else on your Pi, you might need to modify some commands slightly. To install Sideband on Raspberry Pi with full support for voice calls, audio messages and Codec2, follow these steps:
|
||||
The install instructions below assume that you are installing Sideband on 64-bit Raspberry Pi OS (based on Debian Bookworm). If you're running something else on your Pi, you might need to modify some commands slightly. To install Sideband on Raspberry Pi, follow these steps:
|
||||
|
||||
```bash
|
||||
# First of all, install the required dependencies:
|
||||
sudo apt install python3-pip python3-pyaudio python3-dev python3-cryptography build-essential libopusfile0 libsdl2-dev libavcodec-dev libavdevice-dev libavfilter-dev portaudio19-dev codec2 libcodec2-1.0 xclip xsel
|
||||
|
||||
# If you don't want to compile pycodec2 yourself,
|
||||
# download the pre-compiled package provided here:
|
||||
# download the pre-compiled package provided here
|
||||
wget https://raw.githubusercontent.com/markqvist/Sideband/main/docs/utilities/pycodec2-3.0.1-cp311-cp311-linux_aarch64.whl
|
||||
|
||||
# And install it:
|
||||
# Install it:
|
||||
pip install ./pycodec2-3.0.1-cp311-cp311-linux_aarch64.whl --break-system-packages
|
||||
|
||||
# You can now install Sideband
|
||||
@ -161,8 +159,6 @@ sudo reboot
|
||||
sideband
|
||||
```
|
||||
|
||||
If you do not already have Reticulum connectivity set up on your computer or local network, you will probably want to edit the Reticulum configuration file at `~/.reticulum/config` and [add any interfaces](https://reticulum.network/manual/interfaces.html) you need for connectivity.
|
||||
|
||||
## On macOS
|
||||
|
||||
To install Sideband on macOS, you have two options available:
|
||||
@ -189,8 +185,6 @@ pip3 install rns --break-system-packages
|
||||
|
||||
If you do not have Python and `pip` available, [download and install it](https://www.python.org/downloads/) first.
|
||||
|
||||
If you do not already have Reticulum connectivity set up on your computer or local network, you will probably want to edit the Reticulum configuration file at `~/.reticulum/config` and [add any interfaces](https://reticulum.network/manual/interfaces.html) you need for connectivity.
|
||||
|
||||
#### Source Package Install
|
||||
|
||||
For more advanced setups, including the ability to run Sideband in headless daemon mode, enable debug logging output, configuration import and export and more, you may want to install it from the source package via `pip` instead.
|
||||
@ -244,8 +238,6 @@ Simply download the packaged Windows ZIP file from the [latest release page](htt
|
||||
|
||||
When running Sideband for the first time, a default Reticulum configuration file will be created, if you don't already have one. If you don't have any existing Reticulum connectivity available locally, you may want to edit the file, located at `C:\Users\USERNAME\.reticulum\config` and manually add an interface that provides connectivity to a wider network. If you just want to connect over the Internet, you can add one of the public hubs on the [Reticulum Testnet](https://reticulum.network/connect.html).
|
||||
|
||||
#### Installing Reticulum Utilities
|
||||
|
||||
Though the ZIP file contains everything necessary to run Sideband, it is also recommended to install the Reticulum command line utilities separately, so that you can use commands like `rnstatus` and `rnsd` from the command line. This will make it easier to manage Reticulum connectivity on your system. If you do not already have Python installed on your system, [download and install it](https://www.python.org/downloads/) first.
|
||||
|
||||
**Important!** When asked by the installer, make sure to add the Python program to your `PATH` environment variables. If you don't do this, you will not be able to use the `pip` installer, or run any of the installed commands. When Python has been installed, you can open a command prompt and install the Reticulum package via `pip`:
|
||||
@ -270,28 +262,6 @@ The Sideband application can now be launched by running the command `sideband` i
|
||||
|
||||
Since this installation method automatically installs the `rns` and `lxmf` packages as well, you will also have access to using all the included RNS and LXMF utilities like `rnstatus`, `rnsd` and `lxmd` on your system.
|
||||
|
||||
# Creating Plugins
|
||||
|
||||
Sideband features a flexible and extensible plugin system, that allows you to hook all kinds of control, status reporting, command execution and telemetry collection into the LXMF messaging system. Plugins can be created as either *Telemetry*, *Command* or *Service* plugins, for different use-cases.
|
||||
|
||||
To create plugins for Sideband, you can find a variety of [code examples](https://github.com/markqvist/Sideband/tree/main/docs/example_plugins) in this repository, that you can use as a basis for writing your own plugins. The example plugins include:
|
||||
|
||||
- [Custom telemetry](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/telemetry.py)
|
||||
- [Getting BME280 temperature, humidity and pressure](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/bme280_telemetry.py)
|
||||
- [Basic commands](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/basic.py)
|
||||
- [Location telemetry from GPSd on Linux](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/gpsd_location.py)
|
||||
- [Location telemetry from Windows Location Provider](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/windows_location.py)
|
||||
- [Getting statistics from your LXMF propagation node](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/lxmd_telemetry.py)
|
||||
- [Viewing cameras and streams](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/view.py)
|
||||
- [Fetching an XKCD comic](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/comic.py)
|
||||
- [Creating a service plugin](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/service.py)
|
||||
|
||||
For creating telemetry plugins, Sideband includes 20+ built-in sensor types to chose from, for representing all kinds telemetry data. If none of those fit your needs, there is a `Custom` sensor type, that can include any kind of data.
|
||||
|
||||
Command plugins allow you to define any kind of action or command to be run when receiving command messages from other LXMF clients. In the example directory, you will find various command plugin templates, for example for viewing security cameras or webcams through Sideband.
|
||||
|
||||
Service plugins allow you to integrate any kind of service, bridge or other system into Sideband, and have that react to events or state changes in Sideband itself.
|
||||
|
||||
# Paper Messaging Example
|
||||
|
||||
You can try out the paper messaging functionality by using the following QR-code. It is a paper message sent to the LXMF address `6b3362bd2c1dbf87b66a85f79a8d8c75`. To be able to decrypt and read the message, you will need to import the following base32-encoded Reticulum Identity into the app:
|
||||
@ -327,6 +297,26 @@ You can help support the continued development of open, free and private communi
|
||||
|
||||
<br/>
|
||||
|
||||
# Planned Features
|
||||
|
||||
- <s>Secure and private location and telemetry sharing</s>
|
||||
- <s>Including images in messages</s>
|
||||
- <s>Sending file attachments</s>
|
||||
- <s>Offline and online maps</s>
|
||||
- <s>Paper messages</s>
|
||||
- <s>Using Sideband as a Reticulum Transport Instance</s>
|
||||
- <s>Encryption keys export and import</s>
|
||||
- <s>Plugin support for commands, services and telemetry</s>
|
||||
- <s>Sending voice messages (using Codec2 and Opus)</s>
|
||||
- <s>Adding a Linux desktop integration</s>
|
||||
- <s>Adding prebuilt Windows binaries to the releases</s>
|
||||
- <s>Adding prebuilt macOS binaries to the releases</s>
|
||||
- <s>A debug log viewer</s>
|
||||
- Adding a Nomad Net page browser
|
||||
- LXMF sneakernet functionality
|
||||
- Network visualisation and test tools
|
||||
- Better message sorting mechanism
|
||||
|
||||
# License
|
||||
Unless otherwise noted, this work is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License][cc-by-nc-sa].
|
||||
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
# This plugin provides temperature, humidity
|
||||
# and pressure data via a BME280 sensor
|
||||
# connected over I2C. The plugin requires
|
||||
# the "smbus2" and "RPi.bme280" modules to
|
||||
# be available on your system. These can be
|
||||
# installed with:
|
||||
#
|
||||
# pip install smbus2 RPi.bme280
|
||||
|
||||
import os
|
||||
import RNS
|
||||
from importlib.util import find_spec
|
||||
|
||||
class BME280Plugin(SidebandTelemetryPlugin):
|
||||
plugin_name = "telemetry_bme280"
|
||||
|
||||
I2C_ADDRESS = 0x76
|
||||
I2C_BUS = 1
|
||||
|
||||
# If your BME280 has an offset from the true
|
||||
# temperature, you can compensate for this
|
||||
# by modifying this parameter.
|
||||
TEMPERATURE_CORRECTION = 0.0
|
||||
|
||||
def start(self):
|
||||
RNS.log("BME280 telemetry plugin starting...")
|
||||
|
||||
if find_spec("smbus2"): import smbus2
|
||||
else: raise OSError(f"No smbus2 module available, cannot start BME280 telemetry plugin")
|
||||
|
||||
if find_spec("bme280"): import bme280
|
||||
else: raise OSError(f"No bme280 module available, cannot start BME280 telemetry plugin")
|
||||
|
||||
self.sensor_connected = False
|
||||
|
||||
try:
|
||||
self.bme280 = bme280
|
||||
self.address = self.I2C_ADDRESS
|
||||
self.bus = smbus2.SMBus(self.I2C_BUS)
|
||||
self.calibration = self.bme280.load_calibration_params(self.bus, self.address)
|
||||
self.sensor_connected = True
|
||||
self.tc = self.TEMPERATURE_CORRECTION
|
||||
|
||||
except Exception as e:
|
||||
RNS.log(f"Could not connect to I2C device while starting BME280 telemetry plugin", RNS.LOG_ERROR)
|
||||
RNS.log(f"The contained exception was: {e}", RNS.LOG_ERROR)
|
||||
|
||||
super().start()
|
||||
|
||||
def stop(self):
|
||||
self.bus.close()
|
||||
super().stop()
|
||||
|
||||
def update_telemetry(self, telemeter):
|
||||
if telemeter != None:
|
||||
if self.sensor_connected:
|
||||
try:
|
||||
sample = self.bme280.sample(self.bus, self.address, self.calibration); ts = telemeter.sensors
|
||||
telemeter.synthesize("temperature"); ts["temperature"].data = {"c": round(sample.temperature+self.tc,1)}
|
||||
telemeter.synthesize("humidity"); ts["humidity"].data = {"percent_relative": round(sample.humidity,1)}
|
||||
telemeter.synthesize("pressure"); ts["pressure"].data = {"mbar": round(sample.pressure,1)}
|
||||
|
||||
except Exception as e:
|
||||
RNS.log("An error occurred while updating BME280 sensor data", RNS.LOG_ERROR)
|
||||
RNS.log(f"The contained exception was: {e}", RNS.LOG_ERROR)
|
||||
|
||||
plugin_class = BME280Plugin
|
||||
@ -1,88 +0,0 @@
|
||||
# Windows Location Provider plugin example, provided by @haplo-dev
|
||||
|
||||
import RNS
|
||||
import time
|
||||
import threading
|
||||
import asyncio
|
||||
from winsdk.windows.devices import geolocation
|
||||
|
||||
class WindowsLocationPlugin(SidebandTelemetryPlugin):
|
||||
plugin_name = "windows_location"
|
||||
|
||||
def __init__(self, sideband_core):
|
||||
self.update_interval = 5.0
|
||||
self.should_run = False
|
||||
|
||||
self.latitude = None
|
||||
self.longitude = None
|
||||
self.altitude = None
|
||||
self.speed = None
|
||||
self.bearing = None
|
||||
self.accuracy = None
|
||||
self.last_update = None
|
||||
|
||||
super().__init__(sideband_core)
|
||||
|
||||
def start(self):
|
||||
RNS.log("Starting Windows Location provider plugin...")
|
||||
|
||||
self.should_run = True
|
||||
update_thread = threading.Thread(target=self.update_job, daemon=True)
|
||||
update_thread.start()
|
||||
|
||||
super().start()
|
||||
|
||||
def stop(self):
|
||||
self.should_run = False
|
||||
super().stop()
|
||||
|
||||
def update_job(self):
|
||||
while self.should_run:
|
||||
RNS.log("Updating location from Windows Geolocation...", RNS.LOG_DEBUG)
|
||||
try:
|
||||
asyncio.run(self.get_location())
|
||||
except Exception as e:
|
||||
RNS.log(f"Error getting location: {str(e)}", RNS.LOG_ERROR)
|
||||
|
||||
time.sleep(self.update_interval)
|
||||
|
||||
async def get_location(self):
|
||||
geolocator = geolocation.Geolocator()
|
||||
position = await geolocator.get_geoposition_async()
|
||||
|
||||
self.last_update = time.time()
|
||||
self.latitude = position.coordinate.latitude
|
||||
self.longitude = position.coordinate.longitude
|
||||
self.altitude = position.coordinate.altitude
|
||||
self.accuracy = position.coordinate.accuracy
|
||||
|
||||
# Note: Windows Geolocation doesn't provide speed and bearing directly
|
||||
# You might need to calculate these from successive position updates
|
||||
self.speed = None
|
||||
self.bearing = None
|
||||
|
||||
def has_location(self):
|
||||
return all([self.latitude, self.longitude, self.altitude, self.accuracy]) is not None
|
||||
|
||||
def update_telemetry(self, telemeter):
|
||||
if self.is_running() and telemeter is not None:
|
||||
if self.has_location():
|
||||
RNS.log("Updating location from Windows Geolocation", RNS.LOG_DEBUG)
|
||||
if "location" not in telemeter.sensors:
|
||||
telemeter.synthesize("location")
|
||||
|
||||
telemeter.sensors["location"].latitude = self.latitude
|
||||
telemeter.sensors["location"].longitude = self.longitude
|
||||
telemeter.sensors["location"].altitude = self.altitude
|
||||
telemeter.sensors["location"].speed = self.speed
|
||||
telemeter.sensors["location"].bearing = self.bearing
|
||||
telemeter.sensors["location"].accuracy = self.accuracy
|
||||
telemeter.sensors["location"].stale_time = 5
|
||||
telemeter.sensors["location"].set_update_time(self.last_update)
|
||||
|
||||
else:
|
||||
RNS.log("No location from Windows Geolocation yet", RNS.LOG_DEBUG)
|
||||
|
||||
# Finally, tell Sideband what class in this
|
||||
# file is the actual plugin class.
|
||||
plugin_class = WindowsLocationPlugin
|
||||
@ -97,11 +97,7 @@ getrns:
|
||||
-(rm ./RNS/__pycache__ -r)
|
||||
(cp -rv ../../LXMF/LXMF ./;rm ./LXMF/Utilities/LXMF)
|
||||
-(rm ./LXMF/__pycache__ -r)
|
||||
(cp -rv ../../LXST/LXST ./;rm ./LXST/Utilities/LXST)
|
||||
-(rm ./LXST/__pycache__ -r)
|
||||
-(rm ./LXST/Utilities/__pycache__ -r)
|
||||
|
||||
cleanrns:
|
||||
-(rm ./RNS -r)
|
||||
-(rm ./LXMF -r)
|
||||
-(rm ./LXST -r)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -10,7 +10,7 @@ source.exclude_patterns = app_storage/*,venv/*,Makefile,./Makefil*,requirements,
|
||||
|
||||
version.regex = __version__ = ['"](.*)['"]
|
||||
version.filename = %(source.dir)s/main.py
|
||||
android.numeric_version = 20250327
|
||||
android.numeric_version = 20250126
|
||||
|
||||
requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,able_recipe,libwebp,libogg,libopus,opusfile,numpy,cryptography,ffpyplayer,codec2,pycodec2,sh,pynacl,typing-extensions,mistune>=3.0.2,beautifulsoup4
|
||||
|
||||
|
||||
172
sbapp/main.py
172
sbapp/main.py
@ -1,6 +1,6 @@
|
||||
__debug_build__ = False
|
||||
__disable_shaders__ = False
|
||||
__version__ = "1.5.1"
|
||||
__version__ = "1.4.0"
|
||||
__variant__ = ""
|
||||
|
||||
import sys
|
||||
@ -25,8 +25,8 @@ import base64
|
||||
import threading
|
||||
import RNS.vendor.umsgpack as msgpack
|
||||
|
||||
WINDOW_DEFAULT_WIDTH = 494
|
||||
WINDOW_DEFAULT_HEIGHT = 800
|
||||
WINDOW_DEFAULT_WIDTH = "494"
|
||||
WINDOW_DEFAULT_HEIGHT = "800"
|
||||
|
||||
app_ui_scaling_path = None
|
||||
def apply_ui_scale():
|
||||
@ -176,25 +176,9 @@ if not args.daemon:
|
||||
sys.path.append(local)
|
||||
|
||||
if not RNS.vendor.platformutils.is_android():
|
||||
model = None
|
||||
max_width = WINDOW_DEFAULT_WIDTH
|
||||
max_height = WINDOW_DEFAULT_HEIGHT
|
||||
|
||||
try:
|
||||
if os.path.isfile("/sys/firmware/devicetree/base/model"):
|
||||
with open("/sys/firmware/devicetree/base/model", "r") as mf:
|
||||
model = mf.read()
|
||||
except: pass
|
||||
|
||||
if model:
|
||||
if model.startswith("Raspberry Pi "): max_height = 625
|
||||
|
||||
window_width = min(WINDOW_DEFAULT_WIDTH, max_width)
|
||||
window_height = min(WINDOW_DEFAULT_HEIGHT, max_height)
|
||||
|
||||
from kivy.config import Config
|
||||
Config.set("graphics", "width", str(window_width))
|
||||
Config.set("graphics", "height", str(window_height))
|
||||
Config.set("graphics", "width", WINDOW_DEFAULT_WIDTH)
|
||||
Config.set("graphics", "height", WINDOW_DEFAULT_HEIGHT)
|
||||
|
||||
if args.daemon:
|
||||
from .sideband.core import SidebandCore
|
||||
@ -255,7 +239,6 @@ else:
|
||||
from ui.conversations import Conversations, MsgSync, NewConv
|
||||
from ui.telemetry import Telemetry
|
||||
from ui.utilities import Utilities
|
||||
from ui.voice import Voice
|
||||
from ui.objectdetails import ObjectDetails
|
||||
from ui.announces import Announces
|
||||
from ui.messages import Messages, ts_format, messages_screen_kv
|
||||
@ -284,7 +267,6 @@ else:
|
||||
from .ui.announces import Announces
|
||||
from .ui.telemetry import Telemetry
|
||||
from .ui.utilities import Utilities
|
||||
from .ui.voice import Voice
|
||||
from .ui.objectdetails import ObjectDetails
|
||||
from .ui.messages import Messages, ts_format, messages_screen_kv
|
||||
from .ui.helpers import ContentNavigationDrawer, DrawerList, IconListItem
|
||||
@ -370,7 +352,6 @@ class SidebandApp(MDApp):
|
||||
self.settings_ready = False
|
||||
self.telemetry_ready = False
|
||||
self.utilities_ready = False
|
||||
self.voice_ready = False
|
||||
self.connectivity_ready = False
|
||||
self.hardware_ready = False
|
||||
self.repository_ready = False
|
||||
@ -1112,10 +1093,6 @@ class SidebandApp(MDApp):
|
||||
self.hw_error_dialog.open()
|
||||
self.hw_error_dialog.is_open = True
|
||||
|
||||
incoming_call = self.sideband.getstate("voice.incoming_call")
|
||||
if incoming_call:
|
||||
self.sideband.setstate("voice.incoming_call", None)
|
||||
toast(f"Call from {incoming_call}", duration=7)
|
||||
|
||||
if self.root.ids.screen_manager.current == "messages_screen":
|
||||
self.messages_view.update()
|
||||
@ -1289,13 +1266,13 @@ class SidebandApp(MDApp):
|
||||
self.messages_view.ids.message_text.write_tab = True
|
||||
Clock.schedule_once(tab_job, 0.15)
|
||||
|
||||
elif len(modifiers) == 0 and self.rec_dialog != None and self.rec_dialog_is_open:
|
||||
elif self.rec_dialog != None and self.rec_dialog_is_open:
|
||||
if text == " ":
|
||||
self.msg_rec_a_rec(None)
|
||||
elif keycode == 40:
|
||||
self.msg_rec_a_save(None)
|
||||
|
||||
elif len(modifiers) == 0 and not self.rec_dialog_is_open and not self.messages_view.ids.message_text.focus and self.messages_view.ptt_enabled and keycode == 44:
|
||||
elif not self.rec_dialog_is_open and not self.messages_view.ids.message_text.focus and self.messages_view.ptt_enabled and keycode == 44:
|
||||
if not self.key_ptt_down:
|
||||
self.key_ptt_down = True
|
||||
self.message_ptt_down_action()
|
||||
@ -1390,15 +1367,6 @@ class SidebandApp(MDApp):
|
||||
if text == "o":
|
||||
self.objects_action()
|
||||
|
||||
if text == "e":
|
||||
self.voice_action()
|
||||
|
||||
if text == " ":
|
||||
self.voice_answer_action()
|
||||
|
||||
if text == ".":
|
||||
self.voice_reject_action()
|
||||
|
||||
if text == "r":
|
||||
if self.root.ids.screen_manager.current == "conversations_screen":
|
||||
if self.include_objects:
|
||||
@ -1457,8 +1425,6 @@ class SidebandApp(MDApp):
|
||||
self.close_sub_utilities_action()
|
||||
elif self.root.ids.screen_manager.current == "logviewer_screen":
|
||||
self.close_sub_utilities_action()
|
||||
elif self.root.ids.screen_manager.current == "voice_settings_screen":
|
||||
self.close_sub_voice_action()
|
||||
else:
|
||||
self.open_conversations(direction="right")
|
||||
|
||||
@ -1536,7 +1502,6 @@ class SidebandApp(MDApp):
|
||||
|
||||
def announce_now_action(self, sender=None):
|
||||
self.sideband.lxmf_announce()
|
||||
if self.sideband.telephone: self.sideband.telephone.announce()
|
||||
|
||||
yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18))
|
||||
|
||||
@ -1629,17 +1594,13 @@ class SidebandApp(MDApp):
|
||||
self.conversation_action(item)
|
||||
|
||||
def conversation_action(self, sender):
|
||||
if sender.conv_type == self.sideband.CONV_P2P:
|
||||
context_dest = sender.sb_uid
|
||||
def cb(dt): self.open_conversation(context_dest)
|
||||
def cbu(dt): self.conversations_view.update()
|
||||
Clock.schedule_once(cb, 0.15)
|
||||
Clock.schedule_once(cbu, 0.15+0.25)
|
||||
|
||||
elif sender.conv_type == self.sideband.CONV_VOICE:
|
||||
identity_hash = sender.sb_uid
|
||||
def cb(dt): self.dial_action(identity_hash)
|
||||
Clock.schedule_once(cb, 0.15)
|
||||
context_dest = sender.sb_uid
|
||||
def cb(dt):
|
||||
self.open_conversation(context_dest)
|
||||
def cbu(dt):
|
||||
self.conversations_view.update()
|
||||
Clock.schedule_once(cb, 0.15)
|
||||
Clock.schedule_once(cbu, 0.15+0.25)
|
||||
|
||||
def open_conversation(self, context_dest, direction="left"):
|
||||
self.rec_dialog_is_open = False
|
||||
@ -2604,27 +2565,21 @@ class SidebandApp(MDApp):
|
||||
if RNS.vendor.platformutils.is_android():
|
||||
hs = dp(22)
|
||||
yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18))
|
||||
full_button = MDRectangleFlatButton(text="Full RNS Status",font_size=dp(18), theme_text_color="Custom", line_color=self.color_accept, text_color=self.color_accept)
|
||||
dialog = MDDialog(
|
||||
title="Connectivity Status",
|
||||
text=str(self.get_connectivity_text()),
|
||||
buttons=[full_button, yes_button],
|
||||
buttons=[ yes_button ],
|
||||
# elevation=0,
|
||||
)
|
||||
def cs_updater(dt):
|
||||
dialog.text = str(self.get_connectivity_text())
|
||||
def dl_yes(s):
|
||||
self.connectivity_updater.cancel()
|
||||
dialog.dismiss()
|
||||
if self.connectivity_updater != None:
|
||||
self.connectivity_updater.cancel()
|
||||
def cb_rns(sender):
|
||||
dialog.dismiss()
|
||||
if self.connectivity_updater != None:
|
||||
self.connectivity_updater.cancel()
|
||||
self.rnstatus_action()
|
||||
|
||||
yes_button.bind(on_release=dl_yes)
|
||||
full_button.bind(on_release=cb_rns)
|
||||
dialog.open()
|
||||
|
||||
if self.connectivity_updater != None:
|
||||
@ -2633,12 +2588,9 @@ class SidebandApp(MDApp):
|
||||
self.connectivity_updater = Clock.schedule_interval(cs_updater, 2.0)
|
||||
|
||||
else:
|
||||
self.rnstatus_action()
|
||||
|
||||
def rnstatus_action(self, sender=None):
|
||||
if not self.utilities_ready:
|
||||
self.utilities_init()
|
||||
self.utilities_screen.rnstatus_action()
|
||||
if not self.utilities_ready:
|
||||
self.utilities_init()
|
||||
self.utilities_screen.rnstatus_action()
|
||||
|
||||
def ingest_lxm_action(self, sender):
|
||||
def cb(dt):
|
||||
@ -2795,8 +2747,7 @@ class SidebandApp(MDApp):
|
||||
n_address = dialog.d_content.ids["n_address_field"].text
|
||||
n_name = dialog.d_content.ids["n_name_field"].text
|
||||
n_trusted = dialog.d_content.ids["n_trusted"].active
|
||||
n_voice_only = dialog.d_content.ids["n_voice_only"].active
|
||||
new_result = self.sideband.new_conversation(n_address, n_name, n_trusted, n_voice_only)
|
||||
new_result = self.sideband.new_conversation(n_address, n_name, n_trusted)
|
||||
|
||||
except Exception as e:
|
||||
RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR)
|
||||
@ -3197,15 +3148,6 @@ class SidebandApp(MDApp):
|
||||
self.sideband.config["hq_ptt"] = self.settings_screen.ids.settings_hq_ptt.active
|
||||
self.sideband.save_configuration()
|
||||
|
||||
def save_voice_enabled(sender=None, event=None):
|
||||
self.sideband.config["voice_enabled"] = self.settings_screen.ids.settings_voice_enabled.active
|
||||
self.sideband.save_configuration()
|
||||
|
||||
if self.sideband.config["voice_enabled"] == True:
|
||||
self.sideband.start_voice()
|
||||
else:
|
||||
self.sideband.stop_voice()
|
||||
|
||||
def save_print_command(sender=None, event=None):
|
||||
if not sender.focus:
|
||||
in_cmd = self.settings_screen.ids.settings_print_command.text
|
||||
@ -3381,10 +3323,6 @@ class SidebandApp(MDApp):
|
||||
self.settings_screen.ids.settings_hq_ptt.active = self.sideband.config["hq_ptt"]
|
||||
self.settings_screen.ids.settings_hq_ptt.bind(active=save_hq_ptt)
|
||||
|
||||
self.settings_screen.ids.settings_voice_enabled.active = self.sideband.config["voice_enabled"]
|
||||
self.settings_screen.ids.settings_voice_enabled.bind(active=save_voice_enabled)
|
||||
if RNS.vendor.platformutils.is_android(): self.settings_screen.ids.settings_voice_enabled.disabled = True
|
||||
|
||||
self.settings_screen.ids.settings_debug.active = self.sideband.config["debug"]
|
||||
self.settings_screen.ids.settings_debug.bind(active=save_debug)
|
||||
|
||||
@ -5296,62 +5234,6 @@ class SidebandApp(MDApp):
|
||||
self.utilities_action(direction="right")
|
||||
|
||||
|
||||
### voice Screen
|
||||
######################################
|
||||
|
||||
def voice_init(self):
|
||||
if not self.voice_ready:
|
||||
self.voice_screen = Voice(self)
|
||||
self.voice_ready = True
|
||||
|
||||
def voice_open(self, sender=None, direction="left", no_transition=False, dial_on_complete=None):
|
||||
if no_transition:
|
||||
self.root.ids.screen_manager.transition = self.no_transition
|
||||
else:
|
||||
self.root.ids.screen_manager.transition = self.slide_transition
|
||||
self.root.ids.screen_manager.transition.direction = direction
|
||||
|
||||
self.root.ids.screen_manager.current = "voice_screen"
|
||||
self.root.ids.nav_drawer.set_state("closed")
|
||||
self.sideband.setstate("app.displaying", self.root.ids.screen_manager.current)
|
||||
|
||||
if no_transition:
|
||||
self.root.ids.screen_manager.transition = self.slide_transition
|
||||
|
||||
self.voice_screen.update_call_status()
|
||||
if dial_on_complete:
|
||||
self.voice_screen.dial_target = dial_on_complete
|
||||
self.voice_screen.screen.ids.identity_hash.text = RNS.hexrep(dial_on_complete, delimit=False)
|
||||
Clock.schedule_once(self.voice_screen.dial_action, 0.25)
|
||||
|
||||
def voice_action(self, sender=None, direction="left", dial_on_complete=None):
|
||||
if self.voice_ready:
|
||||
self.voice_open(direction=direction, dial_on_complete=dial_on_complete)
|
||||
else:
|
||||
self.loader_action(direction=direction)
|
||||
def final(dt):
|
||||
self.voice_init()
|
||||
def o(dt):
|
||||
self.voice_open(no_transition=True, dial_on_complete=dial_on_complete)
|
||||
Clock.schedule_once(o, ll_ot)
|
||||
Clock.schedule_once(final, ll_ft)
|
||||
|
||||
def close_sub_voice_action(self, sender=None):
|
||||
self.voice_action(direction="right")
|
||||
|
||||
def dial_action(self, identity_hash):
|
||||
self.voice_action(dial_on_complete=identity_hash)
|
||||
|
||||
def voice_answer_action(self, sender=None):
|
||||
if self.sideband.voice_running:
|
||||
if self.sideband.telephone.is_ringing: self.sideband.telephone.answer()
|
||||
|
||||
def voice_reject_action(self, sender=None):
|
||||
if self.sideband.voice_running:
|
||||
if self.sideband.telephone.is_ringing or self.sideband.telephone.is_in_call:
|
||||
self.sideband.telephone.hangup()
|
||||
toast("Call ended")
|
||||
|
||||
### Telemetry Screen
|
||||
######################################
|
||||
|
||||
@ -6156,7 +6038,7 @@ class SidebandApp(MDApp):
|
||||
|
||||
latest_viewable = None
|
||||
if not skip:
|
||||
for telemetry_entry in sorted(telemetry_entries[telemetry_source], key=lambda t: t[0], reverse=True):
|
||||
for telemetry_entry in telemetry_entries[telemetry_source]:
|
||||
telemetry_timestamp = telemetry_entry[0]
|
||||
telemetry_data = telemetry_entry[1]
|
||||
t = Telemeter.from_packed(telemetry_data)
|
||||
@ -6165,10 +6047,6 @@ class SidebandApp(MDApp):
|
||||
if "location" in telemetry and telemetry["location"] != None and telemetry["location"]["latitude"] != None and telemetry["location"]["longitude"] != None:
|
||||
latest_viewable = telemetry
|
||||
break
|
||||
elif "connection_map" in telemetry:
|
||||
# TODO: Telemetry entries with connection map sensor types are skipped for now,
|
||||
# until a proper rendering mechanism is implemented
|
||||
break
|
||||
|
||||
if latest_viewable != None:
|
||||
l = latest_viewable["location"]
|
||||
@ -6288,21 +6166,15 @@ If you use Reticulum and LXMF on hardware that does not carry any identifiers ti
|
||||
- [b]Ctrl-Shift-F[/b] add file
|
||||
- [b]Ctrl-D[/b] or [b]Ctrl-S[/b] Send message
|
||||
|
||||
[b]Voice & PTT Messages[/b]
|
||||
[b]Voice & PTT[/b]
|
||||
- [b]Space[/b] Start/stop recording
|
||||
- [b]Enter[/b] Save recording to message
|
||||
- With PTT enabled, hold [b]Space[/b] to talk
|
||||
|
||||
[b]Voice Calls[/b]
|
||||
- [b]Ctrl-Space[/b] Answer incoming call
|
||||
- [b]Ctrl-.[/b] Reject incoming call
|
||||
- [b]Ctrl-.[/b] Hang up active call
|
||||
|
||||
[b]Navigation[/b]
|
||||
- [b]Ctrl-[i]n[/i][/b] Go to conversation number [i]n[/i]
|
||||
- [b]Ctrl-R[/b] Go to Conversations
|
||||
- [b]Ctrl-O[/b] Go to Objects & Devices
|
||||
- [b]Ctrl-E[/b] Go to Voice
|
||||
- [b]Ctrl-L[/b] Go to Announce Stream
|
||||
- [b]Ctrl-M[/b] Go to Situation Map
|
||||
- [b]Ctrl-U[/b] Go to Utilities
|
||||
|
||||
@ -28,10 +28,6 @@
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:mimeType="image/*" />
|
||||
<data android:mimeType="video/*" />
|
||||
<data android:mimeType="audio/*" />
|
||||
<data android:mimeType="text/*" />
|
||||
<data android:mimeType="application/*" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
|
||||
|
||||
@ -8,7 +8,6 @@ import sqlite3
|
||||
import random
|
||||
import shlex
|
||||
import re
|
||||
import gc
|
||||
|
||||
import RNS.vendor.umsgpack as msgpack
|
||||
import RNS.Interfaces.Interface as Interface
|
||||
@ -108,7 +107,6 @@ class SidebandCore():
|
||||
CONV_P2P = 0x01
|
||||
CONV_GROUP = 0x02
|
||||
CONV_BROADCAST = 0x03
|
||||
CONV_VOICE = 0x04
|
||||
|
||||
MAX_ANNOUNCES = 24
|
||||
|
||||
@ -169,8 +167,6 @@ class SidebandCore():
|
||||
self.owner_app = owner_app
|
||||
self.reticulum = None
|
||||
self.webshare_server = None
|
||||
self.voice_running = False
|
||||
self.telephone = None
|
||||
self.telemeter = None
|
||||
self.telemetry_running = False
|
||||
self.latest_telemetry = None
|
||||
@ -269,7 +265,6 @@ class SidebandCore():
|
||||
self.webshare_ssl_cert_path = self.app_dir+"/app_storage/ssl_cert.pem"
|
||||
|
||||
self.mqtt = None
|
||||
self.mqtt_handle_lock = threading.Lock()
|
||||
|
||||
self.first_run = True
|
||||
self.saving_configuration = False
|
||||
@ -536,12 +531,6 @@ class SidebandCore():
|
||||
self.config["telemetry_send_to_trusted"] = False
|
||||
self.config["telemetry_send_to_collector"] = False
|
||||
|
||||
# Voice
|
||||
self.config["voice_enabled"] = False
|
||||
self.config["voice_output"] = None
|
||||
self.config["voice_input"] = None
|
||||
self.config["voice_ringer"] = None
|
||||
|
||||
if not os.path.isfile(self.db_path):
|
||||
self.__db_init()
|
||||
else:
|
||||
@ -575,7 +564,7 @@ class SidebandCore():
|
||||
RNS.log("Loading Sideband identity...", RNS.LOG_DEBUG)
|
||||
self.identity = RNS.Identity.from_file(self.identity_path)
|
||||
|
||||
self.rpc_addr = f"\0sideband/rpc"
|
||||
self.rpc_addr = ("127.0.0.1", 48165)
|
||||
self.rpc_key = RNS.Identity.full_hash(self.identity.get_private_key())
|
||||
|
||||
RNS.log("Loading Sideband configuration... "+str(self.config_path), RNS.LOG_DEBUG)
|
||||
@ -848,17 +837,6 @@ class SidebandCore():
|
||||
if not "map_storage_file" in self.config:
|
||||
self.config["map_storage_file"] = None
|
||||
|
||||
if not "voice_enabled" in self.config:
|
||||
self.config["voice_enabled"] = False
|
||||
if not "voice_output" in self.config:
|
||||
self.config["voice_output"] = None
|
||||
if not "voice_input" in self.config:
|
||||
self.config["voice_input"] = None
|
||||
if not "voice_ringer" in self.config:
|
||||
self.config["voice_ringer"] = None
|
||||
if not "voice_trusted_only" in self.config:
|
||||
self.config["voice_trusted_only"] = False
|
||||
|
||||
# Make sure we have a database
|
||||
if not os.path.isfile(self.db_path):
|
||||
self.__db_init()
|
||||
@ -1015,16 +993,13 @@ class SidebandCore():
|
||||
notifications_permitted = True
|
||||
|
||||
if notifications_permitted:
|
||||
try:
|
||||
if RNS.vendor.platformutils.get_platform() == "android":
|
||||
if self.is_service:
|
||||
self.owner_service.android_notification(title, content, group=group, context_id=context_id)
|
||||
else:
|
||||
plyer.notification.notify(title, content, notification_icon=self.notification_icon, context_override=None)
|
||||
if RNS.vendor.platformutils.get_platform() == "android":
|
||||
if self.is_service:
|
||||
self.owner_service.android_notification(title, content, group=group, context_id=context_id)
|
||||
else:
|
||||
plyer.notification.notify(title, content, app_icon=self.icon_32)
|
||||
except Exception as e:
|
||||
RNS.log("An error occurred while posting a notification to the operating system: {e}", RNS.LOG_ERROR)
|
||||
plyer.notification.notify(title, content, notification_icon=self.notification_icon, context_override=None)
|
||||
else:
|
||||
plyer.notification.notify(title, content, app_icon=self.icon_32)
|
||||
|
||||
def log_announce(self, dest, app_data, dest_type, stamp_cost=None, link_stats=None):
|
||||
try:
|
||||
@ -1079,20 +1054,6 @@ class SidebandCore():
|
||||
RNS.log("Error while checking trust for "+RNS.prettyhexrep(context_dest)+": "+str(e), RNS.LOG_ERROR)
|
||||
return False
|
||||
|
||||
def voice_is_trusted(self, identity_hash):
|
||||
context_dest = identity_hash
|
||||
try:
|
||||
lxmf_destination_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", identity_hash)
|
||||
existing_voice = self._db_conversation(context_dest)
|
||||
existing_lxmf = self._db_conversation(lxmf_destination_hash)
|
||||
if existing_lxmf: trust = existing_lxmf["trust"]
|
||||
else: trust = existing_voice["trust"]
|
||||
return trust == 1
|
||||
|
||||
except Exception as e:
|
||||
RNS.log("Could not decode a valid peer name from data: "+str(e), RNS.LOG_DEBUG)
|
||||
return False
|
||||
|
||||
def is_object(self, context_dest, conv_data = None):
|
||||
try:
|
||||
if conv_data == None:
|
||||
@ -1252,22 +1213,6 @@ class SidebandCore():
|
||||
RNS.log("Could not decode a valid peer name from data: "+str(e), RNS.LOG_DEBUG)
|
||||
return RNS.prettyhexrep(context_dest)
|
||||
|
||||
def voice_display_name(self, identity_hash):
|
||||
context_dest = identity_hash
|
||||
if context_dest == self.lxmf_destination.hash:
|
||||
return self.config["display_name"]
|
||||
|
||||
try:
|
||||
lxmf_destination_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", identity_hash)
|
||||
existing_voice = self._db_conversation(context_dest)
|
||||
existing_lxmf = self._db_conversation(lxmf_destination_hash)
|
||||
if existing_lxmf: return self.peer_display_name(lxmf_destination_hash)
|
||||
else: return self.peer_display_name(identity_hash)
|
||||
|
||||
except Exception as e:
|
||||
RNS.log("Could not decode a valid peer name from data: "+str(e), RNS.LOG_DEBUG)
|
||||
return RNS.prettyhexrep(context_dest)
|
||||
|
||||
def clear_conversation(self, context_dest):
|
||||
self._db_clear_conversation(context_dest)
|
||||
|
||||
@ -1790,7 +1735,7 @@ class SidebandCore():
|
||||
try:
|
||||
with self.rpc_lock:
|
||||
if self.rpc_connection == None:
|
||||
self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, family="AF_UNIX", authkey=self.rpc_key)
|
||||
self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key)
|
||||
self.rpc_connection.send(request)
|
||||
response = self.rpc_connection.recv()
|
||||
return response
|
||||
@ -1893,81 +1838,15 @@ class SidebandCore():
|
||||
RNS.log(ed, RNS.LOG_DEBUG)
|
||||
return None
|
||||
|
||||
def _get_destination_mtu(self, destination_hash):
|
||||
try:
|
||||
mr = self.message_router
|
||||
oh = destination_hash
|
||||
ol = None
|
||||
if oh in mr.direct_links:
|
||||
ol = mr.direct_links[oh]
|
||||
elif oh in mr.backchannel_links:
|
||||
ol = mr.backchannel_links[oh]
|
||||
|
||||
if ol != None:
|
||||
return ol.get_mtu()
|
||||
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
RNS.trace_exception(e)
|
||||
return None
|
||||
|
||||
def get_destination_mtu(self, destination_hash):
|
||||
if not RNS.vendor.platformutils.is_android():
|
||||
return self._get_destination_mtu(destination_hash)
|
||||
else:
|
||||
if self.is_service:
|
||||
return self._get_destination_mtu(destination_hash)
|
||||
else:
|
||||
try:
|
||||
return self.service_rpc_request({"get_destination_mtu": destination_hash})
|
||||
except Exception as e:
|
||||
ed = "Error while getting destination link MTU over RPC: "+str(e)
|
||||
RNS.log(ed, RNS.LOG_DEBUG)
|
||||
return None
|
||||
|
||||
def _get_destination_edr(self, destination_hash):
|
||||
try:
|
||||
mr = self.message_router
|
||||
oh = destination_hash
|
||||
ol = None
|
||||
if oh in mr.direct_links:
|
||||
ol = mr.direct_links[oh]
|
||||
elif oh in mr.backchannel_links:
|
||||
ol = mr.backchannel_links[oh]
|
||||
|
||||
if ol != None:
|
||||
return ol.get_expected_rate()
|
||||
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
RNS.trace_exception(e)
|
||||
return None
|
||||
|
||||
def get_destination_edr(self, destination_hash):
|
||||
if not RNS.vendor.platformutils.is_android():
|
||||
return self._get_destination_edr(destination_hash)
|
||||
else:
|
||||
if self.is_service:
|
||||
return self._get_destination_edr(destination_hash)
|
||||
else:
|
||||
try:
|
||||
return self.service_rpc_request({"get_destination_edr": destination_hash})
|
||||
except Exception as e:
|
||||
ed = "Error while getting destination link EIFR over RPC: "+str(e)
|
||||
RNS.log(ed, RNS.LOG_DEBUG)
|
||||
return None
|
||||
|
||||
def __start_rpc_listener(self):
|
||||
try:
|
||||
RNS.log("Starting RPC listener", RNS.LOG_DEBUG)
|
||||
self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, family="AF_UNIX", authkey=self.rpc_key)
|
||||
self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, authkey=self.rpc_key)
|
||||
thread = threading.Thread(target=self.__rpc_loop)
|
||||
thread.daemon = True
|
||||
thread.start()
|
||||
except Exception as e:
|
||||
RNS.log("Could not start RPC listener on @"+str(self.rpc_addr[1:])+". Terminating now. Clear up anything using the port and try again.", RNS.LOG_ERROR)
|
||||
RNS.log("Could not start RPC listener on "+str(self.rpc_addr)+". Terminating now. Clear up anything using the port and try again.", RNS.LOG_ERROR)
|
||||
RNS.panic()
|
||||
|
||||
def __rpc_loop(self):
|
||||
@ -2003,10 +1882,6 @@ class SidebandCore():
|
||||
connection.send(self._get_plugins_info())
|
||||
elif "get_destination_establishment_rate" in call:
|
||||
connection.send(self._get_destination_establishment_rate(call["get_destination_establishment_rate"]))
|
||||
elif "get_destination_mtu" in call:
|
||||
connection.send(self._get_destination_mtu(call["get_destination_mtu"]))
|
||||
elif "get_destination_edr" in call:
|
||||
connection.send(self._get_destination_edr(call["get_destination_edr"]))
|
||||
elif "send_message" in call:
|
||||
args = call["send_message"]
|
||||
send_result = self.send_message(
|
||||
@ -2143,7 +2018,6 @@ class SidebandCore():
|
||||
dbc = db.cursor()
|
||||
|
||||
dbc.execute("CREATE TABLE IF NOT EXISTS telemetry (id INTEGER PRIMARY KEY, dest_context BLOB, ts INTEGER, data BLOB)")
|
||||
dbc.execute("CREATE INDEX IF NOT EXISTS idx_telemetry_ts ON telemetry(ts)")
|
||||
db.commit()
|
||||
|
||||
def _db_upgradetables(self):
|
||||
@ -2685,7 +2559,6 @@ class SidebandCore():
|
||||
"last_rx": last_rx,
|
||||
"last_tx": last_tx,
|
||||
"last_activity": last_activity,
|
||||
"type": entry[4],
|
||||
"trust": entry[5],
|
||||
"data": data,
|
||||
}
|
||||
@ -2837,27 +2710,6 @@ class SidebandCore():
|
||||
|
||||
self.__event_conversations_changed()
|
||||
|
||||
def _db_create_voice_object(self, identity_hash, name = None, trust = False):
|
||||
RNS.log("Creating voice object for "+RNS.prettyhexrep(identity_hash), RNS.LOG_DEBUG)
|
||||
with self.db_lock:
|
||||
db = self.__db_connect()
|
||||
dbc = db.cursor()
|
||||
|
||||
def_name = "".encode("utf-8")
|
||||
query = "INSERT INTO conv (dest_context, last_tx, last_rx, unread, type, trust, name, data) values (?, ?, ?, ?, ?, ?, ?, ?)"
|
||||
data = (identity_hash, 0, time.time(), 0, SidebandCore.CONV_VOICE, 0, def_name, msgpack.packb(None))
|
||||
|
||||
dbc.execute(query, data)
|
||||
db.commit()
|
||||
|
||||
if trust:
|
||||
self._db_conversation_set_trusted(identity_hash, True)
|
||||
|
||||
if name != None and name != "":
|
||||
self._db_conversation_set_name(identity_hash, name)
|
||||
|
||||
self.__event_conversations_changed()
|
||||
|
||||
def _db_delete_message(self, msg_hash):
|
||||
RNS.log("Deleting message "+RNS.prettyhexrep(msg_hash))
|
||||
with self.db_lock:
|
||||
@ -3272,37 +3124,12 @@ class SidebandCore():
|
||||
self.setstate("app.flags.last_telemetry", time.time())
|
||||
|
||||
def mqtt_handle_telemetry(self, context_dest, telemetry):
|
||||
with self.mqtt_handle_lock:
|
||||
# TODO: Remove debug
|
||||
if hasattr(self, "last_mqtt_recycle") and time.time() > self.last_mqtt_recycle + 60*4:
|
||||
# RNS.log("Recycling MQTT handler", RNS.LOG_DEBUG)
|
||||
self.mqtt.stop()
|
||||
self.mqtt.client = None
|
||||
self.mqtt = None
|
||||
gc.collect()
|
||||
if self.mqtt == None:
|
||||
self.mqtt = MQTT()
|
||||
|
||||
if self.mqtt == None:
|
||||
self.mqtt = MQTT()
|
||||
self.last_mqtt_recycle = time.time()
|
||||
|
||||
self.mqtt.set_server(self.config["telemetry_mqtt_host"], self.config["telemetry_mqtt_port"])
|
||||
self.mqtt.set_auth(self.config["telemetry_mqtt_user"], self.config["telemetry_mqtt_pass"])
|
||||
self.mqtt.handle(context_dest, telemetry)
|
||||
|
||||
# TODO: Remove debug
|
||||
# if not hasattr(self, "memtr"):
|
||||
# from pympler import muppy
|
||||
# from pympler import summary
|
||||
# import resource
|
||||
# self.res = resource
|
||||
# self.ms = summary; self.mp = muppy
|
||||
# self.memtr = self.ms.summarize(self.mp.get_objects())
|
||||
# RNS.log(f"RSS: {RNS.prettysize(self.res.getrusage(self.res.RUSAGE_SELF).ru_maxrss*1000)}")
|
||||
# else:
|
||||
# memsum = self.ms.summarize(self.mp.get_objects())
|
||||
# memdiff = self.ms.get_diff(self.memtr, memsum)
|
||||
# self.ms.print_(memdiff)
|
||||
# RNS.log(f"RSS: {RNS.prettysize(self.res.getrusage(self.res.RUSAGE_SELF).ru_maxrss*1000)}")
|
||||
self.mqtt.set_server(self.config["telemetry_mqtt_host"], self.config["telemetry_mqtt_port"])
|
||||
self.mqtt.set_auth(self.config["telemetry_mqtt_user"], self.config["telemetry_mqtt_pass"])
|
||||
self.mqtt.handle(context_dest, telemetry)
|
||||
|
||||
def update_telemetry(self):
|
||||
try:
|
||||
@ -3387,7 +3214,7 @@ class SidebandCore():
|
||||
else:
|
||||
self.telemeter.disable(sensor)
|
||||
|
||||
for telemetry_plugin in self.active_telemetry_plugins.copy():
|
||||
for telemetry_plugin in self.active_telemetry_plugins:
|
||||
try:
|
||||
plugin = self.active_telemetry_plugins[telemetry_plugin]
|
||||
plugin.update_telemetry(self.telemeter)
|
||||
@ -3507,7 +3334,6 @@ class SidebandCore():
|
||||
if self.config["start_announce"] == True:
|
||||
time.sleep(12)
|
||||
self.lxmf_announce(attached_interface=self.interface_local)
|
||||
if self.telephone: self.telephone.announce(attached_interface=self.interface_local)
|
||||
threading.Thread(target=job, daemon=True).start()
|
||||
|
||||
if hasattr(self, "interface_rnode") and self.interface_rnode != None:
|
||||
@ -3595,7 +3421,6 @@ class SidebandCore():
|
||||
aif = announce_attached_interface
|
||||
time.sleep(delay)
|
||||
self.lxmf_announce(attached_interface=aif)
|
||||
if self.telephone: self.telephone.announce(attached_interface=aif)
|
||||
return x
|
||||
|
||||
threading.Thread(target=gen_announce_job(announce_delay, announce_attached_interface), daemon=True).start()
|
||||
@ -3810,7 +3635,6 @@ class SidebandCore():
|
||||
def da():
|
||||
time.sleep(8)
|
||||
self.lxmf_announce()
|
||||
if self.telephone: self.telephone.announce()
|
||||
self.last_if_change_announce = time.time()
|
||||
threading.Thread(target=da, daemon=True).start()
|
||||
|
||||
@ -3818,8 +3642,8 @@ class SidebandCore():
|
||||
self.periodic_thread.start()
|
||||
|
||||
if self.is_standalone or self.is_client:
|
||||
if self.config["telemetry_enabled"]: self.run_telemetry()
|
||||
if self.config["voice_enabled"]: self.start_voice()
|
||||
if self.config["telemetry_enabled"]:
|
||||
self.run_telemetry()
|
||||
elif self.is_service:
|
||||
self.run_service_telemetry()
|
||||
|
||||
@ -4115,13 +3939,13 @@ class SidebandCore():
|
||||
ifac_size = None
|
||||
|
||||
interface_config = {
|
||||
"name": "TCP Client",
|
||||
"name": "TCPClientInterface",
|
||||
"target_host": tcp_host,
|
||||
"target_port": tcp_port,
|
||||
"kiss_framing": False,
|
||||
"i2p_tunneled": False,
|
||||
}
|
||||
tcpinterface = RNS.Interfaces.BackboneInterface.BackboneClientInterface(RNS.Transport, interface_config)
|
||||
tcpinterface = RNS.Interfaces.TCPInterface.TCPClientInterface(RNS.Transport, interface_config)
|
||||
tcpinterface.OUT = True
|
||||
|
||||
if RNS.Reticulum.transport_enabled():
|
||||
@ -4726,7 +4550,7 @@ class SidebandCore():
|
||||
RNS.log("Error while sending message: "+str(e), RNS.LOG_ERROR)
|
||||
return False
|
||||
|
||||
def new_conversation(self, dest_str, name = "", trusted = False, voice_only = False):
|
||||
def new_conversation(self, dest_str, name = "", trusted = False):
|
||||
if len(dest_str) != RNS.Reticulum.TRUNCATED_HASHLENGTH//8*2:
|
||||
return False
|
||||
|
||||
@ -4736,8 +4560,7 @@ class SidebandCore():
|
||||
RNS.log("Cannot create conversation with own LXMF address", RNS.LOG_ERROR)
|
||||
return False
|
||||
else:
|
||||
if not voice_only: self._db_create_conversation(addr_b, name, trusted)
|
||||
else: self._db_create_voice_object(addr_b, name, trusted)
|
||||
self._db_create_conversation(addr_b, name, trusted)
|
||||
|
||||
except Exception as e:
|
||||
RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR)
|
||||
@ -5287,40 +5110,6 @@ class SidebandCore():
|
||||
if not self.reticulum.is_connected_to_shared_instance:
|
||||
RNS.Transport.detach_interfaces()
|
||||
|
||||
def start_voice(self):
|
||||
try:
|
||||
if not self.voice_running:
|
||||
RNS.log("Starting voice service", RNS.LOG_DEBUG)
|
||||
self.voice_running = True
|
||||
from .voice import ReticulumTelephone
|
||||
self.telephone = ReticulumTelephone(self.identity, owner=self, speaker=self.config["voice_output"], microphone=self.config["voice_input"], ringer=self.config["voice_ringer"])
|
||||
ringtone_path = os.path.join(self.asset_dir, "audio", "notifications", "soft1.opus")
|
||||
self.telephone.set_ringtone(ringtone_path)
|
||||
|
||||
except Exception as e:
|
||||
self.voice_running = False
|
||||
RNS.log(f"An error occurred while starting voice services, the contained exception was: {e}", RNS.LOG_ERROR)
|
||||
RNS.trace_exception(e)
|
||||
|
||||
def stop_voice(self):
|
||||
try:
|
||||
if self.voice_running:
|
||||
RNS.log("Stopping voice service", RNS.LOG_DEBUG)
|
||||
if self.telephone:
|
||||
self.telephone.stop()
|
||||
del self.telephone
|
||||
|
||||
self.telephone = None
|
||||
self.voice_running = False
|
||||
|
||||
except Exception as e:
|
||||
RNS.log(f"An error occurred while stopping voice services, the contained exception was: {e}", RNS.LOG_ERROR)
|
||||
RNS.trace_exception(e)
|
||||
|
||||
def incoming_call(self, remote_identity):
|
||||
display_name = self.voice_display_name(remote_identity.hash)
|
||||
self.setstate("voice.incoming_call", display_name)
|
||||
|
||||
rns_config = """# This template is used to generate a
|
||||
# running configuration for Sideband's
|
||||
# internal RNS instance. Incorrect changes
|
||||
|
||||
@ -44,14 +44,11 @@ class MQTT():
|
||||
RNS.log("All MQTT messages processed", RNS.LOG_DEBUG)
|
||||
|
||||
except Exception as e:
|
||||
RNS.log(f"An error occurred while running MQTT scheduler jobs: {e}", RNS.LOG_ERROR)
|
||||
RNS.log("An error occurred while running MQTT scheduler jobs: {e}", RNS.LOG_ERROR)
|
||||
RNS.trace_exception(e)
|
||||
|
||||
time.sleep(MQTT.SCHEDULER_SLEEP)
|
||||
|
||||
try: self.disconnect()
|
||||
except Exception as e: RNS.log(f"An error occurred while disconnecting MQTT server: {e}", RNS.LOG_ERROR)
|
||||
|
||||
RNS.log("Stopped MQTT scheduler", RNS.LOG_DEBUG)
|
||||
|
||||
def connect_failed(self, client, userdata):
|
||||
|
||||
@ -120,11 +120,9 @@ class Telemeter():
|
||||
|
||||
def stop_all(self):
|
||||
if not self.from_packed:
|
||||
sensors = self.sensors.copy()
|
||||
for sensor in sensors:
|
||||
for sensor in self.sensors:
|
||||
if not sensor == "time":
|
||||
self.sensors[sensor].stop()
|
||||
del sensors
|
||||
|
||||
def read(self, sensor):
|
||||
if not self.from_packed:
|
||||
@ -139,38 +137,31 @@ class Telemeter():
|
||||
|
||||
def read_all(self):
|
||||
readings = {}
|
||||
sensors = self.sensors.copy()
|
||||
for sensor in sensors:
|
||||
for sensor in self.sensors:
|
||||
if self.sensors[sensor].active:
|
||||
if not self.from_packed:
|
||||
readings[sensor] = self.sensors[sensor].data
|
||||
else:
|
||||
readings[sensor] = self.sensors[sensor]._data
|
||||
|
||||
del sensors
|
||||
return readings
|
||||
|
||||
def packed(self):
|
||||
packed = {}
|
||||
packed[Sensor.SID_TIME] = int(time.time())
|
||||
sensors = self.sensors.copy()
|
||||
for sensor in sensors:
|
||||
for sensor in self.sensors:
|
||||
if self.sensors[sensor].active:
|
||||
packed[self.sensors[sensor].sid] = self.sensors[sensor].pack()
|
||||
|
||||
del sensors
|
||||
return umsgpack.packb(packed)
|
||||
|
||||
def render(self, relative_to=None):
|
||||
rendered = []
|
||||
sensors = self.sensors.copy()
|
||||
for sensor in sensors:
|
||||
for sensor in self.sensors:
|
||||
s = self.sensors[sensor]
|
||||
if s.active:
|
||||
r = s.render(relative_to)
|
||||
if r: rendered.append(r)
|
||||
|
||||
del sensors
|
||||
return rendered
|
||||
|
||||
def check_permission(self, permission):
|
||||
|
||||
@ -1,171 +0,0 @@
|
||||
import RNS
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
from LXST._version import __version__
|
||||
from LXST.Primitives.Telephony import Telephone
|
||||
from RNS.vendor.configobj import ConfigObj
|
||||
|
||||
class ReticulumTelephone():
|
||||
STATE_AVAILABLE = 0x00
|
||||
STATE_CONNECTING = 0x01
|
||||
STATE_RINGING = 0x02
|
||||
STATE_IN_CALL = 0x03
|
||||
|
||||
HW_SLEEP_TIMEOUT = 15
|
||||
HW_STATE_IDLE = 0x00
|
||||
HW_STATE_DIAL = 0x01
|
||||
HW_STATE_SLEEP = 0xFF
|
||||
|
||||
RING_TIME = 30
|
||||
WAIT_TIME = 60
|
||||
PATH_TIME = 10
|
||||
|
||||
def __init__(self, identity, owner = None, service = False, speaker=None, microphone=None, ringer=None):
|
||||
self.identity = identity
|
||||
self.service = service
|
||||
self.owner = owner
|
||||
self.config = None
|
||||
self.should_run = False
|
||||
self.telephone = None
|
||||
self.state = self.STATE_AVAILABLE
|
||||
self.hw_state = self.HW_STATE_IDLE
|
||||
self.hw_last_event = time.time()
|
||||
self.hw_input = ""
|
||||
self.direction = None
|
||||
self.last_input = None
|
||||
self.first_run = False
|
||||
self.ringtone_path = None
|
||||
self.speaker_device = speaker
|
||||
self.microphone_device = microphone
|
||||
self.ringer_device = ringer
|
||||
self.phonebook = {}
|
||||
self.aliases = {}
|
||||
self.names = {}
|
||||
|
||||
self.telephone = Telephone(self.identity, ring_time=self.RING_TIME, wait_time=self.WAIT_TIME)
|
||||
self.telephone.set_ringing_callback(self.ringing)
|
||||
self.telephone.set_established_callback(self.call_established)
|
||||
self.telephone.set_ended_callback(self.call_ended)
|
||||
self.telephone.set_speaker(self.speaker_device)
|
||||
self.telephone.set_microphone(self.microphone_device)
|
||||
self.telephone.set_ringer(self.ringer_device)
|
||||
self.telephone.set_allowed(self.__is_allowed)
|
||||
RNS.log(f"{self} initialised", RNS.LOG_DEBUG)
|
||||
|
||||
def set_ringtone(self, ringtone_path):
|
||||
if os.path.isfile(ringtone_path):
|
||||
self.ringtone_path = ringtone_path
|
||||
self.telephone.set_ringtone(self.ringtone_path)
|
||||
|
||||
def set_speaker(self, device):
|
||||
self.speaker_device = device
|
||||
self.telephone.set_speaker(self.speaker_device)
|
||||
|
||||
def set_microphone(self, device):
|
||||
self.microphone_device = device
|
||||
self.telephone.set_microphone(self.microphone_device)
|
||||
|
||||
def set_ringer(self, device):
|
||||
self.ringer_device = device
|
||||
self.telephone.set_ringer(self.ringer_device)
|
||||
|
||||
def announce(self, attached_interface=None):
|
||||
self.telephone.announce(attached_interface=attached_interface)
|
||||
|
||||
@property
|
||||
def is_available(self):
|
||||
return self.state == self.STATE_AVAILABLE
|
||||
|
||||
@property
|
||||
def is_in_call(self):
|
||||
return self.state == self.STATE_IN_CALL
|
||||
|
||||
@property
|
||||
def is_ringing(self):
|
||||
return self.state == self.STATE_RINGING
|
||||
|
||||
@property
|
||||
def call_is_connecting(self):
|
||||
return self.state == self.STATE_CONNECTING
|
||||
|
||||
@property
|
||||
def hw_is_idle(self):
|
||||
return self.hw_state == self.HW_STATE_IDLE
|
||||
|
||||
@property
|
||||
def hw_is_dialing(self):
|
||||
return self.hw_state == self.HW_STATE_DIAL
|
||||
|
||||
def start(self):
|
||||
if not self.should_run:
|
||||
self.should_run = True
|
||||
self.run()
|
||||
|
||||
def stop(self):
|
||||
self.should_run = False
|
||||
self.telephone.teardown()
|
||||
self.telephone = None
|
||||
|
||||
def hangup(self): self.telephone.hangup()
|
||||
def answer(self): self.telephone.answer(self.caller)
|
||||
def set_busy(self, busy): self.telephone.set_busy(busy)
|
||||
|
||||
def dial(self, identity_hash):
|
||||
self.last_dialled_identity_hash = identity_hash
|
||||
destination_hash = RNS.Destination.hash_from_name_and_identity("lxst.telephony", identity_hash)
|
||||
if RNS.Transport.has_path(destination_hash):
|
||||
call_hops = RNS.Transport.hops_to(destination_hash)
|
||||
cs = "" if call_hops == 1 else "s"
|
||||
RNS.log(f"Connecting call over {call_hops} hop{cs}...", RNS.LOG_DEBUG)
|
||||
identity = RNS.Identity.recall(destination_hash)
|
||||
self.call(identity)
|
||||
else:
|
||||
return "no_path"
|
||||
|
||||
def redial(self, args=None):
|
||||
if self.last_dialled_identity_hash: self.dial(self.last_dialled_identity_hash)
|
||||
|
||||
def call(self, remote_identity):
|
||||
RNS.log(f"Calling {RNS.prettyhexrep(remote_identity.hash)}...", RNS.LOG_DEBUG)
|
||||
self.state = self.STATE_CONNECTING
|
||||
self.caller = remote_identity
|
||||
self.direction = "to"
|
||||
self.telephone.call(self.caller)
|
||||
|
||||
def ringing(self, remote_identity):
|
||||
if self.hw_state == self.HW_STATE_SLEEP: self.hw_state = self.HW_STATE_IDLE
|
||||
self.state = self.STATE_RINGING
|
||||
self.caller = remote_identity
|
||||
self.direction = "from" if self.direction == None else "to"
|
||||
RNS.log(f"Incoming call from {RNS.prettyhexrep(self.caller.hash)}", RNS.LOG_DEBUG)
|
||||
if self.owner:
|
||||
self.owner.incoming_call(remote_identity)
|
||||
|
||||
def call_ended(self, remote_identity):
|
||||
if self.is_in_call or self.is_ringing or self.call_is_connecting:
|
||||
if self.is_in_call: RNS.log(f"Call with {RNS.prettyhexrep(self.caller.hash)} ended\n", RNS.LOG_DEBUG)
|
||||
if self.is_ringing: RNS.log(f"Call {self.direction} {RNS.prettyhexrep(self.caller.hash)} was not answered\n", RNS.LOG_DEBUG)
|
||||
if self.call_is_connecting: RNS.log(f"Call to {RNS.prettyhexrep(self.caller.hash)} could not be connected\n", RNS.LOG_DEBUG)
|
||||
self.direction = None
|
||||
self.state = self.STATE_AVAILABLE
|
||||
|
||||
def call_established(self, remote_identity):
|
||||
if self.call_is_connecting or self.is_ringing:
|
||||
self.state = self.STATE_IN_CALL
|
||||
RNS.log(f"Call established with {RNS.prettyhexrep(self.caller.hash)}", RNS.LOG_DEBUG)
|
||||
|
||||
def __is_allowed(self, identity_hash):
|
||||
if self.owner.config["voice_trusted_only"]:
|
||||
return self.owner.voice_is_trusted(identity_hash)
|
||||
else: return True
|
||||
|
||||
def __spin(self, until=None, msg=None, timeout=None):
|
||||
if msg: RNS.log(msg, RNS.LOG_DEBUG)
|
||||
if timeout != None: timeout = time.time()+timeout
|
||||
while (timeout == None or time.time()<timeout) and not until(): time.sleep(0.1)
|
||||
if timeout != None and time.time() > timeout:
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
@ -6,7 +6,6 @@ from kivy.uix.boxlayout import BoxLayout
|
||||
from kivy.properties import StringProperty, BooleanProperty
|
||||
from kivymd.uix.list import MDList, IconLeftWidget, IconRightWidget, OneLineAvatarIconListItem
|
||||
from kivymd.uix.menu import MDDropdownMenu
|
||||
from kivymd.toast import toast
|
||||
from kivy.uix.gridlayout import GridLayout
|
||||
from kivy.uix.boxlayout import BoxLayout
|
||||
from kivy.clock import Clock
|
||||
@ -54,7 +53,6 @@ class Conversations():
|
||||
self.app.root.ids.screen_manager.add_widget(self.screen)
|
||||
|
||||
self.conversation_dropdown = None
|
||||
self.voice_dropdown = None
|
||||
self.delete_dialog = None
|
||||
self.clear_dialog = None
|
||||
self.clear_telemetry_dialog = None
|
||||
@ -93,7 +91,6 @@ class Conversations():
|
||||
self.app.sideband.setstate("wants.viewupdate.conversations", False)
|
||||
|
||||
def trust_icon(self, conv):
|
||||
conv_type = conv["type"]
|
||||
context_dest = conv["dest"]
|
||||
unread = conv["unread"]
|
||||
appearance = self.app.sideband.peer_appearance(context_dest, conv=conv)
|
||||
@ -109,28 +106,25 @@ class Conversations():
|
||||
trust_icon = appearance[0] or da[0];
|
||||
|
||||
else:
|
||||
if conv_type == self.app.sideband.CONV_VOICE:
|
||||
trust_icon = "phone"
|
||||
else:
|
||||
if self.app.sideband.requests_allowed_from(context_dest):
|
||||
if unread:
|
||||
if is_trusted:
|
||||
trust_icon = "email-seal"
|
||||
else:
|
||||
trust_icon = "email"
|
||||
else:
|
||||
trust_icon = "account-lock-open"
|
||||
else:
|
||||
if self.app.sideband.requests_allowed_from(context_dest):
|
||||
if unread:
|
||||
if is_trusted:
|
||||
if unread:
|
||||
trust_icon = "email-seal"
|
||||
else:
|
||||
trust_icon = "account-check"
|
||||
trust_icon = "email-seal"
|
||||
else:
|
||||
if unread:
|
||||
trust_icon = "email"
|
||||
else:
|
||||
trust_icon = "account-question"
|
||||
trust_icon = "email"
|
||||
else:
|
||||
trust_icon = "account-lock-open"
|
||||
else:
|
||||
if is_trusted:
|
||||
if unread:
|
||||
trust_icon = "email-seal"
|
||||
else:
|
||||
trust_icon = "account-check"
|
||||
else:
|
||||
if unread:
|
||||
trust_icon = "email"
|
||||
else:
|
||||
trust_icon = "account-question"
|
||||
|
||||
return trust_icon
|
||||
|
||||
@ -172,7 +166,6 @@ class Conversations():
|
||||
|
||||
iconl._default_icon_pad = dp(ic_p)
|
||||
iconl.icon_size = dp(ic_s)
|
||||
iconl.conv_type = conv["type"]
|
||||
|
||||
return iconl
|
||||
|
||||
@ -194,7 +187,6 @@ class Conversations():
|
||||
|
||||
for conv in self.context_dests:
|
||||
context_dest = conv["dest"]
|
||||
conv_type = conv["type"]
|
||||
unread = conv["unread"]
|
||||
last_activity = conv["last_activity"]
|
||||
|
||||
@ -211,7 +203,6 @@ class Conversations():
|
||||
item.sb_uid = context_dest
|
||||
item.sb_unread = unread
|
||||
iconl.sb_uid = context_dest
|
||||
item.conv_type = conv_type
|
||||
|
||||
def gen_edit(item):
|
||||
def x():
|
||||
@ -292,7 +283,7 @@ class Conversations():
|
||||
|
||||
yes_button.bind(on_release=dl_yes)
|
||||
no_button.bind(on_release=dl_no)
|
||||
self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss()
|
||||
item.dmenu.dismiss()
|
||||
dialog.open()
|
||||
RNS.log("Generated edit dialog in "+str(RNS.prettytime(time.time()-t_s)), RNS.LOG_DEBUG)
|
||||
|
||||
@ -321,7 +312,7 @@ class Conversations():
|
||||
yes_button.bind(on_release=dl_yes)
|
||||
no_button.bind(on_release=dl_no)
|
||||
|
||||
self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss()
|
||||
item.dmenu.dismiss()
|
||||
self.clear_dialog.open()
|
||||
return x
|
||||
|
||||
@ -345,7 +336,7 @@ class Conversations():
|
||||
yes_button.bind(on_release=dl_yes)
|
||||
no_button.bind(on_release=dl_no)
|
||||
|
||||
self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss()
|
||||
item.dmenu.dismiss()
|
||||
self.clear_telemetry_dialog.open()
|
||||
return x
|
||||
|
||||
@ -371,61 +362,27 @@ class Conversations():
|
||||
yes_button.bind(on_release=dl_yes)
|
||||
no_button.bind(on_release=dl_no)
|
||||
|
||||
self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss()
|
||||
item.dmenu.dismiss()
|
||||
self.delete_dialog.open()
|
||||
return x
|
||||
|
||||
# def gen_move_to(item):
|
||||
# def x():
|
||||
# item.dmenu.dismiss()
|
||||
# self.app.sideband.conversation_set_object(self.conversation_dropdown.context_dest, not self.app.sideband.is_object(self.conversation_dropdown.context_dest))
|
||||
# self.app.conversations_view.update()
|
||||
# return x
|
||||
|
||||
def gen_copy_addr(item):
|
||||
def x():
|
||||
Clipboard.copy(RNS.hexrep(self.conversation_dropdown.context_dest, delimit=False))
|
||||
self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss()
|
||||
return x
|
||||
|
||||
def gen_call(item):
|
||||
def x():
|
||||
identity = RNS.Identity.recall(self.conversation_dropdown.context_dest)
|
||||
if identity: self.app.dial_action(identity.hash)
|
||||
else: toast("Can't call, identity unknown")
|
||||
self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss()
|
||||
item.dmenu.dismiss()
|
||||
return x
|
||||
|
||||
item.iconr = IconRightWidget(icon="dots-vertical");
|
||||
|
||||
if self.voice_dropdown == None:
|
||||
dmi_h = 40
|
||||
dmv_items = [
|
||||
{
|
||||
"viewclass": "OneLineListItem",
|
||||
"text": "Edit",
|
||||
"height": dp(dmi_h),
|
||||
"on_release": gen_edit(item)
|
||||
},
|
||||
{
|
||||
"text": "Copy Identity Hash",
|
||||
"viewclass": "OneLineListItem",
|
||||
"height": dp(dmi_h),
|
||||
"on_release": gen_copy_addr(item)
|
||||
},
|
||||
{
|
||||
"text": "Delete",
|
||||
"viewclass": "OneLineListItem",
|
||||
"height": dp(dmi_h),
|
||||
"on_release": gen_del(item)
|
||||
}
|
||||
]
|
||||
|
||||
self.voice_dropdown = MDDropdownMenu(
|
||||
caller=item.iconr,
|
||||
items=dmv_items,
|
||||
position="auto",
|
||||
width=dp(256),
|
||||
elevation=0,
|
||||
radius=dp(3),
|
||||
)
|
||||
self.voice_dropdown.effect_cls = ScrollEffect
|
||||
self.voice_dropdown.md_bg_color = self.app.color_hover
|
||||
|
||||
if self.conversation_dropdown == None:
|
||||
obj_str = "conversations" if is_object else "objects"
|
||||
dmi_h = 40
|
||||
dm_items = [
|
||||
{
|
||||
@ -434,18 +391,18 @@ class Conversations():
|
||||
"height": dp(dmi_h),
|
||||
"on_release": gen_edit(item)
|
||||
},
|
||||
{
|
||||
"viewclass": "OneLineListItem",
|
||||
"text": "Call",
|
||||
"height": dp(dmi_h),
|
||||
"on_release": gen_call(item)
|
||||
},
|
||||
{
|
||||
"text": "Copy Address",
|
||||
"viewclass": "OneLineListItem",
|
||||
"height": dp(dmi_h),
|
||||
"on_release": gen_copy_addr(item)
|
||||
},
|
||||
# {
|
||||
# "text": "Move to objects",
|
||||
# "viewclass": "OneLineListItem",
|
||||
# "height": dp(dmi_h),
|
||||
# "on_release": gen_move_to(item)
|
||||
# },
|
||||
{
|
||||
"text": "Clear Messages",
|
||||
"viewclass": "OneLineListItem",
|
||||
@ -477,15 +434,11 @@ class Conversations():
|
||||
self.conversation_dropdown.effect_cls = ScrollEffect
|
||||
self.conversation_dropdown.md_bg_color = self.app.color_hover
|
||||
|
||||
if conv_type == self.app.sideband.CONV_VOICE:
|
||||
item.dmenu = self.voice_dropdown
|
||||
else:
|
||||
item.dmenu = self.conversation_dropdown
|
||||
item.dmenu = self.conversation_dropdown
|
||||
|
||||
def callback_factory(ref, dest):
|
||||
def x(sender):
|
||||
self.conversation_dropdown.context_dest = dest
|
||||
self.voice_dropdown.context_dest = dest
|
||||
ref.dmenu.caller = ref.iconr
|
||||
ref.dmenu.open()
|
||||
return x
|
||||
@ -495,7 +448,6 @@ class Conversations():
|
||||
item.add_widget(item.iconr)
|
||||
|
||||
item.trusted = self.app.sideband.is_trusted(context_dest, conv_data=existing_conv)
|
||||
item.conv_type = conv_type
|
||||
|
||||
self.added_item_dests.append(context_dest)
|
||||
self.list.add_widget(item)
|
||||
@ -567,7 +519,7 @@ Builder.load_string("""
|
||||
orientation: "vertical"
|
||||
spacing: "24dp"
|
||||
size_hint_y: None
|
||||
height: dp(260)
|
||||
height: dp(250)
|
||||
|
||||
MDTextField:
|
||||
id: n_address_field
|
||||
@ -588,7 +540,7 @@ Builder.load_string("""
|
||||
orientation: "horizontal"
|
||||
size_hint_y: None
|
||||
padding: [0,0,dp(8),dp(24)]
|
||||
height: dp(24)
|
||||
height: dp(48)
|
||||
MDLabel:
|
||||
id: "trusted_switch_label"
|
||||
text: "Trusted"
|
||||
@ -599,21 +551,6 @@ Builder.load_string("""
|
||||
pos_hint: {"center_y": 0.3}
|
||||
active: False
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "horizontal"
|
||||
size_hint_y: None
|
||||
padding: [0,0,dp(8),dp(24)]
|
||||
height: dp(24)
|
||||
MDLabel:
|
||||
id: "trusted_switch_label"
|
||||
text: "Voice Only"
|
||||
font_style: "H6"
|
||||
|
||||
MDSwitch:
|
||||
id: n_voice_only
|
||||
pos_hint: {"center_y": 0.3}
|
||||
active: False
|
||||
|
||||
<ConvSettings>
|
||||
orientation: "vertical"
|
||||
spacing: "16dp"
|
||||
|
||||
@ -96,16 +96,6 @@ MDNavigationLayout:
|
||||
IconLeftWidget:
|
||||
icon: "account-voice"
|
||||
on_release: root.ids.screen_manager.app.announces_action(self)
|
||||
|
||||
|
||||
OneLineIconListItem:
|
||||
text: "Voice"
|
||||
on_release: root.ids.screen_manager.app.voice_action(self)
|
||||
# _no_ripple_effect: True
|
||||
|
||||
IconLeftWidget:
|
||||
icon: "phone-in-talk"
|
||||
on_release: root.ids.screen_manager.app.voice_action(self)
|
||||
|
||||
|
||||
# OneLineIconListItem:
|
||||
@ -1800,7 +1790,7 @@ MDScreen:
|
||||
height: dp(48)
|
||||
|
||||
MDLabel:
|
||||
text: "High-quality codec for LXMF PTT"
|
||||
text: "Use high-quality voice for PTT"
|
||||
font_style: "H6"
|
||||
|
||||
MDSwitch:
|
||||
@ -1809,22 +1799,6 @@ MDScreen:
|
||||
disabled: False
|
||||
active: False
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "horizontal"
|
||||
size_hint_y: None
|
||||
padding: [0,0,dp(24),dp(0)]
|
||||
height: dp(48)
|
||||
|
||||
MDLabel:
|
||||
text: "Enable voice calls"
|
||||
font_style: "H6"
|
||||
|
||||
MDSwitch:
|
||||
id: settings_voice_enabled
|
||||
pos_hint: {"center_y": 0.3}
|
||||
disabled: False
|
||||
active: False
|
||||
|
||||
# MDBoxLayout:
|
||||
# orientation: "horizontal"
|
||||
# size_hint_y: None
|
||||
|
||||
@ -730,23 +730,16 @@ class Messages():
|
||||
|
||||
if has_audio:
|
||||
def play_audio(sender):
|
||||
touch_event = None; block_play = False
|
||||
if sender and hasattr(sender, "last_touch"): touch_event = sender.last_touch
|
||||
if touch_event and hasattr(touch_event, "dpos"):
|
||||
delta = abs(touch_event.dpos[0]) + abs(touch_event.dpos[1])
|
||||
if delta >= 2.0: block_play = True
|
||||
self.app.play_audio_field(sender.audio_field)
|
||||
stored_color = sender.md_bg_color
|
||||
if sender.lsource == self.app.sideband.lxmf_destination.hash:
|
||||
sender.md_bg_color = mdc(c_delivered, intensity_play)
|
||||
else:
|
||||
sender.md_bg_color = mdc(c_received, intensity_play)
|
||||
|
||||
if not block_play:
|
||||
self.app.play_audio_field(sender.audio_field)
|
||||
stored_color = sender.md_bg_color
|
||||
if sender.lsource == self.app.sideband.lxmf_destination.hash:
|
||||
sender.md_bg_color = mdc(c_delivered, intensity_play)
|
||||
else:
|
||||
sender.md_bg_color = mdc(c_received, intensity_play)
|
||||
|
||||
def cb(dt):
|
||||
sender.md_bg_color = stored_color
|
||||
Clock.schedule_once(cb, 0.25)
|
||||
def cb(dt):
|
||||
sender.md_bg_color = stored_color
|
||||
Clock.schedule_once(cb, 0.25)
|
||||
|
||||
item.has_audio = True
|
||||
item.audio_size = len(audio_field[1])
|
||||
|
||||
@ -822,23 +822,17 @@ class RVDetails(MDRecycleView):
|
||||
if nhi and nhi != "None":
|
||||
self.entries.append({"icon": "routes", "text": f"Current path on [b]{nhi}[/b]", "on_release": pass_job})
|
||||
|
||||
if nh != RNS.Transport.PATHFINDER_M:
|
||||
hs = "hop" if nh == 1 else "hops"
|
||||
self.entries.append({"icon": "atom-variant", "text": f"Network distance is [b]{nh} {hs}[/b]", "on_release": pass_job})
|
||||
|
||||
try:
|
||||
ler = self.delegate.app.sideband.get_destination_establishment_rate(self.delegate.object_hash)
|
||||
mtu = self.delegate.app.sideband.get_destination_mtu(self.delegate.object_hash) or RNS.Reticulum.MTU
|
||||
edr = self.delegate.app.sideband.get_destination_edr(self.delegate.object_hash)
|
||||
if ler:
|
||||
lers = RNS.prettyspeed(ler, "b")
|
||||
mtus = RNS.prettysize(mtu)
|
||||
edrs = f"{RNS.prettyspeed(edr)}" if edr != None else ""
|
||||
self.entries.append({"icon": "lock-check-outline", "text": f"Link established, LER is [b]{lers}[/b], MTU is [b]{mtus}[/b]", "on_release": pass_job})
|
||||
if edr: self.entries.append({"icon": "approximately-equal", "text": f"Expected data rate is [b]{edrs}[/b]", "on_release": pass_job})
|
||||
self.entries.append({"icon": "lock-check-outline", "text": f"Direct link established, LER is [b]{lers}[/b]", "on_release": pass_job})
|
||||
except Exception as e:
|
||||
RNS.trace_exception(e)
|
||||
|
||||
if nh != RNS.Transport.PATHFINDER_M:
|
||||
hs = "hop" if nh == 1 else "hops"
|
||||
self.entries.append({"icon": "atom-variant", "text": f"Network distance is [b]{nh} {hs}[/b]", "on_release": pass_job})
|
||||
except Exception as e:
|
||||
RNS.trace_exception(e)
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ class Utilities():
|
||||
self.screen.delegate = self
|
||||
self.app.root.ids.screen_manager.add_widget(self.screen)
|
||||
|
||||
self.screen.ids.utilities_scrollview.effect_cls = ScrollEffect
|
||||
self.screen.ids.telemetry_scrollview.effect_cls = ScrollEffect
|
||||
info = "This section contains various utilities and diagnostics tools, "
|
||||
info += "that can be helpful while using Sideband and Reticulum."
|
||||
|
||||
@ -220,7 +220,7 @@ MDScreen:
|
||||
]
|
||||
|
||||
ScrollView:
|
||||
id: utilities_scrollview
|
||||
id: telemetry_scrollview
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "vertical"
|
||||
|
||||
@ -1,481 +0,0 @@
|
||||
import time
|
||||
import RNS
|
||||
|
||||
from typing import Union
|
||||
from kivy.metrics import dp,sp
|
||||
from kivy.lang.builder import Builder
|
||||
from kivy.core.clipboard import Clipboard
|
||||
from kivy.utils import escape_markup
|
||||
from kivymd.uix.recycleview import MDRecycleView
|
||||
from kivymd.uix.list import OneLineIconListItem
|
||||
from kivymd.uix.pickers import MDColorPicker
|
||||
from kivymd.uix.button import MDRectangleFlatButton
|
||||
from kivymd.uix.button import MDRectangleFlatIconButton
|
||||
from kivymd.uix.dialog import MDDialog
|
||||
from kivymd.icon_definitions import md_icons
|
||||
from kivymd.toast import toast
|
||||
from kivy.properties import StringProperty, BooleanProperty
|
||||
from kivy.effects.scroll import ScrollEffect
|
||||
from kivy.clock import Clock
|
||||
from sideband.sense import Telemeter
|
||||
import threading
|
||||
from datetime import datetime
|
||||
|
||||
if RNS.vendor.platformutils.get_platform() == "android":
|
||||
from ui.helpers import ts_format
|
||||
from android.permissions import request_permissions, check_permission
|
||||
else:
|
||||
from .helpers import ts_format
|
||||
|
||||
class Voice():
|
||||
def __init__(self, app):
|
||||
self.app = app
|
||||
self.screen = None
|
||||
self.settings_screen = None
|
||||
self.dial_target = None
|
||||
self.ui_updater = None
|
||||
self.path_requesting = None
|
||||
self.output_devices = []
|
||||
self.input_devices = []
|
||||
self.listed_output_devices = []
|
||||
self.listed_input_devices = []
|
||||
self.listed_ringer_devices = []
|
||||
|
||||
if not self.app.root.ids.screen_manager.has_screen("voice_screen"):
|
||||
self.screen = Builder.load_string(layout_voice_screen)
|
||||
self.screen.app = self.app
|
||||
self.screen.delegate = self
|
||||
self.app.root.ids.screen_manager.add_widget(self.screen)
|
||||
|
||||
self.screen.ids.voice_scrollview.effect_cls = ScrollEffect
|
||||
|
||||
def update_call_status(self, dt=None):
|
||||
if self.app.root.ids.screen_manager.current == "voice_screen":
|
||||
if self.ui_updater == None: self.ui_updater = Clock.schedule_interval(self.update_call_status, 0.5)
|
||||
else:
|
||||
if self.ui_updater:
|
||||
self.ui_updater.cancel()
|
||||
self.ui_updater = None
|
||||
|
||||
db = self.screen.ids.dial_button
|
||||
ih = self.screen.ids.identity_hash
|
||||
if self.app.sideband.voice_running:
|
||||
telephone = self.app.sideband.telephone
|
||||
if self.path_requesting:
|
||||
db.disabled = True
|
||||
ih.disabled = True
|
||||
|
||||
else:
|
||||
if telephone.is_available:
|
||||
ih.disabled = False
|
||||
self.target_input_action(ih)
|
||||
else:
|
||||
ih.disabled = True
|
||||
|
||||
if telephone.is_in_call or telephone.call_is_connecting:
|
||||
ih.disabled = True
|
||||
db.disabled = False
|
||||
db.text = "Hang up"
|
||||
db.icon = "phone-hangup"
|
||||
|
||||
elif telephone.is_ringing:
|
||||
ih.disabled = True
|
||||
db.disabled = False
|
||||
db.text = "Answer"
|
||||
db.icon = "phone-ring"
|
||||
if telephone.caller: ih.text = RNS.hexrep(telephone.caller.hash, delimit=False)
|
||||
|
||||
else:
|
||||
db.disabled = True; db.text = "Voice calls disabled"
|
||||
ih.disabled = True
|
||||
|
||||
def target_valid(self):
|
||||
if self.app.sideband.voice_running:
|
||||
db = self.screen.ids.dial_button
|
||||
db.disabled = False; db.text = "Call"
|
||||
db.icon = "phone-outgoing"
|
||||
|
||||
def target_invalid(self):
|
||||
if self.app.sideband.voice_running:
|
||||
db = self.screen.ids.dial_button
|
||||
db.disabled = True; db.text = "Call"
|
||||
db.icon = "phone-outgoing"
|
||||
|
||||
def target_input_action(self, sender):
|
||||
if sender:
|
||||
target_hash = sender.text
|
||||
if len(target_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8*2:
|
||||
try:
|
||||
identity_hash = bytes.fromhex(target_hash)
|
||||
self.dial_target = identity_hash
|
||||
self.target_valid()
|
||||
|
||||
except Exception as e: self.target_invalid()
|
||||
else: self.target_invalid()
|
||||
|
||||
def request_path(self, destination_hash):
|
||||
if not self.path_requesting:
|
||||
self.app.sideband.telephone.set_busy(True)
|
||||
toast("Requesting path...")
|
||||
self.screen.ids.dial_button.disabled = True
|
||||
self.path_requesting = destination_hash
|
||||
RNS.Transport.request_path(destination_hash)
|
||||
threading.Thread(target=self._path_wait_job, daemon=True).start()
|
||||
|
||||
else:
|
||||
toast("Waiting for path request answer...")
|
||||
|
||||
def _path_wait_job(self):
|
||||
timeout = time.time()+self.app.sideband.telephone.PATH_TIME
|
||||
while not RNS.Transport.has_path(self.path_requesting) and time.time() < timeout:
|
||||
time.sleep(0.25)
|
||||
|
||||
self.app.sideband.telephone.set_busy(False)
|
||||
if RNS.Transport.has_path(self.path_requesting):
|
||||
RNS.log(f"Calling {RNS.prettyhexrep(self.dial_target)}...", RNS.LOG_DEBUG)
|
||||
self.app.sideband.telephone.dial(self.dial_target)
|
||||
Clock.schedule_once(self.update_call_status, 0.1)
|
||||
|
||||
else:
|
||||
Clock.schedule_once(self._path_request_failed, 0.05)
|
||||
Clock.schedule_once(self.update_call_status, 0.1)
|
||||
|
||||
self.path_requesting = None
|
||||
self.update_call_status()
|
||||
|
||||
def _path_request_failed(self, dt):
|
||||
toast("Path request timed out")
|
||||
|
||||
def dial_action(self, sender=None):
|
||||
if self.app.sideband.voice_running:
|
||||
if self.app.sideband.telephone.is_available:
|
||||
|
||||
destination_hash = RNS.Destination.hash_from_name_and_identity("lxst.telephony", self.dial_target)
|
||||
if not RNS.Transport.has_path(destination_hash):
|
||||
self.request_path(destination_hash)
|
||||
|
||||
else:
|
||||
RNS.log(f"Calling {RNS.prettyhexrep(self.dial_target)}...", RNS.LOG_DEBUG)
|
||||
self.app.sideband.telephone.dial(self.dial_target)
|
||||
self.update_call_status()
|
||||
|
||||
elif self.app.sideband.telephone.is_in_call or self.app.sideband.telephone.call_is_connecting:
|
||||
RNS.log(f"Hanging up", RNS.LOG_DEBUG)
|
||||
self.app.sideband.telephone.hangup()
|
||||
self.update_call_status()
|
||||
|
||||
elif self.app.sideband.telephone.is_ringing:
|
||||
RNS.log(f"Answering", RNS.LOG_DEBUG)
|
||||
self.app.sideband.telephone.answer()
|
||||
self.update_call_status()
|
||||
|
||||
|
||||
### settings screen
|
||||
######################################
|
||||
|
||||
def settings_action(self, sender=None):
|
||||
if not self.app.root.ids.screen_manager.has_screen("voice_settings_screen"):
|
||||
self.voice_settings_screen = Builder.load_string(layout_voice_settings_screen)
|
||||
self.voice_settings_screen.app = self.app
|
||||
self.voice_settings_screen.delegate = self
|
||||
self.app.root.ids.screen_manager.add_widget(self.voice_settings_screen)
|
||||
|
||||
self.app.root.ids.screen_manager.transition.direction = "left"
|
||||
self.app.root.ids.screen_manager.current = "voice_settings_screen"
|
||||
self.voice_settings_screen.ids.voice_settings_scrollview.effect_cls = ScrollEffect
|
||||
self.app.sideband.setstate("app.displaying", self.app.root.ids.screen_manager.current)
|
||||
|
||||
self.update_settings_screen()
|
||||
|
||||
def update_devices(self):
|
||||
import LXST
|
||||
self.output_devices = []; self.input_devices = []
|
||||
for device in LXST.Sources.Backend().soundcard.all_speakers(): self.output_devices.append(device.name)
|
||||
for device in LXST.Sinks.Backend().soundcard.all_microphones(): self.input_devices.append(device.name)
|
||||
if self.app.sideband.config["voice_output"] != None:
|
||||
if not self.app.sideband.config["voice_output"] in self.output_devices: self.output_devices.append(self.app.sideband.config["voice_output"])
|
||||
if self.app.sideband.config["voice_input"] != None:
|
||||
if not self.app.sideband.config["voice_input"] in self.input_devices: self.input_devices.append(self.app.sideband.config["voice_input"])
|
||||
if self.app.sideband.config["voice_ringer"] != None:
|
||||
if not self.app.sideband.config["voice_ringer"] in self.output_devices: self.output_devices.append(self.app.sideband.config["voice_ringer"])
|
||||
|
||||
def update_settings_screen(self, sender=None):
|
||||
self.voice_settings_screen.ids.voice_trusted_only.active = self.app.sideband.config["voice_trusted_only"]
|
||||
self.voice_settings_screen.ids.voice_trusted_only.bind(active=self.settings_save_action)
|
||||
|
||||
bp = 6; ml = 45; fs = 16; ics = 14
|
||||
self.update_devices()
|
||||
|
||||
# Output devices
|
||||
if not "system_default" in self.listed_output_devices:
|
||||
default_output_button = MDRectangleFlatIconButton(text="System Default", font_size=dp(fs), icon_size=dp(ics), on_release=self.output_device_action)
|
||||
default_output_button.device = None; default_output_button.size_hint = [1.0, None]
|
||||
if self.app.sideband.config["voice_output"] == None: default_output_button.icon = "check"
|
||||
self.voice_settings_screen.ids.output_devices.add_widget(default_output_button)
|
||||
self.listed_output_devices.append("system_default")
|
||||
|
||||
for device in self.output_devices:
|
||||
if not device in self.listed_output_devices:
|
||||
label = device if len(device) < ml else device[:ml-3]+"..."
|
||||
device_button = MDRectangleFlatIconButton(text=label, font_size=dp(fs), icon_size=dp(ics), on_release=self.output_device_action)
|
||||
device_button.padding = [dp(bp), dp(bp), dp(bp), dp(bp)]; device_button.size_hint = [1.0, None]
|
||||
if self.app.sideband.config["voice_output"] == device: device_button.icon = "check"
|
||||
device_button.device = device
|
||||
self.voice_settings_screen.ids.output_devices.add_widget(device_button)
|
||||
self.listed_output_devices.append(device)
|
||||
|
||||
# Input devices
|
||||
if not "system_default" in self.listed_input_devices:
|
||||
default_input_button = MDRectangleFlatIconButton(text="System Default", font_size=dp(fs), icon_size=dp(ics), on_release=self.input_device_action)
|
||||
default_input_button.device = None; default_input_button.size_hint = [1.0, None]
|
||||
if self.app.sideband.config["voice_output"] == None: default_input_button.icon = "check"
|
||||
self.voice_settings_screen.ids.input_devices.add_widget(default_input_button)
|
||||
self.listed_input_devices.append("system_default")
|
||||
|
||||
for device in self.input_devices:
|
||||
if not device in self.listed_input_devices:
|
||||
label = device if len(device) < ml else device[:ml-3]+"..."
|
||||
device_button = MDRectangleFlatIconButton(text=label, font_size=dp(fs), icon_size=dp(ics), on_release=self.input_device_action)
|
||||
device_button.padding = [dp(bp), dp(bp), dp(bp), dp(bp)]; device_button.size_hint = [1.0, None]
|
||||
if self.app.sideband.config["voice_input"] == device: device_button.icon = "check"
|
||||
device_button.device = device
|
||||
self.voice_settings_screen.ids.input_devices.add_widget(device_button)
|
||||
self.listed_input_devices.append(device)
|
||||
|
||||
# Ringer devices
|
||||
if not "system_default" in self.listed_ringer_devices:
|
||||
default_ringer_button = MDRectangleFlatIconButton(text="System Default", font_size=dp(fs), icon_size=dp(ics), on_release=self.ringer_device_action)
|
||||
default_ringer_button.device = None; default_ringer_button.size_hint = [1.0, None]
|
||||
if self.app.sideband.config["voice_ringer"] == None: default_ringer_button.icon = "check"
|
||||
self.voice_settings_screen.ids.ringer_devices.add_widget(default_ringer_button)
|
||||
self.listed_ringer_devices.append("system_default")
|
||||
|
||||
for device in self.output_devices:
|
||||
if not device in self.listed_ringer_devices:
|
||||
label = device if len(device) < ml else device[:ml-3]+"..."
|
||||
device_button = MDRectangleFlatIconButton(text=label, font_size=dp(fs), icon_size=dp(ics), on_release=self.ringer_device_action)
|
||||
device_button.padding = [dp(bp), dp(bp), dp(bp), dp(bp)]; device_button.size_hint = [1.0, None]
|
||||
if self.app.sideband.config["voice_ringer"] == device: device_button.icon = "check"
|
||||
device_button.device = device
|
||||
self.voice_settings_screen.ids.ringer_devices.add_widget(device_button)
|
||||
self.listed_ringer_devices.append(device)
|
||||
|
||||
def settings_save_action(self, sender=None, event=None):
|
||||
self.app.sideband.config["voice_trusted_only"] = self.voice_settings_screen.ids.voice_trusted_only.active
|
||||
self.app.sideband.save_configuration()
|
||||
|
||||
def output_device_action(self, sender=None):
|
||||
self.app.sideband.config["voice_output"] = sender.device
|
||||
self.app.sideband.save_configuration()
|
||||
for w in self.voice_settings_screen.ids.output_devices.children: w.icon = ""
|
||||
sender.icon = "check"
|
||||
if self.app.sideband.telephone:
|
||||
self.app.sideband.telephone.set_speaker(self.app.sideband.config["voice_output"])
|
||||
|
||||
def input_device_action(self, sender=None):
|
||||
self.app.sideband.config["voice_input"] = sender.device
|
||||
self.app.sideband.save_configuration()
|
||||
for w in self.voice_settings_screen.ids.input_devices.children: w.icon = ""
|
||||
sender.icon = "check"
|
||||
if self.app.sideband.telephone:
|
||||
self.app.sideband.telephone.set_microphone(self.app.sideband.config["voice_input"])
|
||||
|
||||
def ringer_device_action(self, sender=None):
|
||||
self.app.sideband.config["voice_ringer"] = sender.device
|
||||
self.app.sideband.save_configuration()
|
||||
for w in self.voice_settings_screen.ids.ringer_devices.children: w.icon = ""
|
||||
sender.icon = "check"
|
||||
if self.app.sideband.telephone:
|
||||
self.app.sideband.telephone.set_ringer(self.app.sideband.config["voice_ringer"])
|
||||
|
||||
|
||||
layout_voice_screen = """
|
||||
MDScreen:
|
||||
name: "voice_screen"
|
||||
|
||||
BoxLayout:
|
||||
orientation: "vertical"
|
||||
|
||||
MDTopAppBar:
|
||||
title: "Voice"
|
||||
anchor_title: "left"
|
||||
elevation: 0
|
||||
left_action_items:
|
||||
[['menu', lambda x: root.app.nav_drawer.set_state("open")]]
|
||||
right_action_items:
|
||||
[
|
||||
['wrench-cog', lambda x: root.delegate.settings_action(self)],
|
||||
['close', lambda x: root.app.close_any_action(self)],
|
||||
]
|
||||
|
||||
ScrollView:
|
||||
id: voice_scrollview
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "vertical"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(28), dp(32), dp(28), dp(16)]
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "vertical"
|
||||
# spacing: "24dp"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(0), dp(12), dp(0), dp(0)]
|
||||
|
||||
MDTextField:
|
||||
id: identity_hash
|
||||
hint_text: "Identity hash"
|
||||
mode: "rectangle"
|
||||
# size_hint: [1.0, None]
|
||||
pos_hint: {"center_x": .5}
|
||||
max_text_length: 32
|
||||
on_text: root.delegate.target_input_action(self)
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "vertical"
|
||||
spacing: "24dp"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(0), dp(35), dp(0), dp(35)]
|
||||
|
||||
MDRectangleFlatIconButton:
|
||||
id: dial_button
|
||||
icon: "phone-outgoing"
|
||||
text: "Call"
|
||||
padding: [dp(0), dp(14), dp(0), dp(14)]
|
||||
icon_size: dp(24)
|
||||
font_size: dp(16)
|
||||
size_hint: [1.0, None]
|
||||
on_release: root.delegate.dial_action(self)
|
||||
disabled: True
|
||||
"""
|
||||
|
||||
layout_voice_settings_screen = """
|
||||
MDScreen:
|
||||
name: "voice_settings_screen"
|
||||
|
||||
BoxLayout:
|
||||
orientation: "vertical"
|
||||
|
||||
MDTopAppBar:
|
||||
id: top_bar
|
||||
title: "Voice Configuration"
|
||||
anchor_title: "left"
|
||||
elevation: 0
|
||||
left_action_items:
|
||||
[['menu', lambda x: root.app.nav_drawer.set_state("open")]]
|
||||
right_action_items:
|
||||
[
|
||||
['close', lambda x: root.app.close_sub_voice_action(self)],
|
||||
]
|
||||
|
||||
MDScrollView:
|
||||
id: voice_settings_scrollview
|
||||
size_hint_x: 1
|
||||
size_hint_y: None
|
||||
size: [root.width, root.height-root.ids.top_bar.height]
|
||||
do_scroll_x: False
|
||||
do_scroll_y: True
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "vertical"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(28), dp(48), dp(28), dp(16)]
|
||||
|
||||
MDLabel:
|
||||
text: "Call Handling"
|
||||
font_style: "H6"
|
||||
height: self.texture_size[1]
|
||||
padding: [dp(0), dp(0), dp(0), dp(12)]
|
||||
|
||||
MDLabel:
|
||||
id: voice_settings_info
|
||||
markup: True
|
||||
text: "You can block calls from all other callers than contacts marked as trusted, by enabling the following option."
|
||||
size_hint_y: None
|
||||
text_size: self.width, None
|
||||
height: self.texture_size[1]
|
||||
padding: [dp(0), dp(16), dp(0), dp(16)]
|
||||
|
||||
MDBoxLayout:
|
||||
orientation: "horizontal"
|
||||
padding: [0,0,dp(24),0]
|
||||
size_hint_y: None
|
||||
height: dp(48)
|
||||
|
||||
MDLabel:
|
||||
text: "Block non-trusted callers"
|
||||
font_style: "H6"
|
||||
|
||||
MDSwitch:
|
||||
id: voice_trusted_only
|
||||
pos_hint: {"center_y": 0.3}
|
||||
active: False
|
||||
|
||||
MDLabel:
|
||||
text: "Audio Devices"
|
||||
font_style: "H6"
|
||||
padding: [dp(0), dp(96), dp(0), dp(12)]
|
||||
|
||||
MDLabel:
|
||||
id: voice_settings_info
|
||||
markup: True
|
||||
text: "You can configure which audio devices Sideband will use for voice calls, by selecting either the system default device, or specific audio devices available."
|
||||
size_hint_y: None
|
||||
text_size: self.width, None
|
||||
height: self.texture_size[1]
|
||||
padding: [dp(0), dp(64), dp(0), dp(32)]
|
||||
|
||||
MDLabel:
|
||||
text: "[b]Output[/b]"
|
||||
font_size: dp(18)
|
||||
markup: True
|
||||
|
||||
MDBoxLayout:
|
||||
id: output_devices
|
||||
orientation: "vertical"
|
||||
spacing: "12dp"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(0), dp(24), dp(0), dp(48)]
|
||||
|
||||
# MDRectangleFlatIconButton:
|
||||
# id: output_default_button
|
||||
# text: "System Default"
|
||||
# padding: [dp(0), dp(14), dp(0), dp(14)]
|
||||
# icon_size: dp(24)
|
||||
# font_size: dp(16)
|
||||
# size_hint: [1.0, None]
|
||||
# on_release: root.delegate.output_device_action(self)
|
||||
# disabled: False
|
||||
|
||||
MDLabel:
|
||||
text: "[b]Input[/b]"
|
||||
font_size: dp(18)
|
||||
markup: True
|
||||
|
||||
MDBoxLayout:
|
||||
id: input_devices
|
||||
orientation: "vertical"
|
||||
spacing: "12dp"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(0), dp(24), dp(0), dp(48)]
|
||||
|
||||
MDLabel:
|
||||
text: "[b]Ringer[/b]"
|
||||
font_size: dp(18)
|
||||
markup: True
|
||||
|
||||
MDBoxLayout:
|
||||
id: ringer_devices
|
||||
orientation: "vertical"
|
||||
spacing: "12dp"
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
padding: [dp(0), dp(24), dp(0), dp(48)]
|
||||
|
||||
"""
|
||||
6
setup.py
6
setup.py
@ -114,8 +114,8 @@ setuptools.setup(
|
||||
]
|
||||
},
|
||||
install_requires=[
|
||||
"rns>=0.9.4",
|
||||
"lxmf>=0.6.3",
|
||||
"rns>=0.9.2",
|
||||
"lxmf>=0.6.0",
|
||||
"kivy>=2.3.0",
|
||||
"pillow>=10.2.0",
|
||||
"qrcode",
|
||||
@ -123,14 +123,12 @@ setuptools.setup(
|
||||
"ffpyplayer",
|
||||
"sh",
|
||||
"numpy<=1.26.4",
|
||||
"lxst>=0.2.7",
|
||||
"mistune>=3.0.2",
|
||||
"beautifulsoup4",
|
||||
"pycodec2;sys.platform!='Windows' and sys.platform!='win32' and sys.platform!='darwin'",
|
||||
"pyaudio;sys.platform=='linux'",
|
||||
"pyobjus;sys.platform=='darwin'",
|
||||
"pyogg;sys.platform=='Windows' and sys.platform!='win32'",
|
||||
"audioop-lts>=0.2.1;python_version>='3.13'"
|
||||
],
|
||||
python_requires='>=3.7',
|
||||
)
|
||||
|
||||
@ -36,7 +36,6 @@ def extra_datas(mydir):
|
||||
a.datas += extra_datas('sbapp')
|
||||
a.datas += extra_datas('RNS')
|
||||
a.datas += extra_datas('LXMF')
|
||||
a.datas += extra_datas('LXST')
|
||||
|
||||
exe = EXE(
|
||||
pyz,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user