2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 06:35:09 +00:00

Compare commits

..

16 Commits
v0.8 ... v0.8d

Author SHA1 Message Date
Albert Vaca
53031a0ff1 Increased version number to release 2015-03-07 20:16:19 -08:00
Albert Vaca
459fe403a8 Increased the maximum length of incoming NetworkPackages from 1KB to 512KB
BUG: 343417
2015-03-07 20:13:35 -08:00
Albert Vaca
c15263b416 MPRIS Activity kept the last song played while showing "No players found" 2015-03-07 13:44:45 -08:00
Albert Vaca
6e2b3289e6 Increased version number to release 2015-03-07 13:37:03 -08:00
Albert Vaca
7d7f10f022 MPRIS Activity didn't get any info from the plugin if there were no players 2015-03-07 13:31:09 -08:00
Vineet Garg
ea514c0a19 Previous commit was blocking links.add(link) for unpaired devices
Public key was set to null for unpaired devices and its Base64 encoding
was causing an exception.

REVIEW: 122806
2015-03-04 18:32:55 -08:00
l10n daemon script
1e34a42b8f SVN_SILENT made messages (after extraction) 2015-03-03 03:06:33 +00:00
Albert Vaca
db3f4a2fec We now update the name of a device if it changed the next time we see it 2015-03-01 20:57:45 -08:00
Albert Vaca
63a3b6afe4 Fixed crash when answering a pair request after the device is gone 2015-03-01 19:19:11 -08:00
Albert Vaca
66c137d11d Increased version number to release 2015-03-01 16:08:13 -08:00
Albert Vaca
7f26472665 Fixed crash when browsing the settings if the device got disconnected. 2015-03-01 16:06:49 -08:00
l10n daemon script
3c3cfa9c94 SVN_SILENT made messages (after extraction) 2015-03-01 02:13:28 +00:00
l10n daemon script
7f808a2e0f SVN_SILENT made messages (after extraction) 2015-02-27 02:17:02 +00:00
l10n daemon script
970f8c63b0 SVN_SILENT made messages (after extraction) 2015-02-26 02:06:37 +00:00
l10n daemon script
d2dbfd6384 SVN_SILENT made messages (after extraction) 2015-02-23 02:17:59 +00:00
l10n daemon script
d1b2cba609 SVN_SILENT made messages (after extraction) 2015-02-21 02:22:00 +00:00
12 changed files with 196 additions and 46 deletions

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.kde.kdeconnect_tp"
android:versionCode="800"
android:versionName="0.8">
android:versionCode="804"
android:versionName="0.8d">
<uses-sdk android:minSdkVersion="9"
android:targetSdkVersion="21" />

View File

@@ -1,20 +1,126 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="pref_plugin_telephony">Telefonski obavještavač</string>
<string name="pref_plugin_telephony_desc">Pošalji notifikacije za SMS i pozive</string>
<string name="pref_plugin_battery">Baterijski izvještaj</string>
<string name="pref_plugin_battery_desc">Periodično javi baterijski status</string>
<string name="pref_plugin_sftp">Otkrivanje datotečnog sistema</string>
<string name="pref_plugin_sftp_desc">Dopušta daljinsko pretraživanje datotečnog sistema telefona</string>
<string name="pref_plugin_clipboard">Sinhronizovanje sandučića</string>
<string name="pref_plugin_clipboard_desc">Podijeli sadržaj sandučića</string>
<string name="pref_plugin_mousepad">Daljinska kontrola ulaza</string>
<string name="pref_plugin_mousepad_desc">Koristi telofon kao miš i tastaturu</string>
<string name="pref_plugin_mpris">Daljinske kontrole multimedije</string>
<string name="pref_plugin_mpris_desc">Upravljajte zvukom/slikom sa vašeg telefona</string>
<string name="pref_plugin_ping">Ping</string>
<string name="pref_plugin_ping_desc">Šalji i primaj ping-ove</string>
<string name="pref_plugin_notifications">Sinhronizovano obavještenje</string>
<string name="pref_plugin_notifications_desc">Pristupite vašim notifikacijama sa drugog uređaja</string>
<string name="pref_plugin_sharereceiver">Podijeli prijemnik</string>
<string name="pref_plugin_sharereceiver_desc">Spasi dolazeće datoteke na telefonsku memoriju</string>
<string name="plugin_not_available">Ovo svojstvo nije dostupno i vašoj Android verziji</string>
<string name="device_list_empty">Nema uređaja</string>
<string name="ok">OK</string>
<string name="cancel">Prekini</string>
<string name="open_settings">Otvori postavke</string>
<string name="no_permissions">Morate odobriti dopuštenje da pristupite notifikacijama</string>
<string name="send_ping">Pošalji ping</string>
<string name="open_mpris_controls">Otvori daljinsku kontrolu</string>
<string name="open_mousepad">Otvori touchpad kontrolu</string>
<string name="mousepad_info">Pomjerite prst na ekranu da opmjerite kursor miša. Tapnite za klik i koristite dva ili tri prsta za srednje i desno dugme. Koristite dugi pritisak za prevlačenje.</string>
<string name="mousepad_double_tap_settings_title">Postavite akciju tapa sa dva prsta</string>
<string name="mousepad_triple_tap_settings_title">Postavite akciju tapa sa tri prsta</string>
<string-array name="mousepad_tap_entries">
<item>Right click</item>
<item>Middle click</item>
<item>Nothing</item>
<item>Desni klik</item>
<item>Srednji klik</item>
<item>Ništa</item>
</string-array>
<string name="mousepad_double_default">desno</string>
<string name="mousepad_triple_default">Srednje</string>
<string name="category_connected_devices">Spojeni uređaji</string>
<string name="category_not_paired_devices">Dostupni uređaji</string>
<string name="category_remembered_devices">Zapamćeni uređaji</string>
<string name="plugins_failed_to_load">Dodaci se nisu uspjeli učitati (kucnite za više informacija):</string>
<string name="device_menu_plugins">Postavke dodatka</string>
<string name="device_menu_unpair">Razdvoji</string>
<string name="device_not_reachable">Upareni uređaj nije dostupan</string>
<string name="unknown_device">Nepoznat uređaj</string>
<string name="error_not_reachable">Uređaj nije dostupan</string>
<string name="error_already_requested">Uparivanje već zatraženo</string>
<string name="error_already_paired">Uređaj već uparen</string>
<string name="error_could_not_send_package">Nije moguće poslati paket</string>
<string name="error_timed_out">Isteklo</string>
<string name="error_canceled_by_user">Prekinuo korisnik</string>
<string name="error_canceled_by_other_peer">Prekinuo drugi korisnik</string>
<string name="error_invalid_key">Primljen pogrešan ključ</string>
<string name="pair_requested">Uparivanje zatraženo</string>
<string name="pairing_request_from">Uparivanje zatraženo od %1s</string>
<string name="received_url_title">Primljena veza od %1s</string>
<string name="received_url_text">Kucni za otvaranje \'%1s\'</string>
<string name="incoming_file_title">Dolazna datoteka od %1s</string>
<string name="incoming_file_text">%1s</string>
<string name="outgoing_file_title">Slanje datoteke na %1s</string>
<string name="outgoing_file_text">%1s</string>
<string name="received_file_title">Primljena datoteka od %1s</string>
<string name="received_file_text">Kucni za otvaranje \'%1s\'</string>
<string name="sent_file_title">Poslana datoteka na %1s</string>
<string name="sent_file_text">%1s</string>
<string name="sent_file_failed_title">Neuspjelo slanje datoteke %1s</string>
<string name="sent_file_failed_text">%1s</string>
<string name="tap_to_answer">Kucni za odgovor</string>
<string name="reconnect">Ponovo uspostavi vezu</string>
<string name="right_click">Pošalji Desni Klik</string>
<string name="middle_click">Pošalji Srednji Klik</string>
<string name="show_keyboard">Pokaži Tastaturu</string>
<string name="device_not_paired">Uređaj nije uparen</string>
<string name="request_pairing">Zatraži uparivanje</string>
<string name="pairing_accept">Prihvati</string>
<string name="pairing_reject">Odbij</string>
<string name="device">Uređaj</string>
<string name="pair_device">Upari uređaj</string>
<string name="remote_control">Daljinska kontrola</string>
<string name="settings">KDE Postavke Veze</string>
<string name="mpris_play">Reprodukuj</string>
<string name="mpris_previous">Prethodni</string>
<string name="mpris_rew">Premotaj</string>
<string name="mpris_ff">Ubrzano</string>
<string name="mpris_next">Sljedeći</string>
<string name="mpris_volume">Glasnoća</string>
<string name="mpris_settings">Postavke multimedije</string>
<string name="mpris_time_settings_title">Dugmad za naprijed/premotavanje</string>
<string name="mpris_time_settings_summary">Postavi vrijeme na ubrzano ili premotaj multimedijalnu datoteku.</string>
<string-array name="mpris_time_entries">
<item>10 seconds</item>
<item>20 seconds</item>
<item>30 seconds</item>
<item>1 minute</item>
<item>2 minutes</item>
<item>10 sekundi</item>
<item>20 sekundi</item>
<item>30 sekundi</item>
<item>1 minuta</item>
<item>2 minute</item>
</string-array>
<string name="share_to">Podijeli na...</string>
<string name="protocol_version_older">Ovaj uređaj koristi staru verziju protokola</string>
<string name="protocol_version_newer">Ovaj uređaj koristi noviju verziju protokola</string>
<string name="general_settings">Opšte postavke</string>
<string name="plugin_settings">Postavke</string>
<string name="plugin_settings_with_name">%s Postavke</string>
<string name="device_name">Naziv uređaja</string>
<string name="device_name_preference_summary">%s</string>
<string name="invalid_device_name">Pogrešnan naziv uređaja</string>
<string name="shareplugin_text_saved">Primljeni tekst, spašen u ormarić</string>
<string name="custom_devices_settings">Lista vlastitih uređaja</string>
<string name="custom_device_list">Dodaj uređaje po IP</string>
<string name="share_notification_preference">Glasne notifikacije</string>
<string name="share_notification_preference_summary">Vibriraj i reprodukuj zvuk kad se prima datoteka</string>
<string name="title_activity_notification_filter">Filter napomena</string>
<string name="filter_apps_info">Notifikacije će biti sinhronizovane s izabranim aplikacijama.</string>
<string name="sftp_internal_storage">Unutrašnji smještaj</string>
<string name="sftp_all_files">Sve fajlove</string>
<string name="sftp_sdcard_num">SD kartica %d</string>
<string name="sftp_sdcard">SD kartica</string>
<string name="sftp_readonly">(samo za čitanje)</string>
<string name="sftp_camera">Slike sa kamere</string>
<string name="add_host">Dodaj host/IP</string>
<string name="add_host_hint">IP ili ime računara</string>
<string name="no_players_connected">Nema nađenih igrača</string>
<string name="custom_dev_list_help">Koristite ovu opciju samo ako vaš uređaj nije automatski otkriven. Unesite IP adresu ili ime hosta i dodirnite dugme da dodate na listu. Dodirnite postojeće dume da uklonite s liste.</string>
<string name="mpris_player_on_device">%1$s na %2$s</string>
</resources>

View File

@@ -119,6 +119,7 @@
<string name="sftp_readonly">(skrivebeskyttet)</string>
<string name="sftp_camera">Kamerabilleder</string>
<string name="add_host">Tilføj vært/IP</string>
<string name="add_host_hint">Værtsnavn eller IP</string>
<string name="no_players_connected">Ingen afspillere fundet</string>
<string name="custom_dev_list_help">Brug kun denne indstilling hvis din enhed ikke opdages automatisk. Angiv IP-adresse eller værtsnavn nedenfor og tryk på knappen for at føje den til listen. Tryk på et eksisterende element for at fjerne det fra listen.</string>
<string name="mpris_player_on_device">%1$s på %2$s</string>

View File

@@ -59,8 +59,14 @@
<string name="received_url_text">Pulse para abrir «%1s»</string>
<string name="incoming_file_title">Archivo entrante desde %1s</string>
<string name="incoming_file_text">%1s</string>
<string name="outgoing_file_title">Enviando archivo a %1s</string>
<string name="outgoing_file_text">%1s</string>
<string name="received_file_title">Archivo recibido desde %1s</string>
<string name="received_file_text">Pulse para abrir «%1s»</string>
<string name="sent_file_title">Archivo enviado a %1s</string>
<string name="sent_file_text">%1s</string>
<string name="sent_file_failed_title">Fallo al enviar el archivo %1s</string>
<string name="sent_file_failed_text">%1s</string>
<string name="tap_to_answer">Pulse para responder</string>
<string name="reconnect">Reconectar</string>
<string name="right_click">Enviar clic derecho</string>
@@ -112,7 +118,8 @@
<string name="sftp_sdcard">Tarjeta SD</string>
<string name="sftp_readonly">(solo lectura)</string>
<string name="sftp_camera">Imágenes de la cámara</string>
<string name="add_host">Añadir IP/nombre</string>
<string name="add_host">Añadir servidor/IP</string>
<string name="add_host_hint">Nombre o dirección IP</string>
<string name="no_players_connected">Ningún reproductor encontrado</string>
<string name="custom_dev_list_help">Use esta opción solo si su dispositivo no es detectado automáticamente. Introduzca la dirección IP o nombre debajo y pulse el botón para añadirlo a la lista. Pulse un ítem existente para eliminarlo de la lista.</string>
<string name="mpris_player_on_device">%1$s en %2$s</string>

View File

@@ -16,6 +16,7 @@
<string name="pref_plugin_ping_desc">Envoie et reçoit des commandes « Ping »</string>
<string name="pref_plugin_notifications">Synchronisation des notifications</string>
<string name="pref_plugin_notifications_desc">Accédez à vos notifications depuis d\'autres périphériques</string>
<string name="pref_plugin_sharereceiver">Réception de fichier</string>
<string name="pref_plugin_sharereceiver_desc">Enregistrer les fichiers reçus dans le stockage du téléphone</string>
<string name="plugin_not_available">Cette fonctionnalité n\'est pas disponible dans votre version de Android</string>
<string name="device_list_empty">Pas de périphériques</string>
@@ -26,6 +27,9 @@
<string name="send_ping">Envoyer un « Ping »</string>
<string name="open_mpris_controls">Ouvrir un contrôle distant</string>
<string name="open_mousepad">Ouvrir le pavé tactile</string>
<string name="mousepad_info">Déplacer le doigt sur l\'écran pour bouger le pointeur de la souris. Appuyez pour cliquer et utiliser deux/trois doigts pour les clic droit et centre. Appuyez longtemps pour faire un glisser déplacer.</string>
<string name="mousepad_double_tap_settings_title">Action pour l\'appui à deux doigts</string>
<string name="mousepad_triple_tap_settings_title">Action pour l\'appui à trois doigts</string>
<string-array name="mousepad_tap_entries">
<item>Clic droit</item>
<item>Clic central</item>
@@ -51,8 +55,15 @@
<string name="error_invalid_key">Clé reçue non valable</string>
<string name="pair_requested">Paire demandée</string>
<string name="pairing_request_from">Demande d\'appariement provenant de %1s</string>
<string name="received_url_title">Lien reçu de %1s</string>
<string name="received_url_text">Appuyez pour ouvrir %1s</string>
<string name="incoming_file_title">Réception d\'un fichier en cours depuis %1s</string>
<string name="incoming_file_text">%1s</string>
<string name="outgoing_file_title">Envoi d\'un fichier à %1s</string>
<string name="outgoing_file_text">%1s</string>
<string name="received_file_title">Fichier reçu de %1s</string>
<string name="received_file_text">Appuyez pour ouvrir %1s</string>
<string name="sent_file_title">Fichier envoyé à %1s</string>
<string name="sent_file_text">%1s</string>
<string name="sent_file_failed_title">Impossible d\'envoyer le fichier %1s</string>
<string name="sent_file_failed_text">%1s</string>
@@ -76,6 +87,8 @@
<string name="mpris_next">Suivant</string>
<string name="mpris_volume">Volume</string>
<string name="mpris_settings">Configuration multimédia</string>
<string name="mpris_time_settings_title">Boutons avance / retour rapide.</string>
<string name="mpris_time_settings_summary">Ajustez le temps pour l\'avance ou retour rapide</string>
<string-array name="mpris_time_entries">
<item>10 secondes</item>
<item>20 secondes</item>
@@ -92,9 +105,13 @@
<string name="device_name">Nom du périphérique</string>
<string name="device_name_preference_summary">%s</string>
<string name="invalid_device_name">Nom de périphérique non valable</string>
<string name="shareplugin_text_saved">Texte reçu et enregistré dans le presse-papiers</string>
<string name="custom_devices_settings">Liste personnalisée de périphériques</string>
<string name="custom_device_list">Ajouter des périphériques par IP</string>
<string name="share_notification_preference">Notifications sonores</string>
<string name="share_notification_preference_summary">Vibrer et jouer un son quand un fichier est reçu</string>
<string name="title_activity_notification_filter">Filtre des notifications</string>
<string name="filter_apps_info">Les notifications seront synchronisées pour les applications sélectionnées.</string>
<string name="sftp_internal_storage">Stockage interne</string>
<string name="sftp_all_files">Tous les fichiers</string>
<string name="sftp_sdcard_num">Carte SD %d</string>
@@ -102,6 +119,8 @@
<string name="sftp_readonly">(lecture seule)</string>
<string name="sftp_camera">Images de l\'appareil photo</string>
<string name="add_host">Ajouter hôte/IP</string>
<string name="add_host_hint">Nom d\'hôte ou adresse IP </string>
<string name="no_players_connected">Aucun lecteur trouvé</string>
<string name="custom_dev_list_help">N\'utilisez cette option que si votre périphérique n\'est pas détecté automatiquement. Saisissez l\'adresse IP ou le nom d\'hôte ci-dessous et appuyez sur le bouton pour l\'ajouter à la liste. Appuyez sur un élément existant pour le retirer de la liste.</string>
<string name="mpris_player_on_device">%1$s sur %2$s</string>
</resources>

View File

@@ -23,9 +23,9 @@
<string name="ok">OK</string>
<string name="cancel">Annulla</string>
<string name="open_settings">Apri impostazioni</string>
<string name="no_permissions">Devi garantire a KDE Connect l\'accesso alle notifiche</string>
<string name="no_permissions">Devi concedere i permessi per l\'accesso alle notifiche</string>
<string name="send_ping">Invia ping</string>
<string name="open_mpris_controls">Apri il telecomando multimediale</string>
<string name="open_mpris_controls">Apri telecomando</string>
<string name="open_mousepad">Apri controllo del touchpad</string>
<string name="mousepad_info">Muovi un dito sullo schermo per spostare il puntatore del mouse. Tocca per un clic e usa due/tre dita per i pulsanti destro e centrale. Utilizza una pressione lunga per trascinare e rilasciare.</string>
<string name="mousepad_double_tap_settings_title">Imposta azione per il tocco a due dita</string>
@@ -40,18 +40,18 @@
<string name="category_connected_devices">Dispositivi connessi</string>
<string name="category_not_paired_devices">Dispositivi disponibili</string>
<string name="category_remembered_devices">Dispositivi memorizzati</string>
<string name="plugins_failed_to_load">Alcune estensioni non si sono avviate correttamente (tocca per maggiori informazioni):</string>
<string name="plugins_failed_to_load">Impossibile caricare alcune estensioni (tocca per maggiori informazioni):</string>
<string name="device_menu_plugins">Impostazioni estensioni</string>
<string name="device_menu_unpair">Disassocia</string>
<string name="device_not_reachable">Dispositivo accoppiato non raggiungibile</string>
<string name="device_not_reachable">Dispositivo associato non raggiungibile</string>
<string name="unknown_device">Dispositivo sconosciuto</string>
<string name="error_not_reachable">Dispositivo fuori portata</string>
<string name="error_already_requested">Richiesta già inviata</string>
<string name="error_already_paired">Dispositivo già associato</string>
<string name="error_could_not_send_package">Impossibile inviare i dati</string>
<string name="error_timed_out">Richiesta scaduta</string>
<string name="error_canceled_by_user">Richiesta annullata dall\'utente</string>
<string name="error_canceled_by_other_peer">Richiesta annullata dal dispositivo remoto</string>
<string name="error_canceled_by_user">Annullata dall\'utente</string>
<string name="error_canceled_by_other_peer">Annullata dal dispositivo remoto</string>
<string name="error_invalid_key">Ricevuta chiave non valida</string>
<string name="pair_requested">Richiesta di associazione</string>
<string name="pairing_request_from">Richiesta associazione da %1s</string>
@@ -87,7 +87,7 @@
<string name="mpris_next">Successivo</string>
<string name="mpris_volume">Volume</string>
<string name="mpris_settings">Impostazioni multimediali</string>
<string name="mpris_time_settings_title">I pulsanti di avanzamento/riavvolgimento</string>
<string name="mpris_time_settings_title">Pulsanti di avanzamento/riavvolgimento</string>
<string name="mpris_time_settings_summary">Regola l\'ora per avanzare rapidamente o riavvolgere in caso di pressione.</string>
<string-array name="mpris_time_entries">
<item>10 secondi</item>
@@ -104,7 +104,7 @@
<string name="plugin_settings_with_name">Impostazioni di %s</string>
<string name="device_name">Nome dispositivo</string>
<string name="device_name_preference_summary">%s</string>
<string name="invalid_device_name">Nome non valido</string>
<string name="invalid_device_name">Nome dispositivo non valido</string>
<string name="shareplugin_text_saved">Testo ricevuto, salvato negli appunti</string>
<string name="custom_devices_settings">Elenco dispositivi personalizzato</string>
<string name="custom_device_list">Aggiungi dispositivi per IP</string>
@@ -119,7 +119,8 @@
<string name="sftp_readonly">(sola lettura)</string>
<string name="sftp_camera">Immagini fotocamera</string>
<string name="add_host">Aggiungi host/IP</string>
<string name="add_host_hint">Nome host o IP</string>
<string name="no_players_connected">Nessun lettore trovato</string>
<string name="custom_dev_list_help">Usa questa opzioone solo se il tuo dispositivo non è rilevato automaticamente. Digita l\'indirizzo IP o il nome host in basso e tocca il pulsante per aggiungerlo all\'elenco. Tocca un elemento esistente per rimuoverlo dall\'elenco.</string>
<string name="custom_dev_list_help">Usa questa opzione solo se il tuo dispositivo non è rilevato automaticamente. Digita l\'indirizzo IP o il nome host in basso e tocca il pulsante per aggiungerlo all\'elenco. Tocca un elemento esistente per rimuoverlo dall\'elenco.</string>
<string name="mpris_player_on_device">%1$s su %2$s</string>
</resources>

View File

@@ -158,13 +158,11 @@ public class LanLinkProvider extends BaseLinkProvider {
final NioSocketConnector connector = new NioSocketConnector();
connector.setHandler(tcpHandler);
//TextLineCodecFactory will split incoming data delimited by the given string
connector.getFilterChain().addLast("codec",
new ProtocolCodecFilter(
new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
)
);
connector.getSessionConfig().setKeepAlive(true);
//TextLineCodecFactory will buffer incoming data and emit a message very time it finds a \n
TextLineCodecFactory textLineFactory = new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX);
textLineFactory.setDecoderMaxLineLength(512*1024); //Allow to receive up to 512kb of data
tcpAcceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(textLineFactory));
int tcpPort = identityPackage.getInt("tcpPort",port);
ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), tcpPort));
@@ -235,17 +233,16 @@ public class LanLinkProvider extends BaseLinkProvider {
tcpAcceptor.getSessionConfig().setKeepAlive(true);
tcpAcceptor.getSessionConfig().setReuseAddress(true);
tcpAcceptor.setCloseOnDeactivation(false);
//TextLineCodecFactory will split incoming data delimited by the given string
tcpAcceptor.getFilterChain().addLast("codec",
new ProtocolCodecFilter(
new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
)
);
//TextLineCodecFactory will buffer incoming data and emit a message very time it finds a \n
TextLineCodecFactory textLineFactory = new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX);
textLineFactory.setDecoderMaxLineLength(512*1024); //Allow to receive up to 512kb of data
tcpAcceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(textLineFactory));
udpAcceptor = new NioDatagramAcceptor();
udpAcceptor.getSessionConfig().setReuseAddress(true); //Share port if existing
//TextLineCodecFactory will split incoming data delimited by the given string
udpAcceptor.getSessionConfig().setReuseAddress(true); //Share port if existing
//TextLineCodecFactory will buffer incoming data and emit a message very time it finds a \n
//This one will have the default MaxLineLength of 1KB
udpAcceptor.getFilterChain().addLast("codec",
new ProtocolCodecFilter(
new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)

View File

@@ -56,7 +56,7 @@ public class Device implements BaseLink.PackageReceiver {
private final Context context;
private final String deviceId;
private final String name;
private String name;
public PublicKey publicKey;
private int notificationId;
private int protocolVersion;
@@ -93,7 +93,7 @@ public class Device implements BaseLink.PackageReceiver {
this.context = context;
this.deviceId = deviceId;
this.name = settings.getString("deviceName", "unknown device");
this.name = settings.getString("deviceName", context.getString(R.string.unknown_device));
this.pairStatus = PairStatus.Paired;
this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet
@@ -115,7 +115,7 @@ public class Device implements BaseLink.PackageReceiver {
this.context = context;
this.deviceId = np.getString("deviceId");
this.name = np.getString("deviceName", "unidentified device");
this.name = np.getString("deviceName", context.getString(R.string.unknown_device));
this.protocolVersion = np.getInt("protocolVersion");
this.pairStatus = PairStatus.NotPaired;
this.publicKey = null;
@@ -324,6 +324,14 @@ public class Device implements BaseLink.PackageReceiver {
this.protocolVersion = identityPackage.getInt("protocolVersion");
if (identityPackage.has("deviceName")) {
this.name = identityPackage.getString("deviceName", this.name);
SharedPreferences.Editor editor = settings.edit();
editor.putString("deviceName", this.name);
editor.apply();
}
links.add(link);
try {

View File

@@ -136,6 +136,7 @@ public class MprisActivity extends ActionBarActivity {
if(playerList.isEmpty()){
findViewById(R.id.no_players).setVisibility(View.VISIBLE);
spinner.setVisibility(View.GONE);
((TextView) findViewById(R.id.now_playing_textview)).setText("");
}else{
findViewById(R.id.no_players).setVisibility(View.GONE);
spinner.setVisibility(View.VISIBLE);

View File

@@ -184,19 +184,21 @@ public class MprisPlugin extends Plugin {
public void setPlayerStatusUpdatedHandler(String id, Handler h) {
playerStatusUpdated.put(id, h);
h.dispatchMessage(new Message());
//Get the status if this is the first handler we have
if (playerListUpdated.size() == 1) {
requestPlayerStatus();
}
h.dispatchMessage(new Message());
}
public void setPlayerListUpdatedHandler(String id, Handler h) {
if (playerList.size() > 0) {
h.dispatchMessage(new Message());
}
playerListUpdated.put(id,h);
h.dispatchMessage(new Message());
//Get the status if this is the first handler we have
if (playerListUpdated.size() == 1) {
requestPlayerList();
}

View File

@@ -128,7 +128,9 @@ public class PairActivity extends ActionBarActivity {
BackgroundService.RunCommand(PairActivity.this, new BackgroundService.InstanceCallback() {
@Override
public void onServiceStart(BackgroundService service) {
device.acceptPairing();
if (device != null) {
device.acceptPairing();
}
finish();
}
});
@@ -141,7 +143,9 @@ public class PairActivity extends ActionBarActivity {
BackgroundService.RunCommand(PairActivity.this, new BackgroundService.InstanceCallback() {
@Override
public void onServiceStart(BackgroundService service) {
device.rejectPairing();
if (device != null) {
device.rejectPairing();
}
finish();
}
});

View File

@@ -93,7 +93,11 @@ public class SettingsActivity extends PreferenceActivity {
if (pref.isEnabled()) {
String pluginName = pref.getDependency(); //The parent pref will be named like the plugin
Plugin plugin = device.getPlugin(pluginName, true);
plugin.startPreferencesActivity(SettingsActivity.this);
if (plugin != null) {
plugin.startPreferencesActivity(SettingsActivity.this);
} else { //Could happen if the device is not connected anymore
finish(); //End this activity so we go to the "device not reachable" screen
}
}
}
}