Merge branch 'release/0.7.7'

jfritz-org · Jan 5, 2020 · 4f1bb1c · 4f1bb1c
2 parents 5d48ffe + 2820ac5
commit 4f1bb1c
Show file tree

Hide file tree

Showing 29 changed files with 605 additions and 868 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,4 +1,23 @@
-JFritz 0.7.6:
+JFritz 0.7.7:
+- Fixed some errors in Reverselookup for
+  - Austria
+  - Germany
+  - Sweden
+  - Switzerland
+- Fixed reboot for firmware > 07.08
+- Fixed call dialog / dial assist
+
+New Strings:
+box.could_not_get_status_from_UPNP
+box.no_upnp_communication
+box.invalid_upnp_response
+two_factor_no_change_of_port_possible
+two_factor_disable_1
+two_factor_disable_2
+two_factor_disable_3
+
+
+JFritz 0.7.6:
 - Neu: Support Java 9
 - Bugfix: Funktioniert mit der Firmware-Versionen 06.90
 - Änderung: Exportieren / Drucken der Anrufliste funktioniert nicht mehr

diff --git a/Changelog_Full.txt b/Changelog_Full.txt
@@ -20,6 +20,27 @@ TODO tel.search.ch überprüfen und reparieren
 - TODO: Sounds trennen und individualisierbar gestalten
 - TODO: Ist nicht FritzBox-AM spezifisch. Für alle AMs implementieren und konfigurierbar gestalten
 
+JFritz 0.7.7:
+- Cleanup code base
+- Fixed some errors in Reverselookup for
+  - Austria
+  - Germany
+  - Sweden
+  - Switzerland
+- Added new dependency to de.bausdorf.fritz.FritzTR064
+- Fixed reboot for firmware > 07.08
+- Fixed call dialog / dial assist
+
+New Strings:
+box.could_not_get_status_from_UPNP
+box.no_upnp_communication
+box.invalid_upnp_response
+two_factor_no_change_of_port_possible
+two_factor_disable_1
+two_factor_disable_2
+two_factor_disable_3
+
+
 JFritz 0.7.6:
 - Neu: Support Java 9
 - Bugfix: Funktioniert mit der Firmware-Versionen 06.90

diff --git a/README-Release.md b/README-Release.md
diff --git a/lang/jfritz_de_DE.properties b/lang/jfritz_de_DE.properties
@@ -79,10 +79,15 @@ blocked_call = Anruf abgewiesen
 
 box.address_wrong  = Box-Adresse ung\u00FCltig!
 
+box.could_not_get_status_from_UPNP = Kann Status nicht von UPnP abrufen!
+
 box.no_caller_list = Kann Anrufliste nicht von FRITZ!Box holen!
 
 box.no_clear_caller_list = Kann Anrufliste nicht von FRITZ!Box l\u00F6schen!
 
+box.no_upnp_communication = Kann keine Verbindung zum UPnP-Port 49000 aufbauen!
+box.invalid_upnp_response = Fehler beim Verarbeiten der UPnP-Nachricht!
+
 box.not_found      = FRITZ!Box nicht gefunden!
 
 box.port           = Port
@@ -498,7 +503,7 @@ ip_address = IP-Adresse
 
 isdn = ISDN
 
-isdn_telephones_all = Alle ISDN/DECT Anschl\u00FCsse
+isdn_telephones_all = ISDN und Schnurlostelefone
 
 jfritz_website = JFritz Homepage
 
@@ -898,6 +903,11 @@ tray_click = Zeige JFritz nach ...
 
 tray_messages = Tray-Nachrichten
 
+two_factor_no_change_of_port_possible = Funktion "Zus\u00E4tzliche \u00C4nderungsbest\u00E4tigung" ist aktiviert, daher ist keine Auswahl der Nebenstelle m\u00F6glich.
+two_factor_disable_1 = Um die Funktion "Zus\u00E4tzliche \u00C4nderungsbest\u00E4tigung" zu deaktivieren, \u00F6ffnen Sie die Einstellungen ihrer FritzBox im Browser.
+two_factor_disable_2 = Gehen Sie zu "System - FRITZ!Box-Benutzer - Anmeldung im Heimnetz" und entfernen Sie den Haken bei
+two_factor_disable_3 = "Ausf\u00FChrung bestimmter Einstellungen und Funktionen zus\u00E4tzlich best\u00E4tigen".
+
 type = Typ
 
 type_desc = Typ des Anrufs

diff --git a/lang/jfritz_en_US.properties b/lang/jfritz_en_US.properties
@@ -78,10 +78,15 @@ blocked_call = Call blocked
 
 box.address_wrong  = Wrong box address!
 
+box.could_not_get_status_from_UPNP = Could not get status from UPnP!
+
 box.no_caller_list = Could not get caller list from FRITZ!Box!
 
 box.no_clear_caller_list = Could not clear caller list from FRITZ!Box!
 
+box.no_upnp_communication = Could not connect to UPnP-Port 49000!
+box.invalid_upnp_response = Error parsing UPnP response!
+
 box.not_found      = Could not find your FRITZ!Box!
 
 box.port           = Port
@@ -892,6 +897,11 @@ tray_click = Show JFritz after ...
 
 tray_messages = Tray messages
 
+two_factor_no_change_of_port_possible = Two factor is enabled, cannot change extension setting.
+two_factor_disable_1 = To disable two factor, go to your FritzBox web interface and go to
+two_factor_disable_2 = "System - FRITZ!Box-Benutzer - Anmeldung im Heimnetz" and unset checkmark of
+two_factor_disable_3 = "Ausf\u00FChrung bestimmter Einstellungen und Funktionen zus\u00E4tzlich best\u00E4tigen"
+
 type = Type
 
 type_desc = The call's type

diff --git a/number/international/reverselookup.xml b/number/international/reverselookup.xml
@@ -13,7 +13,7 @@
      be used first and what pattern should be used for that web site first.
    	 As soon as one matching name is found, jfritz will stop trying other
    	 patterns / entries.
-   	 +46
+
    	 Make sure that each url entry contains the string $NUMBER at the
    	 appropriate spot or else the algorithm won't work! The attributes prefix
    	 and areacode are optional. The attribute prefix is used to determine if 
@@ -24,7 +24,7 @@
 -->
 
 <reverselookup version="1.10">
-    <userAgent>Mozilla/5.0 (Windows NT 6.1; WOW64; rv:50.0) Gecko/20100101 Firefox/50.0</userAgent>
+    <userAgent>Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:71.0) Gecko/20100101 Firefox/71.0</userAgent>
 	<country code="+1">
 		<website name="whitepages.com" url="http://www.whitepages.com/search/ReversePhone?phone=$NUMBER" prefix="1" numLines="6">
 			<entry swapFirstAndLastName="true">
@@ -807,22 +807,27 @@
 		</website>
 	</country>
 	<country code="+41">
-		<website name ="tel.local.ch" url="http://tel.local.ch/de/q/?ext=1&amp;what=$NUMBER" prefix="0" numLines="6">
-		    <entry firstOccurance="name">
-		        <name>&quot;details-entry-title-link&quot;[^&gt;]*&gt;([^&lt;]*)&lt;</name>
-		        <city>class='address'&gt;[^,]*,\s+[^\s]*\s+([^&lt;]*)&lt;</city>
-		        <street>class='address'&gt;([^,]*),\s+[^\s]*\s+[^&lt;]*&lt;</street>
-		        <zipcode>class='address'&gt;[^,]*,\s+([^\s]*)\s+[^&lt;]*&lt;</zipcode>
-		    </entry>
-		    <entry firstOccurance="name">
-		        <name>itemprop='name'&gt;([^&lt;]*)&lt;</name>
-		        <company>class='profession'&gt;([^&lt;]*)&lt;</company>
-		        <street>class='adr'&gt;([^&lt;]*)&lt;br</street>
-		        <city>class='adr'&gt;[^&gt;]*&gt;\s*[\d]+\s+([^&lt;]*)&lt;</city>
-		        <zipcode>class='adr'&gt;[^&gt;]*&gt;\s*([\d]+)\s+[^&lt;]*&lt;</zipcode>
-		    </entry>
+		<website name ="tel.local.ch" url="https://tel.local.ch/de/q/?ext=1&amp;what=$NUMBER" prefix="0" numLines="6">
+			<entry firstOccurance="name">
+				<name>&lt;h2 class=&quot;[^&quot;]*&quot;&gt;([^&lt;]*)&lt;\/h2&gt;</name>
+				<street>class=&quot;card-info-address[^&quot;]*&quot;&gt;&lt;\/span&gt;\s*&lt;span&gt;([^,]*),\s*[\d]*\s[^&lt;]*&lt;\/span&gt;</street>
+				<city>class=&quot;card-info-address[^&quot;]*&quot;&gt;&lt;\/span&gt;\s*&lt;span&gt;[^,]*,\s*[\d]*\s([^&lt;]*)&lt;\/span&gt;</city>
+				<zipcode>class=&quot;card-info-address[^&quot;]*&quot;&gt;&lt;\/span&gt;\s*&lt;span&gt;[^,]*,\s*([\d]*)\s[^&lt;]*&lt;\/span&gt;</zipcode>
+			</entry>
+			<entry firstOccurance="name">
+				<name>&lt;h1 class='[^']*'&gt;&lt;span itemprop='name'&gt;([^&lt;]*)&lt;\/span&gt;</name>
+				<street>class='title-card-address[^']*'&gt;([^,]*),\s*[\d]*\s[^&lt;]*&lt;\/div&gt;</street>
+				<city>class='title-card-address[^']*'&gt;[^,]*,\s*[\d]*\s([^&lt;]*)&lt;\/div&gt;</city>
+				<zipcode>class='title-card-address[^']*'&gt;[^,]*,\s*([\d]*)\s[^&lt;]*&lt;\/div&gt;</zipcode>
+			</entry>
+			<entry firstOccurance="city">
+				<company>&quot;DetailEntryName&quot;:&quot;([^&quot;]*)&quot;[^&quot;]*&quot;EntryType&quot;:&quot;Professional&quot;</company>
+				<city>&quot;DetailEntryCity&quot;:&quot;([^&quot;]*)&quot;</city>
+				<street>class='title-card-address[^']*'&gt;([^,]*),\s*[\d]*\s[^&lt;]*&lt;\/div&gt;</street>
+				<zipcode>class='title-card-address[^']*'&gt;[^,]*,\s*([\d]*)\s[^&lt;]*&lt;\/div&gt;</zipcode>
+			</entry>
 		</website>
-		<website name="tel.search.ch" url="http://tel.search.ch/result.html?tel=$NUMBER" prefix="0">
+		<website name="tel.search.ch" url="https://tel.search.ch/?tel=$NUMBER" prefix="0">
 			<entry firstOccurance="name">
 				<name>&lt;h[1-9]&gt;&lt;a[^&gt;]*&gt;\s*([^&lt;]*)&lt;</name>
 				<street>&lt;div class=&quot;tel-address&quot;&gt;([^,]*),\s+</street>
@@ -831,7 +836,7 @@
 				<company>&lt;div class="tel-occupation"&gt;([^&lt;]*)&lt;/div&gt;</company>
 			</entry>
 			<entry firstOccurance="name">
-			    <name>&lt;h1&gt;\s*([^&lt;]*)&lt;/h1&gt;</name>
+				<name>&lt;h1&gt;\s*([^&lt;]*)&lt;</name>
 				<street>span class=&quot;street-address&quot;&gt;([^&lt;]*)&lt;/span&gt;</street>
 				<city>span class=&quot;locality&quot;&gt;([^&lt;]*)&lt;/span&gt;</city>
 				<zipcode>span class=&quot;postal-code&quot;&gt;([^&lt;]*)&lt;/span&gt;</zipcode>
@@ -850,28 +855,29 @@
 		</website>
 	</country>
 	<country code="+43">
-		<website name="herold.at (Privat)" url="http://www.herold.at/servlet/at.herold.sp.servlet.SPWPSearchServlet?searchmask=2&amp;phone=$NUMBER" prefix="0">
+		<website name="herold.at (Privat)" url="https://www.herold.at/telefonbuch/telefon_$NUMBER" prefix="0">
 			<entry>
-			    <name>&lt;h2 class=&quot;fullw&quot;&gt;&lt;a\s+[^&gt;]*&gt;([^&lt;]*)&lt;</name>
-				<street>&lt;div class=&quot;addr fullw&quot;&gt;&lt;p&gt;[\d]+ [^,]*, ([^&lt;]*)&lt;br /&gt;</street>
-				<city>&lt;div class=&quot;addr fullw&quot;&gt;&lt;p&gt;[\d]+ ([^,]*), [^&lt;]*&lt;br /&gt;</city>
-				<zipcode>&lt;div class=&quot;addr fullw&quot;&gt;&lt;p&gt;([\d]+) [^,]*, [^&lt;]*&lt;br /&gt;</zipcode>
+				<name>&lt;h2&gt;&lt;a[^&gt;]*&gt;&lt;span itemprop=&quot;name&quot;&gt;([^&lt;]*)&lt;\/span&gt;</name>
+				<street>&lt;p class=&quot;address&quot;>([^,]*),\s*[\d]*\s[^&lt;]*&lt;\/p&gt;</street>
+				<city>&lt;p class=&quot;address&quot;>[^,]*,\s*[\d]*\s([^&lt;]*)&lt;\/p&gt;</city>
+				<zipcode>&lt;p class=&quot;address&quot;>[^,]*,\s*([\d]*)\s[^&lt;]*&lt;\/p&gt;</zipcode>
 			</entry>
 		</website>
-		<website name="herold.at (Firma)" url="http://www.herold.at/servlet/at.herold.sp.servlet.SPYPSearchServlet?searchmask=2&amp;phone=$NUMBER" prefix="0">
+		<website name="herold.at (Firma)" url="https://www.herold.at/gelbe-seiten/telefon_$NUMBER" prefix="0">
 			<entry>
-			    <company>&lt;h2 class=&quot;fullw&quot;&gt;&lt;a\s+[^&gt;]*&gt;([^&lt;]*)&lt;</company>
-				<street>&lt;div class=&quot;addr fullw&quot;&gt;(?:&lt;p[^&gt;]*&gt;)(?:&lt;a href[^&gt;]*&gt;[^&lt;]*&lt;/a&gt;)(?:&lt;/p&gt;)&lt;p&gt;[\d]+ [^,]*, ([^&lt;]*)&lt;br /&gt;&lt;/p&gt;</street>
-				<city>&lt;div class=&quot;addr fullw&quot;&gt;(?:&lt;p[^&gt;]*&gt;)(?:&lt;a href[^&gt;]*&gt;[^&lt;]*&lt;/a&gt;)(?:&lt;/p&gt;)&lt;p&gt;[\d]+ ([^,]*), [^&lt;]*&lt;br /&gt;&lt;/p&gt;</city>
-				<zipcode>&lt;div class=&quot;addr fullw&quot;&gt;(?:&lt;p[^&gt;]*&gt;)(?:&lt;a href[^&gt;]*&gt;[^&lt;]*&lt;/a&gt;)(?:&lt;/p&gt;)&lt;p&gt;([\d]+) [^,]*, [^&lt;]*&lt;br /&gt;&lt;/p&gt;</zipcode>
+				<company>&lt;h2&gt;&lt;a[^&gt;]*&gt;&lt;span itemprop=&quot;name&quot;&gt;([^&lt;]*)&lt;\/span&gt;</company>
+				<street>&lt;p class=&quot;address&quot;>([^,]*),\s*[\d]*\s[^&lt;]*&lt;\/p&gt;</street>
+				<city>&lt;p class=&quot;address&quot;>[^,]*,\s*[\d]*\s([^&lt;]*)&lt;\/p&gt;</city>
+				<zipcode>&lt;p class=&quot;address&quot;>[^,]*,\s*([\d]*)\s[^&lt;]*&lt;\/p&gt;</zipcode>
 			</entry>
 		</website>
-		<website name="tb-online.at" url="http://www.dasschnelle.at/result/index?what=$NUMBER" prefix="0" charset="utf-8">
+		<website name="tb-online.at" url="https://www.dasschnelle.at/ergebnisse?what=$NUMBER&amp;where=&amp;distance=0&amp;search_button=SUCHEN" prefix="0" charset="utf-8">
 			<entry>
-				<name>name\s*:\s*&quot;([^&quot;]*)&quot;</name>
-				<street>strasse\s*:\s*&quot;([^&quot;]*)&quot;</street>
-				<city>ort\s*:\s*&quot;([^&quot;]*)&quot;</city>
-				<zipcode>plz\s*:\s*&quot;([^&quot;]*)&quot;</zipcode>
+				<name>&quot;name&quot;:&quot;([^&quot;]*)&quot;</name>
+				<street>&quot;str&quot;:&quot;([^&quot;]*)&quot;</street>
+				<housenumber>&quot;hnr&quot;:(?:&quot;)*([^,&quot;]*)(?:&quot;)*,</housenumber>
+				<city>&quot;ort&quot;:&quot;([^&quot;]*)&quot;</city>
+				<zipcode>&quot;plz&quot;:([^,]*),</zipcode>
 			</entry>
 		</website>				
 	</country>
@@ -886,12 +892,12 @@
 		</website>
 	</country>
 	<country code="+46">
-		<website name="privatpersoner.eniro.se" url="http://personer.eniro.se/query?what=wp&amp;search_word=$NUMBER" prefix="0" numLines="5">
-		    <entry>
-				<name>&lt;span\s+class=&quot;hit-name-ellipsis&quot;&gt;\s*&lt;a[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;</name>
-				<street>&lt;span\s+class=&quot;hit-street-address&quot;&gt;\s*([^&lt;]*)&lt;/span&gt;</street>
-				<city>&lt;span\s+class=&quot;hit-address-locality&quot;&gt;\s*([^&lt;]*)&lt;/span&gt;</city>
-				<zipcode>&lt;span\s+class=&quot;hit-postal-code&quot;&gt;\s*([^&lt;]*)&lt;/span&gt;</zipcode>
+		<website name="privatpersoner.eniro.se" url="https://www.eniro.se/$NUMBER/personer" prefix="0">
+			<entry firstOccurance="city">
+				<name>&quot;name&quot;:&quot;([^&quot;]*)&quot;</name>
+				<street>&quot;streetAddress&quot;:&quot;([^&quot;]*)&quot;</street>
+				<city>&quot;addressLocality&quot;:&quot;([^&quot;]*)&quot;</city>
+				<zipcode>&quot;postalCode&quot;:&quot;([^&quot;]*)&quot;</zipcode>
 		    </entry>
 		</website>
 	</country>
@@ -976,7 +982,7 @@
 		</website>
 	</country>
 	<country code="+49">
-		<website name="www.dasoertliche.de" url="http://www.dasoertliche.de/Controller?form_name=search_inv&amp;ph=$NUMBER" prefix="0" numLines="3">
+		<website name="www.dasoertliche.de" url="https://www.dasoertliche.de/Controller?form_name=search_inv&amp;ph=$NUMBER" prefix="0" numLines="3">
 		    <entry>
 				<name>(?i)class=&quot;name\s*&quot;(?:\s+onmouseover=&quot;&quot;)?(?:\s+onmouseout=&quot;&quot;)?&gt;&lt;span class=&quot;&quot;&gt;([^&lt;]*)&lt;/span&gt;</name>
 		        <street>(?i)&lt;address&gt;\s*([^,]*),.*&lt;span class=&quot;&quot;&gt;[^&lt;]*&lt;/span&gt;(?:&lt;span.*&lt;/span&gt;)?\s*&lt;/address&gt;</street>
@@ -1030,7 +1036,7 @@
 	        </entry>
 	    </website>
 -->
-		<website name="www.dastelefonbuch.de" url="http://www.dastelefonbuch.de/Suche?kw=$NUMBER" prefix="0" numLines="6">
+		<website name="www.dastelefonbuch.de" url="https://www.dastelefonbuch.de/Suche?kw=$NUMBER" prefix="0" numLines="6">
 			<entry>	
 				<name>&lt;div class=&quot;vcard clearfix&quot;[^&gt;]*&gt;\s*&lt;h[1-9]&gt;\s*(?:&lt;span itemprop=&quot;name(?: itemreviewed)?&quot;&gt;)?([^&lt;]*)(?:&lt;/span&gt;)?\s*&lt;/h[1-9]&gt;</name>
 				<street>&lt;address&gt;([^&lt;]*)&lt;br /&gt;[^&lt;]*&lt;span itemprop=&quot;locality&quot;&gt;[^&lt;]*&lt;/span&gt;</street>
@@ -1057,7 +1063,7 @@
 			    <zipcode>&lt;a href=&quot;#&quot; class=&quot;addr&quot; (?:rel=&quot;nofollow&quot; )?title=&quot;[^,]*,\s+([\d]+)\s+[^&quot;]*&quot;&gt;</zipcode>
 			</entry>
 		</website>
-		<website name="www.goyellow.de" url="https://www.goyellow.de/inverssuche/?TEL=$NUMBER" prefix="0" numLines="7">
+		<website name="www.goyellow.de" url="https://www.goyellow.de/suche?what=$NUMBER" prefix="0" numLines="7">
 	        <entry>
  	            <name>&lt;h\d itemprop=&quot;name&quot;[^&gt;]*&gt;\s*&lt;a[^&gt;]*&gt;\s*&lt;span[^&gt;]*&gt;\s*([^&lt;]*)&lt;/span&gt;\s*&lt;/a&gt;\s*&lt;/h\d&gt;</name>
 		  		<street>&lt;meta itemprop=&quot;streetAddress&quot; content=&quot;([^&quot;]*)&quot; /&gt;</street>
@@ -1071,7 +1077,8 @@
 	        	<zipcode>&lt;meta itemprop=&quot;postalCode&quot; content=&quot;([^&quot;]*)&quot; /&gt;</zipcode>
 	        </entry>
 		</website>
-		<website name="www.11880.com" url="http://www.11880.com/rueckwaertssuche/$NUMBER" prefix="0" numLines="7">
+		<!-- does not work anymore
+		<website name="www.11880.com" url="https://www.11880.com/suche/$NUMBER/deutschland" prefix="0" numLines="7">
    	        <entry firstOccurance="name">
 	            <name>(?i)&lt;h\d (?:class=&quot;headbox&quot;\s*)?itemprop=&quot;name&quot;\s*[^&gt;]*&gt;\s*([^&lt;]*)\s*&lt;/h\d&gt;</name>
 	        	<street>(?i)&lt;div class=&quot;address\s*&quot;&gt;\s*&lt;p[^&gt;]*&gt;\s*([^&lt;]*)&lt;/p&gt;\s*&lt;p[^&gt;]*&gt;[^&lt;]*&lt;/p&gt;\s*&lt;/div&gt;</street>
@@ -1091,6 +1098,7 @@
 	        	<zipcode>&lt;div class=&quot;entryData&quot;&gt;\s*(?:&lt;p&gt;)?[^&lt;]*&lt;br&gt;\s*([\d]*)\s[^&lt;]*&lt;</zipcode>
 	        </entry>
 		</website>
+		-->
 	</country>
 	<country code="+501">
 		<website name="belizeweb.com" url="http://www.belizeweb.com:8080/directory/index-new.jsp" cookie="(JSESSIONID=[^;]*);" nexturl="http://www.belizeweb.com:8080/directory/index-new.jsp?dirlist=$PART1-$PART2&amp;imageField.x=0&amp;imageField.y=0&amp;maxrecords=5" post="" hidden="(wrzlgrmpf)" prefix="">

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.jfritz</groupId>
     <artifactId>jfritz</artifactId>
-    <version>0.7.6</version>
+    <version>0.7.7</version>
     <packaging>jar</packaging>
     <description>A program to communicate with your FRITZ!Box</description>
 
@@ -27,7 +27,8 @@
 
         <version.proxy>1.0.2</version.proxy>
         <version.fboxlib>1.0.26</version.fboxlib>
-        <version.reverseLookup>1.0.10</version.reverseLookup>
+        <version.reverseLookup>1.0.11</version.reverseLookup>
+        <version.FritzTR064>0.9.3</version.FritzTR064>
 
         <version.httpClient>4.5.3</version.httpClient>
         <version.commonsIo>2.4</version.commonsIo>
@@ -74,6 +75,12 @@
             <version>${version.reverseLookup}</version>
         </dependency>
 
+        <dependency>
+            <groupId>de.bausdorf.fritz</groupId>
+            <artifactId>FritzTR064</artifactId>
+            <version>${version.FritzTR064}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/src/main/java/de/moonflower/jfritz/box/BoxClass.java b/src/main/java/de/moonflower/jfritz/box/BoxClass.java
@@ -17,7 +17,8 @@ public abstract class BoxClass
 			   BoxUPnPStatisticsInterface,
 			   BoxPortsInterface,
 			   BoxDoCallInterface,
-			   BoxNewIpInterface
+			   BoxNewIpInterface,
+			   BoxTR064Interface
 {
 	private Vector<BoxStatusListener> boxListener;
 

diff --git a/src/main/java/de/moonflower/jfritz/box/BoxTR064Interface.java b/src/main/java/de/moonflower/jfritz/box/BoxTR064Interface.java
@@ -0,0 +1,8 @@
+package de.moonflower.jfritz.box;
+
+import java.io.IOException;
+
+public interface BoxTR064Interface {
+    boolean is2FAenabled() throws IOException, NoSuchFieldException;
+    String getDialPort() throws IOException, NoSuchFieldException;
+}
diff --git a/src/main/java/de/moonflower/jfritz/box/BoxUPnPStatisticsInterface.java b/src/main/java/de/moonflower/jfritz/box/BoxUPnPStatisticsInterface.java
@@ -5,9 +5,11 @@
 import de.moonflower.jfritz.utils.network.UPNPExternalIpListener;
 import de.moonflower.jfritz.utils.network.UPNPStatusInfoListener;
 
+import java.io.IOException;
+
 public interface BoxUPnPStatisticsInterface {
-	public void getInternetStats(UPNPAddonInfosListener listener);
-	public void getStatusInfo(UPNPStatusInfoListener listener);
-	public void getExternalIPAddress(UPNPExternalIpListener listener);
-	public void getCommonLinkInfo(UPNPCommonLinkPropertiesListener listener);
+	void getInternetStats(UPNPAddonInfosListener listener) throws NoSuchFieldException, IOException;
+	void getStatusInfo(UPNPStatusInfoListener listener) throws IOException, NoSuchFieldException;
+	void getExternalIPAddress(UPNPExternalIpListener listener) throws IOException, NoSuchFieldException;
+	void getCommonLinkInfo(UPNPCommonLinkPropertiesListener listener) throws IOException, NoSuchFieldException;
 }