Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4401] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2012-01-10 23:26:54
|
Revision: 4401
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4401&view=rev
Author: horned-reaper
Date: 2012-01-10 22:45:33 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/Docs/Documentation/
trunk/plugins/FritzBox/Docs/Documentation/Data/
trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml
trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/1.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/2.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/3.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/4.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/5.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/6.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/7.JPG
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4400.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/Docs/Install-de.txt
trunk/plugins/FritzBox/Docs/Install.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,12 +1,16 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-Unable to determine SVN version. Try with a SVN cleanup!
-Local SVN not up to date
+SVN Version: 4400
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
Microsoft (R) Build Engine Version 4.0.30319.1
[Microsoft .NET Framework, Version 4.0.30319.239]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 09.01.2012 18:24:45.
+Build started 10.01.2012 23:18:05.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -150,10 +154,10 @@
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.DebugForm.resources".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
CoreResGen:
"C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
@@ -193,8 +197,13 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:05.87
+Time Elapsed 00:00:01.90
Reverting to build 0
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
..\FritzBox\bin\Release\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -273,7 +282,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 18:24:56
+Build started at 23:18:09
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,21 +0,0 @@
-New features:
-- FRITZ!Box phone book is now used only. The local FRITZ!Manager phone book (fritzbox.xml) has been replaced
-- automatic list update on changes
-- offline function for phone book
-- contact-specific sounds for incoming calls
-- reworked Configuration menu
-
-Optimizations:
-- improved performance: all data load is done in the background
-- main menu icon with transparent background (thanks to Peter2!)
-- improved handling with network connection interrupts
-
-Removed features (make no sense anymore if phone book is stored in FRITZ!Box):
-- inverse search
-- save unknown callers
-
-Fixed bugs:
-- MediaPortal crashes when network connection to FRITZ!Box is interrupted
-- voice box items are not displayed on the first menu call
-- the picture of the first contact is not automatically shown on menu openning
-- call list menu title is not shown when another menu (e. g. phone book) is active and you click on the filter button
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml
===================================================================
--- trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml (rev 0)
+++ trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml 2012-01-10 22:45:33 UTC (rev 4401)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<InternalPhoneBook xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <items>
+ <PhoneBookItem>
+ <ShowCallNotification>true</ShowCallNotification>
+ <Name>Angelina Jolie</Name>
+ <UniqueID>1321</UniqueID>
+ <PhoneNumbers>
+ <PhoneNumber prio="1" type="home">+00 (123) 45678</PhoneNumber>
+ </PhoneNumbers>
+ </PhoneBookItem>
+ <PhoneBookItem>
+ <ShowCallNotification>true</ShowCallNotification>
+ <Name>Tom Hanks</Name>
+ <UniqueID>1256</UniqueID>
+ <PhoneNumbers>
+ <PhoneNumber prio="1" type="home">+00 (456) 78901</PhoneNumber>
+ </PhoneNumbers>
+ </PhoneBookItem>
+ <PhoneBookItem>
+ <ShowCallNotification>true</ShowCallNotification>
+ <Name>Bruce Willis</Name>
+ <UniqueID>1224</UniqueID>
+ <PhoneNumbers>
+ <PhoneNumber prio="1" type="home">+00 (789) 98745</PhoneNumber>
+ </PhoneNumbers>
+ </PhoneBookItem>
+ </items>
+</InternalPhoneBook>
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv
===================================================================
--- trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv (rev 0)
+++ trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv 2012-01-10 22:45:33 UTC (rev 4401)
@@ -0,0 +1,5 @@
+sep=;
+Typ;Datum;Name;Rufnummer;Nebenstelle;Eigene Rufnummer;Dauer
+
+2;08.01.12 08:41;Angelina Jolie;+00 (123) 45678;;123;0:06
+1;08.01.12 10:40;Tom Hanks;+00 (456) 78901;;123;0:16
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/1.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/1.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/2.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/2.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/3.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/3.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/4.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/4.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/5.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/5.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/6.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/6.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/7.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/7.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/FritzBox/Docs/Install-de.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Install-de.txt 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Docs/Install-de.txt 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,144 +0,0 @@
-Dieses Plugin ist eine Kombination aus dem fr\xFChreren Callmonitor und dem neuen FritzManager.
-
-Dieses Howto beschreibt die Installation und die Features des FritzManager Teils.
-
-Der FritzManager l\xE4dt und zeigt verschiedene Informationen der FritzBox an.
-
-Hinweis zur Installation:
-Bitte deinstalliere das alte Fritz Callmonitor Plugin zuerst. Wenn beide Plugins zusammen
-installiert sind, f\xFChrt das zu Problemen, wie z.B. das Plugin kann nicht entladen werden
-und MediaPortal bleibt h\xE4ngen.
-
-Die verschiedenen Sichten
-
-1. Die Anruferliste.
------------------------
-
-Wird \xFCber den CSV-Export aus dem Web-Gui der FritzBox heruntergeladen.
-
-2. Das Telefonbuch.
-------------------------
-
-Wird ebenfalls \xFCber das Web-Gui herunter geladen (Telefonbuch Export \xFCber XML).
-Zur Zeit wird nur ein Telefonbuch unterst\xFCtzt. Falls Du mehr als eins hast, wird
-wahrscheinlich nur das erste angezeigt (ungetestet).
-
-3. Die Nachrichten des Anrufbeantworters.
---------------------------------------------
-
-Wird \xFCber das Auslesen der meta0...4 Dateien auf dem USB-Speicher der FritzBox
-erledigt. Damit das funktioniert, muss die FB so konfiguriert sein, dass Anrufbeantworter-
-nachrichten auf dem USB-Speicher abgelegt werden. Ausserdem muss der NAS Zugriff
-auf den USB-Speicher eingeschaltet sein.
-
-Als n\xE4chstes verbindet man dieses Netzlaufwerk (irgendwas wie \\fritz.box\your-usb-store)
-als lokales Laufwerk auf dem PC auf dem Mediaportal l\xE4uft. Es ist besser ein richtige Laufwerkverbindung zu nutzen, da UNC Pfade wie \\fritz.box\usb... manchmal nicht
-funktionieren.
-
-Der Pfad zu der meta0 Datei (das ist das Inhaltsverzeichnis des ersten Anrufbeantworters)
-muss dann in der Konfiguration bei 'path to voicebox' eingegeben werden.
-
-Falls keine Nachrichten angezeigt werden, wenn man auf die Nachrichten\xFCbersicht
-umschaltet, dann \xFCberpr\xFCfe bitte das Logfile (mediaportal.log muss auf debug level gesetzt
-sein), um zu sehen, ob das Plugin die metaX Dateien \xFCberhaupt findet.
-
-Bilder der Kontakte / Telefonbucheintr\xE4ge
-----------------------
-
-Alle Ansichten unterst\xFCtzen das Anzeigen von Bildern der jeweiligen Person. Wenn Du ein
-Bild gleichen Namens wie die Person in den Ordner
-<mediaportal-shared-base>\thumbs\yac legst, wird das Bild automatisch angezeigt.
-
-Weitere Features:
-
-Abspielen der Nachrichten:
--------------------------
-
-Wird eine Nachricht angeklickt, wird sie direkt im MP abgespielt. Damit das funktioniert,
-muss die der speexdec.exe decoder ins Windows-verzeichnis kopiert werden.
-
-R\xFCckruf oder Anrufen eines Kontakts oder Anrufers:
-------------------------------------------------------------------
-
-\xD6ffne das Kontextmen\xFC eines Eintrags und w\xE4hle "Callback" dann l\xF6st das Plugin
-einen Rufruf mit Hilfe der FritzBox Funktion "Anrufassistent" aus.
-
-Versichere dich dass Du den richtigen "Dial-Port" gew\xE4hlt hast, damit die Verbindung
-auch auf dem gew\xFCnschten Telefon hergestellt wird. Falls Du nicht wei\xDFt, welcher
-Dial-Port der richtige ist, probier einfach 1,2,3 ... aus, bis Du das richtige
-Telefon gefunden hast.
-
-R\xFCckw\xE4rts-Aufl\xF6sung von Rufnummern:
------------------------------------
-
-Alle bekannten Nummers in der Anruferliste und in der Nachrichten\xFCbersicht werden
-mit ihren Namen aus dem Telefonbuch dargestellt.
-
-F\xFCr alle anderen Nummern wird im Hintergrund eine R\xFCckw\xE4rtssuche bei "Das \xF6rtliche"
-durchgef\xFChrt. Falls ein Name gefunden wird, wird der Listeneintrag ersetzt und f\xFCr
-das n\xE4chste mal gespeichert.
-
-Diese Funktion muss explizit in der Konfiguration eingeschaltet werden. F\xFCr Nummern,
-die ohne Vorwahl gew\xE4hlt wurden, muss deine Ortwahl eingegeben werden, sonst klappt
-die R\xFCckw\xE4rtssuche nicht.
-
-\xDCberwachen des Anrufbeantwortes mit Benachrichtigung
-----------------------------------------------------
-
-Das Plugin \xFCberwacht das Verzeichnis des Anrufbeantworters und aktualisiert die
-Ansicht, wenn eine neue Nachricht eintrifft.
-Ausserdem setzt das Plugin einige Skin-Properties, die es erlauben ein Custom-
-Control oder ein Label im Skin einzubauen, welches z.B. im Home-Screen von MP
-neue Nachrichten anzeigt.
-
-Du kannst den Home-Screen so \xE4ndern, dass ein Marker angezeigt. (sogar ein anklickbarer
-Marker ist m\xF6glich).
-
-Es gibt einige gui properties:
-#FritzManager.NewMessages
-#FritzManager.TotalMessages
-
-Werden auf ' ' (ein Leerzeichen) gesetzt, wenn keine nachricht vorhanden ist.
-Wenn eine Nachricht oder mehr vorhanden sind, dann wird '1 Nachtricht' oder '2 Nachrichten'
-gesetzt.
-
-#FritzManager.NewMessageCount: Leerstring oder Anzahl neuer Nachrichten
-#FritzManager.TotalMessageCount: Leerstring oder Anzahl aller Nachrichten
-#FritzManager.NewMessagesAvail: "true" oder "false" -> kann zum Umschalten der Sichtbarkeit
-genutzt werden
-
-Du kannst das direkt nutzen, um eine Anzeige f\xFCr den Anrufbeantworter in dein Skin zu
-integrieren. Eine Text hinzuf\xFCgen geht so:
-
-<control>
- <type>fadelabel</type>
- <label>#FritzManager.NewMessages</label>
- <posX>100</posX>
- <posY>120</posY>
-</control>
-
-In mediaportal 1.1.0 B1 and neuer, kann man sogar ein Control anzeigen oder verbergen:
-
-<control>
- <type>button</type>
- <visible>string.equals(#FritzManager.NewMessagesAvail,true)</visible>
- ...
-</control>
-
-
-Bemerkungen:
-
-Die Kommunikation mit der FritzBox findet \xFCber das normale WebGui statt. Aus diesem
-Grund muss das Plugin das Password kennen, um sich einloggen zu k\xF6nnen. Aktuell wird
-nur die SID basierte Authetication unterst\xFCtzt (getestet auf 7270 und 7170).
-Falls ben\xF6tigt, kann auch die alte Methode noch integriert werden.
-
-Die URLs, die das Plugin nutzt, um das Telefonbuch und die Anruferliste herunterzuladen sind
-fest kodiert und passen zur fritz 7270 mit firmware 54.04.76.
-
-F\xFCr andere Firmware versionen und andere Fritzboxen ist nicht sichergestellt, dass alle URLs
-so funktionieren wir erwartet. Falls etwas nicht klappt schau bitte zuerst ins Logfile mediaportal.log.
-
-
-
-
\ No newline at end of file
Deleted: trunk/plugins/FritzBox/Docs/Install.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Install.txt 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Docs/Install.txt 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,139 +0,0 @@
-This plugin is a combination of the former fritz call monitor and the new fritz manager.
-
-This howto describes the installation and features of the fritz manager part.
-
-The fritz manager can load and display several informations from the fritz!box.
-
-Note on Installation:
-Please uninstall the old fritz call monitor first. It is completely included in this
-plugin. Installing both will lead to problems like media portal cannot unload the
-plugin and hangs.
-
-
-Views
-
-1. The list of callers.
------------------------
-
-This is done via the web admin gui (csv export).
-
-2. The fritz phone book.
-------------------------
-
-This is also done via the web admin gui (phone book export xml).
-Only one phone book is supported at this time. If you have more than one, I think
-the first one will be shown (not tested).
-
-3. The messages on the fritz voice mail box.
---------------------------------------------
-
-This done by reading the meta0 ... 4 files on the fritz voicebox usb store.
-In order to make this work, you have configure you fritz box to use usb store
-for voicebox recordings and allows a NAS export of your usb store.
-
-Next map this export (something like \\fritz.box\your-usb-store) to a local drive
-on the pc mediaportal is running on. I prever to use a fix drive mapping, because
-in my environment unc pathes \\fritz.box\usb... sometimes don't work.
-
-Insert the path to the meta0 file (directory for the first voicebox) into
-'path to voicebox' setting of the fritz manager plugin.
-
-If no voice box items listed, when switching to voicebox view please check the
-logfile (mediaportal.log must be set to debug level) to see if the plugin finds
-the metaX files.
-
-Thumbsnail of contacts:
-----------------------
-
-All views support a thumbnail view of the selected contact. If you put an jpg
-image of the same name as show in the view in the
-<mediaportal-shared-base>\thumbs\yac folder, it will be displayed on your screen.
-
-Further feaures:
-
-Play voicebox recordings:
--------------------------
-
-When you click a recording, it is played directly on the mediaportal pc. To
-get this running you must install the decoder speexdec.exe (comes with this
-plugin) somewhere 'on the search path' e.g. to c:\windows.
-
-Callback or Call someone from phoneBook / voicebox / callers list:
-------------------------------------------------------------------
-
-On the list view open the context menu and choose 'call back' and the plugin
-calls the selected subscriber via the fritz "call assistant" function.
-
-Be sure to configure the right dial port in the fritz manager settings to choose
-the right telephone which is connected by fritz. If you dont own which dial port
-to choose simply try 1,2,3 ...
-
-Revers lookup numbers:
-----------------------
-
-All known numbers in callers list and voicebox recordings are replaced by the
-matching name from phoneBook. For all other numbers the plugin will submit an
-invers search request to "das Oertliche" in background. If it finds a name the
-number will replaced and the name will remembered next time.
-
-You must activate this explicitly in fritz manager settings. For numbers without
-areacode, you must provide a default areacode to make the lookup for this numbers
-possible.
-
-Monitor the voicebox with notification
---------------------------------------
-
-The plugin monitors the voicebox directory files and update the view, if a new
-message arrives. Further the plugin sets two skin properties, which allow to
-include a custom control or info label on any screen of media portal.
-
-you can modify our home screen that it shows a marker (or even a clickable marker)
-if there are new messages.
-
-There are some gui properties:
-#FritzManager.NewMessages
-#FritzManager.TotalMessages
-
-These are set to ' ' (one space) if message count is 0. If count is greather than
-0 a displayable string like '1 message' or '2 messages' is set.
-
-#FritzManager.NewMessageCount: empty string or number of new messages
-#FritzManager.TotalMessageCount: empty string or number of total messages
-#FritzManager.NewMessagesAvail: "true" or "false" -> use this to switch visibility
-
-You can use this directly in your skin file to include a voicebox display. Add a
-label control like this:
-
-<control>
- <type>fadelabel</type>
- <label>#FritzManager.NewMessages</label>
- <posX>100</posX>
- <posY>120</posY>
-</control>
-
-In mediaportal 1.1.0 B1 and newer you can even switch a control on and off:
-
-<control>
- <type>button</type>
- <visible>string.equals(#FritzManager.NewMessagesAvail,true)</visible>
- ...
-</control>
-
-
-Notes:
-
-The communication to the fritz box is done via the normal web admin gui. For this
-reason the plugin has to know the password. Actually only the newer sid based
-authentication is supported (tested with 7270). If someone requests I will integrate
-the older auth methos as well.
-
-The URLs the plugin uses to download the phoneBook / callers list are fixed and tested
-with fritz 7270 firmware 54.04.76.
-
-For other firmware versions or other fritz box types there is no garantee, that all URLs
-or POST request will work as expected. If something unexpected happens please check
-the mediaportal.log logfile first.
-
-
-
-
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -154,6 +154,15 @@
}
}
+ private void OnConnectedAction()
+ {
+ fritz.Login();
+
+ loadDataInBackground();
+
+ worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null)); // schedule refresh view task
+ }
+
private void OnCall(CallAction callAction)
{
PhoneBookItem phoneBookItem = callAction.Caller.PhoneBookItem;
@@ -352,17 +361,49 @@
public void Start()
{
Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
+
Settings.Load();
+ // register events
Utils.OnStartExternal += OnStartExternal;
Utils.OnStopExternal += OnStopExternal;
FritzBoxClient.LogEvent += OnLogAction;
FritzBoxClient.CallEvent += OnCallAction;
+
+ FritzBoxClient.ConnectedEvent += OnConnectedAction;
+
+ SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power mode changes (Standby & Hibernate)
+
FritzBoxClient.StartClient();
+
+ thePlugin = this;
- // start monitoring Windows power mode changes (Standby & Hibernate)
- SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ // open FRITZ!Box connection and login
+ fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
+
+ // set session timer interval and start the timer
+ sessionTimer.Interval = 30000;
+ sessionTimer.Elapsed += OnSessionTimerEvent;
+ sessionTimer.Start();
+
+ // set update timer interval and start the timer
+ int updateInterval = Settings.UpdateInterval;
+
+ if (updateInterval != 0)
+ {
+ updateTimer.Interval = updateInterval * 1000; // interval is in sec
+ updateTimer.Elapsed += OnUpdateTimerEvent;
+ updateTimer.Start();
+ }
+
+ // load phone book from XML file
+ phoneBook = new PhoneBook(fritz);
+ phoneBook.LoadPhoneBookFromXMLFile();
+
+ startBackGroundWorker();
+
+ loadDataInBackground();
}
/// <summary>
@@ -373,15 +414,17 @@
Log.Info("FRITZ!Box Manager {0} plugin is stopping", Assembly.GetExecutingAssembly().GetName().Version);
FritzBoxClient.StopClient();
+
+ // unregister events
FritzBoxClient.CallEvent -= OnCallAction;
FritzBoxClient.LogEvent -= OnLogAction;
Utils.OnStartExternal -= OnStartExternal;
Utils.OnStopExternal -= OnStopExternal;
- // stop monitoring power changes
- SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power changes
+ // save phone book
phoneBook.SavePhoneBookToXMLFile();
}
@@ -525,9 +568,6 @@
private Thread workerThread;
// sync the access to call list
private System.Object sync = new System.Object();
- //private bool gUICallItemListUpdateIsRequired = true;
- //private bool gUIPhoneBookUpdateIsRequired = true;
- //private bool gUIVoiceBoxItemListUpdateIsRequired = true;
#endregion fields
@@ -539,7 +579,7 @@
Log.Debug("Init called");
Start();
- loadConfig();
+ //loadConfig();
return Load(GUIGraphicsContext.Skin + @"\FritzManager.xml");
}
@@ -592,38 +632,6 @@
filesToDelete.Clear();
}
- protected void loadConfig()
- {
- thePlugin = this;
-
- // open FRITZ!Box connection and login
- fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
- fritz.Login();
-
- // set session timer interval and start the timer
- sessionTimer.Interval = 30000;
- sessionTimer.Elapsed += OnSessionTimerEvent;
- sessionTimer.Start();
-
- // set update timer interval and start the timer
- int updateInterval = Settings.UpdateInterval;
-
- if (updateInterval != 0)
- {
- updateTimer.Interval = updateInterval * 1000; // interval is in sec
- updateTimer.Elapsed += OnUpdateTimerEvent;
- updateTimer.Start();
- }
-
- // load phone book from XML file
- phoneBook = new PhoneBook(fritz);
- phoneBook.LoadPhoneBookFromXMLFile();
-
- startBackGroundWorker();
-
- loadDataInBackground();
- }
-
protected override void OnPageLoad()
{
windowIsDisplayed = true;
@@ -654,8 +662,7 @@
{
Log.Debug("Processing session timer event");
- if (!fritz.LoggedIn) fritz.Login();
- else
+ if (fritz.LoggedIn)
{
fritz.KeepAlive();
@@ -892,6 +899,7 @@
voiceBoxItemList.Sort(VoiceBoxItem.CompareByDate);
int i = 0;
Caller caller;
+ string callerName;
foreach (VoiceBoxItem voiceBoxItem in voiceBoxItemList)
{
@@ -905,8 +913,19 @@
if (mSNs.ContainsValue(voiceBoxItem.mynumber)) mSNName = mSNs[voiceBoxItem.mynumber];
elem.Label = (voiceBoxItem.isNew == 1 ? "* " : " ") + voiceBoxItem.time.ToString(format, ci);
- elem.Label2 = caller.PhoneBookItem.Name + " " + GUILocalizeStrings.Get(26) + " " + mSNName; // 26 = to
+
+ // add caller name/phone number and MSN
+ if (caller.PhoneBookItem != null) callerName = caller.PhoneBookItem.Name;
+ else
+ {
+ if (caller.PhoneNumber != "") callerName = caller.PhoneNumber;
+ else callerName = GUILocalizeStrings.Get(3); // 3 = Unknown
+ }
+
+ elem.Label2 = callerName + " " + GUILocalizeStrings.Get(26) + " " + mSNName; // 26 = to
+
elem.Path = Convert.ToString(i);
+
elem.IconImageBig = "defaultAudioBig.png";
elem.IconImage = "defaultAudio.png";
@@ -1009,10 +1028,14 @@
elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
- // add caller name
- elem.Label2 = caller.PhoneBookItem.Name;
+ // add caller name/phone number
+ if (caller.PhoneBookItem != null) elem.Label2 = caller.PhoneBookItem.Name;
+ else
+ {
+ if (caller.PhoneNumber != "") elem.Label2 = caller.PhoneNumber;
+ else elem.Label2 = GUILocalizeStrings.Get(3); // 3 = Unknown
+ }
- // add phone number
elem.DVDLabel = item.mynumber + item.extension;
elem.Path = Convert.ToString(i);
@@ -1034,7 +1057,7 @@
facadeView.Add(elem);
}
}
- else Log.Debug("callItemList is not initialized");
+ else Log.Debug("call item list is not initialized");
}
private void showThumbPanel()
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -173,6 +173,8 @@
private void checkBoxUsePhonebook_CheckedChanged(object sender, EventArgs e)
{
checkBoxShowUnknownCaller.Enabled = checkBoxUsePhonebook.Checked;
+
+ if (!checkBoxUsePhonebook.Checked) checkBoxShowUnknownCaller.Checked = true;
}
private void buttonMSNsAdd_Click(object sender, EventArgs e)
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -76,6 +76,8 @@
public delegate void LogEventHandler(LogLevel logLevel, string logMessage);
+ public delegate void ConnectedEventHandler();
+
#endregion
private static readonly TimeSpan minConnectWaitTime = new TimeSpan(0, 0, 30);
@@ -101,6 +103,8 @@
public static event LogEventHandler LogEvent;
+ public static event ConnectedEventHandler ConnectedEvent;
+
#region Public methods
public static void StartClient()
@@ -223,6 +227,9 @@
_client.BeginConnect(Address, Port, ConnectCallback, _client);
Connected = true;
+
+ // Raise event
+ ConnectedEvent();
}
catch (SocketException)
{
@@ -256,7 +263,7 @@
}
catch (SocketException)
{
- Log(LogLevel.Error, "Connection faild: SocketException");
+ Log(LogLevel.Error, "Connection failed: SocketException");
ReConnect();
}
catch (Exception ex)
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -146,48 +146,44 @@
public string loadPhoneBookFromFritzBox()
{
- if (LoggedIn)
+ string returnData;
+
+ try
{
- string returnData;
+ string postdata =
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"sid\"\r\n" +
+ "\r\n" +
+ sid + "\r\n" +
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"PhonebookId\"\r\n" +
+ "\r\n" +
+ "0\r\n" +
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"PhonebookExportName\"\r\n" +
+ "\r\n" +
+ "Telefonbuch\r\n" +
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"PhonebookExport\"\r\n" +
+ "\r\n" +
+ "\r\n" +
+ "-----------------------------88612920297--\r\n" +
+ "\r\n";
- try
- {
- string postdata =
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"sid\"\r\n" +
- "\r\n" +
- sid + "\r\n" +
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"PhonebookId\"\r\n" +
- "\r\n" +
- "0\r\n" +
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"PhonebookExportName\"\r\n" +
- "\r\n" +
- "Telefonbuch\r\n" +
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"PhonebookExport\"\r\n" +
- "\r\n" +
- "\r\n" +
- "-----------------------------88612920297--\r\n" +
- "\r\n";
+ returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
- returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
-
- if (!returnData.StartsWith("<!DOCTYPE html")) return returnData; // check if return data is FRITZ!Box logon page
- else
- {
- loggedIn = false;
- Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
- }
- }
- catch
+ if (!returnData.StartsWith("<!DOCTYPE html")) return returnData; // check if return data is FRITZ!Box logon page
+ else
{
- Log.Debug("Error on loading phone book from FRITZ!Box");
loggedIn = false;
+ Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
}
}
- else Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
+ catch
+ {
+ Log.Debug("Error on loading phone book from FRITZ!Box");
+ loggedIn = false;
+ }
return null;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -92,10 +92,8 @@
}
}
}
-
- // if no contact item was found return "Unknown" as name
- if (caller.PhoneBookItem == null) caller.PhoneBookItem = new PhoneBookItem(GUILocalizeStrings.Get(3)); // 3 = Unknown
+ // if no contact item was found return null
return caller;
}
@@ -122,8 +120,6 @@
{
InternalPhoneBook internalPhoneBook = new InternalPhoneBook();
- // ...
-
foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
{
internalPhoneBook.items.Add(phoneBookItem);
@@ -162,111 +158,112 @@
{
XmlSerializer xmlSerializer = new XmlSerializer(typeof(FritzPhoneBooks));
fritzPhoneBooks = (FritzPhoneBooks)xmlSerializer.Deserialize(new StringReader(fritzPhoneBooksSerialized));
- }
- FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
- PhoneBookItem tempPhoneBookItem;
- bool updateRequired, contactFound;
- string name, uniqueID, imageURL;
+ FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
+ PhoneBookItem tempPhoneBookItem;
+ bool updateRequired, contactFound;
+ string name, uniqueID, imageURL;
- lock (sync)
- {
- // update/add entries from FRITZ!Box phone book to local phone book
- foreach (Contact contact in fritzPhoneBook.contact)
+ lock (sync)
{
- name = contact.person[0].realName;
- imageURL = contact.person[0].imageURL;
- uniqueID = contact.uniqueid;
+ // update/add entries from FRITZ!Box phone book to local phone book
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ name = contact.person[0].realName;
+ imageURL = contact.person[0].imageURL;
+ uniqueID = contact.uniqueid;
- updateRequired = false;
+ updateRequired = false;
- // search if FRITZ!Box contact already exists in phone book
- if (phoneBook.ContainsKey(uniqueID))
- {
- // check for differences
- for (int i = 0; i < contact.telephony.Length; i++)
+ // search if FRITZ!Box contact already exists in phone book
+ if (phoneBook.ContainsKey(uniqueID))
{
- try
+ // check for differences
+ for (int i = 0; i < contact.telephony.Length; i++)
{
- if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ try
+ {
+ if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ }
+ catch
+ {
+ // on property changes the differences check may fail
+ Log.Debug("Phone book difference check failed. Forcing contact update");
+ updateRequired = true;
+ break;
+ }
}
- catch
+
+ if (updateRequired)
{
- // on property changes the differences check may fail
- Log.Debug("Phone book difference check failed. Forcing contact update");
- updateRequired = true;
- break;
+ Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+
+ phoneBook[uniqueID].Name = name;
+ phoneBook[uniqueID].PhoneNumbers = contact.telephony;
+ phoneBook[uniqueID].ImageURL = imageURL;
+
+ phoneBookChanges = true;
}
}
-
- if (updateRequired)
+ else
{
- Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+ Log.Info("Adding contact " + name);
- phoneBook[uniqueID].Name = name;
- phoneBook[uniqueID].PhoneNumbers = contact.telephony;
- phoneBook[uniqueID].ImageURL = imageURL;
+ tempPhoneBookItem = new PhoneBookItem();
+ tempPhoneBookItem.UniqueID = uniqueID;
+ tempPhoneBookItem.Name = name;
+ tempPhoneBookItem.PhoneNumbers = contact.telephony;
+ tempPhoneBookItem.ImageURL = imageURL;
+ phoneBook.Add(uniqueID, tempPhoneBookItem);
+
+ phoneBookSortIsRequired = true;
phoneBookChanges = true;
}
}
- else
- {
- Log.Info("Adding contact " + name);
- tempPhoneBookItem = new PhoneBookItem();
- tempPhoneBookItem.UniqueID = uniqueID;
- tempPhoneBookItem.Name = name;
- tempPhoneBookItem.PhoneNumbers = contact.telephony;
- tempPhoneBookItem.ImageURL = imageURL;
+ // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
+ string[] contactsToDelete = new string[phoneBook.Count];
+ int k = 0;
- phoneBook.Add(uniqueID, tempPhoneBookItem);
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ uniqueID = phoneBookItem.UniqueID;
+ contactFound = false;
- phoneBookSortIsRequired = true;
- phoneBookChanges = true;
- }
- }
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ if (contact.uniqueid == uniqueID)
+ {
+ contactFound = true;
+ break;
+ }
+ }
- // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
- string[] contactsToDelete = new string[phoneBook.Count];
- int k = 0;
-
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
- {
- uniqueID = phoneBookItem.UniqueID;
- contactFound = false;
-
- foreach (Contact contact in fritzPhoneBook.contact)
- {
- if (contact.uniqueid == uniqueID)
+ if (!contactFound)
{
- contactFound = true;
- break;
+ contactsToDelete[k] = uniqueID;
+ k++;
}
}
- if (!contactFound)
+ lock (sync)
{
- contactsToDelete[k] = uniqueID;
- k++;
- }
- }
-
- lock (sync)
- {
- foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
- {
- if (_uniqueID != null)
+ foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
{
- Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
- phoneBook.Remove(_uniqueID);
- phoneBookChanges = true;
+ if (_uniqueID != null)
+ {
+ Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
+ phoneBook.Remove(_uniqueID);
+ phoneBookChanges = true;
+ }
}
}
}
- }
- Log.Debug("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
+ Log.Debug("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
+ }
+ else Log.Error("Phone book synchronisation with the FRITZ!Box failed");
}
else Log.Debug("No connection to FRITZ!Box. Phone book synchronization not started");
@@ -284,8 +281,8 @@
}
if (phoneBookChanges)
- {
- phoneBookSaveIsRequired = true;
+ {
+ phoneBookSaveIsRequired = true;
return true;
}
else return false;
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2012-01-10 22:45:33 UTC (rev 4401)
@@ -15,7 +15,7 @@
<String id="13">View: Large icons</String>
<String id="14">All</String>
<String id="15">Incoming</String>
- <String id="16">Ougoing</String>
+ <String id="16">Outgoing</String>
<String id="17">Rejected</String>
<String id="18">Call list</String>
<String id="19">FritzBox messages</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2012-01-10 22:45:33 UTC (rev 4401)
@@ -15,7 +15,7 @@
<String id="13">View: Large icons</String>
<String id="14">All</String>
<String id="15">Incoming</String>
- <String id="16">Ougoing</String>
+ <String id="16">Outgoing</String>
<String id="17">Rejected</String>
<String id="18">Call list</String>
<String id="19">FritzBox messages</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -144,8 +144,6 @@
{
Log.Info("Loading settings");
- //PhoneBook.LoadSettings();
-
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
// connection settings
@@ -260,7 +258,7 @@
xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", ShowMSNOnNotify);
- xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", PhoneBookEnabled);
+ xmlwriter.SetValueAsBool("fritzbox", "usePhonebook", PhoneBookEnabled);
xmlwriter.SetValueAsBool("fritzbox", "showUnknownCaller", ShowUnknownCaller);
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-10 22:45:33 UTC (rev 4401)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4400</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>4400</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-09T18:24:56.1938676+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-10T23:18:09.5983408+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger....
[truncated message content] |
