Merge branch 'release/0.7.8'

jfritz-org · Feb 2, 2020 · 2d0ac53 · 2d0ac53
2 parents 4f1bb1c + de4cb02
commit 2d0ac53
Show file tree

Hide file tree

Showing 25 changed files with 869 additions and 148 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,4 +1,22 @@
-JFritz 0.7.7:
+JFritz 0.7.8:
+- Bugfix: enable usage of dial assist if login method is PASSWORD (without an username)
+- Bugfix: Fixed errors with Java 11 or newer
+- Using new version of de.bausdorf.fritz.FritzTR064
+  - Usage of HTTPS for TR064 communication
+- Improved detection of login method using TR064
+- Disable dial assist if TR064 is disabled or login method prohibits usage of it
+- Disable monitoring if TR064 is disabled
+- Improved logging
+
+New Strings:
+enable_tr064
+login_using_button
+login_using_button_1
+login_using_button_2
+login_using_button_3
+login_using_button_4
+
+JFritz 0.7.7:
 - Fixed some errors in Reverselookup for
   - Austria
   - Germany

diff --git a/Changelog_Full.txt b/Changelog_Full.txt
@@ -20,6 +20,24 @@ 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.8:
+- Bugfix: enable usage of dial assist if login method is PASSWORD (without an username)
+- Bugfix: Fixed errors with Java 11 or newer
+- Using new version of de.bausdorf.fritz.FritzTR064
+  - Usage of HTTPS for TR064 communication
+- Improved detection of login method using TR064
+- Disable dial assist if TR064 is disabled or login method prohibits usage of it
+- Disable monitoring if TR064 is disabled
+- Improved logging
+
+New Strings:
+enable_tr064
+login_using_button
+login_using_button_1
+login_using_button_2
+login_using_button_3
+login_using_button_4
+
 JFritz 0.7.7:
 - Cleanup code base
 - Fixed some errors in Reverselookup for

diff --git a/lang/jfritz_de_DE.properties b/lang/jfritz_de_DE.properties
@@ -85,9 +85,6 @@ 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
@@ -345,6 +342,8 @@ enable_inet_monitoring = Internet\u00FCberwachung einschalten
 
 enabled = Aktiviert
 
+enable_tr064 = Aktivieren Sie TR064, um diese Funktion zu nutzen
+
 english = Englisch
 
 entries = %N Eintr\u00E4ge
@@ -531,6 +530,12 @@ lock_error_dialog3 = In diesem Fall k\u00F6nnen Sie JFritz mit diesem \nDialog s
 
 lock_error_dialog4 = \n\nSoll diese Instanz von JFritz beendet werden?
 
+login_using_button = Funktion "Anmeldung mit Tastendruck" ist aktiviert, daher kann JFritz nicht mit der Box kommunizieren.
+login_using_button_1 = Um die Funktion "Anmeldung mit Tastendruck" zu deaktivieren, \u00F6ffnen Sie die Einstellungen ihrer FritzBox im Browser.
+login_using_button_2 = Gehen Sie zu "System - FRITZ!Box-Benutzer - Anmeldung im Heimnetz" und entfernen Sie den Haken bei
+login_using_button_3 = "Anmeldung mit Tastendruck" oder setzen Sie die Funktion auf 
+login_using_button_4 = "Anmeldung mit dem FRITZ!Box-Kennwort oder "Anmeldung mit FRITZ!Box-Benutzernamen und Kennwort".
+
 long_distance_call = Ferngespr\u00E4ch
 
 lookup_after_fetch = Nach Laden R\u00FCckw\u00E4rtssuche ausf\u00FChren

diff --git a/lang/jfritz_en_US.properties b/lang/jfritz_en_US.properties
@@ -84,9 +84,6 @@ 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
@@ -343,6 +340,8 @@ enable_inet_monitoring = Enable Internet Monitoring
 
 enabled = Enabled
 
+enable_tr064 = Please enable TR064 to use this functionality
+
 english = english
 
 entries = %N entries
@@ -529,6 +528,12 @@ lock_error_dialog3 = In \nthis case it is safe to start JFritz with this Dialog.
 
 lock_error_dialog4 = \n\nShould this instance of JFritz be terminated?
 
+login_using_button = "Anmeldung mit Tastendruck" is activated, JFritz cannot communicate with your FRITZ!Box.
+login_using_button_1 = To disable "Anmeldung mit Tastendruck", go to your FRITZ!Box web interface and go to
+login_using_button_2 = "System - FRITZ!Box-Benutzer - Anmeldung im Heimnetz" and unset checkmark of
+login_using_button_3 = "Anmeldung mit Tastendruck" or set login to
+login_using_button_4 = "Anmeldung mit dem FRITZ!Box-Kennwort or "Anmeldung mit FRITZ!Box-Benutzernamen und Kennwort".
+
 long_distance_call = Long distance call
 
 lookup_after_fetch = Perform reverse look up afer loading call list

diff --git a/log4j.xml b/log4j.xml
@@ -10,19 +10,23 @@
   </appender>
 
   <category name="de.moonflower.jfritz">
-    <priority value="error"/>
+    <priority value="warn"/>
   </category>
 
   <category name="de.moonflower.jfritz.Main">
     <priority value="info"/>
   </category>
 
+  <category name="de.moonflower.jfritz.box.fritzbox.FritzBox">
+    <priority value="info"/>
+  </category>
+
   <category name="de.robotniko.helper">
-    <priority value="error"/>
+    <priority value="warn"/>
   </category>
 
   <category name="de.robotniko.reverseLookup">
-    <priority value="error"/>
+    <priority value="warn"/>
   </category>
 
   <root>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.jfritz</groupId>
     <artifactId>jfritz</artifactId>
-    <version>0.7.7</version>
+    <version>0.7.8</version>
     <packaging>jar</packaging>
     <description>A program to communicate with your FRITZ!Box</description>
 
@@ -27,8 +27,8 @@
 
         <version.proxy>1.0.2</version.proxy>
         <version.fboxlib>1.0.26</version.fboxlib>
-        <version.reverseLookup>1.0.11</version.reverseLookup>
-        <version.FritzTR064>0.9.3</version.FritzTR064>
+        <version.reverseLookup>1.0.12</version.reverseLookup>
+        <version.FritzTR064>0.9.5</version.FritzTR064>
 
         <version.httpClient>4.5.3</version.httpClient>
         <version.commonsIo>2.4</version.commonsIo>
@@ -79,6 +79,12 @@
             <groupId>de.bausdorf.fritz</groupId>
             <artifactId>FritzTR064</artifactId>
             <version>${version.FritzTR064}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -129,6 +135,12 @@
             <version>${version.fontchooser}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>1.7.8</version>
+        </dependency>
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -309,6 +321,16 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <manifestEntries>

diff --git a/src/main/java/de/moonflower/jfritz/AboutJFritz.java b/src/main/java/de/moonflower/jfritz/AboutJFritz.java
@@ -63,7 +63,7 @@ private JPanel initMainPanel() {
 		JLabel revision = new JLabel("Revision: " + ProgramConstants.REVISION);
 		JLabel buildDate = new JLabel("Build: " + ProgramConstants.BUILD_DATE);
 		JLabel newLine = new JLabel(" ");
-		JLabel admin = new JLabel("Project-admin: Robert Palmer <jfritz@robotniko.de>");
+		JLabel admin = new JLabel("Project-admin: Robert Palmer <robert@jfritz.org>");
 		JLabel initiator = new JLabel("Project-initiator: Arno Willig <akw@thinkwiki.org>");
 		JLabel newLine2 = new JLabel(" ");
 		JLabel copyright = new JLabel("(c) 2005 - " + cal.get(Calendar.YEAR) + " by all members of the JFritz-Team");
@@ -166,7 +166,7 @@ public void actionPerformed(ActionEvent action) {
 
 	private void showCredits() {
 		JOptionPane.showMessageDialog(this, "Active Developers:\n"
-		+ "Robert Palmer <robotniko@users.sourceforge.net>\n" 	//$NON-NLS-1$
+		+ "Robert Palmer <robert@jfritz.org>\n" 	//$NON-NLS-1$
 		+ "\n"													//$NON-NLS-1$
 		+ "Former Developers:\n" 								//$NON-NLS-1$
 		+ "Arno Willig <akw@thinkwiki.org>\n"					//$NON-NLS-1$

diff --git a/src/main/java/de/moonflower/jfritz/JFritzWindow.java b/src/main/java/de/moonflower/jfritz/JFritzWindow.java
@@ -446,9 +446,15 @@ public JToolBar createMainToolBar() {
 		mBar.add(monitorButton);
 
 		calldialogButton = new JButton();
-		calldialogButton.setToolTipText(messages.getMessage("dial_assist"));
-		calldialogButton.setActionCommand("callDialog");
-		calldialogButton.addActionListener(this);
+		if (JFritz.getBoxCommunication().getBox(0).isDialAssistAvailable()) {
+			calldialogButton.setToolTipText(messages.getMessage("dial_assist"));
+			calldialogButton.setActionCommand("callDialog");
+			calldialogButton.addActionListener(this);
+			calldialogButton.setEnabled(true);
+		} else {
+			calldialogButton.setToolTipText(messages.getMessage("enable_tr064"));
+			calldialogButton.setEnabled(false);
+		}
 		calldialogButton.setIcon(getImage("PhoneBig.png"));
 		mBar.add(calldialogButton);
 
@@ -897,8 +903,7 @@ public void finished() {
 
 	/**
 	 * Shows the configuration dialog
-	 * @throws de.robotniko.fboxlib.exceptions.InvalidCredentialsException 
-	 * @throws InvalidCredentialsException 
+	 * @throws InvalidCredentialsException
 	 * @throws PageNotFoundException 
 	 * @throws LoginBlockedException 
 	 */

diff --git a/src/main/java/de/moonflower/jfritz/Main.java b/src/main/java/de/moonflower/jfritz/Main.java
@@ -8,7 +8,7 @@
  * Created on 08.04.2005
  *
  * Authors working on the project:
- * 		robotniko	Robert Palmer <robotniko@gmx.de>
+ * 		robotniko	Robert Palmer <robert@jfritz.org>
  *
  * This tool is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -203,7 +203,7 @@ public class Main  {
 
 	public final static String JFRITZ_PROJECT = "all members of the JFritz-Team";
 
-	public final static String PROJECT_ADMIN = "Robert Palmer <robotniko@users.sourceforge.net>"; //$NON-NLS-1$
+	public final static String PROJECT_ADMIN = "Robert Palmer <robert@jfritz.org>"; //$NON-NLS-1$
 
 	public final static String JFRITZ_HIDDEN_DIR = ".jfritz";
 

diff --git a/src/main/java/de/moonflower/jfritz/box/BoxTR064Interface.java b/src/main/java/de/moonflower/jfritz/box/BoxTR064Interface.java
@@ -3,6 +3,8 @@
 import java.io.IOException;
 
 public interface BoxTR064Interface {
+    boolean isTR064Available();
+    boolean isDialAssistAvailable();
     boolean is2FAenabled() throws IOException, NoSuchFieldException;
     String getDialPort() throws IOException, NoSuchFieldException;
 }