Merge pull request #183 from tobexyz/feat/issue179

Feat/issue179

Author: tobexyz

fastlane/metadata/android/en-US/changelogs/40401.txt

@@ -0,0 +1,7 @@
+Version 4.4.1
+- added chinese translations
+- allow disabling of media store filtering
+- minor bug fixes
+
+
+

yaacc/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="40500"
-    android:versionName="4.5.0-SNAPSHOT">
+    android:versionCode="40401"
+    android:versionName="4.4.1">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

yaacc/src/main/java/de/yaacc/upnp/YaaccNetworkAddressFactoryImpl.java

@@ -89,9 +89,14 @@ public Iterator<InetAddress> getBindAddresses() {
         List<InetAddress> result = new ArrayList<>();
         if (YaaccUpnpServerService.getIfName(context) != null) {
             try {
-                Enumeration<InetAddress> iter = NetworkInterface.getByName(YaaccUpnpServerService.getIfName(context)).getInetAddresses();
-                while (iter.hasMoreElements()) {
-                    result.add(iter.nextElement());
+                if (NetworkInterface.getByName(YaaccUpnpServerService.getIfName(context)) != null) {
+                    Enumeration<InetAddress> iter = NetworkInterface.getByName(YaaccUpnpServerService.getIfName(context)).getInetAddresses();
+                    while (iter.hasMoreElements()) {
+                        result.add(iter.nextElement());
+                    }
+                } else {
+                    Log.d(getClass().getName(),
+                            "network interface not found by name, maybe device is offline");
                 }
             } catch (
                     SocketException se) {

yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerService.java

@@ -248,6 +248,9 @@ private void cancleNotification() {
      *
      */
     private void initialize() {
+        if (getUpnpClient() == null) {
+            setUpnpClient(new UpnpClient());
+        }
         if (!getUpnpClient().isInitialized()) {
             getUpnpClient().initialize(getApplicationContext());
             watchdog = false;
@@ -264,7 +267,7 @@ public void run() {
             }
 
         }
-        if (getUpnpClient().isInitialized()) {
+        if (getUpnpClient() != null && getUpnpClient().isInitialized()) {
             if (preferences.getBoolean(getApplicationContext().getString(R.string.settings_local_server_provider_chkbx), false)) {
                 if (localServer == null) {
                     localServer = createMediaServerDevice();
@@ -426,11 +429,11 @@ private void startUpnpAliveNotifications() {
                 public void run() {
                     Log.v(YaaccUpnpServerService.this.getClass().getName(), "Sending upnp alive notivication");
                     SendingNotificationAlive sendingNotificationAlive;
-                    if (localServer != null) {
+                    if (localServer != null && getUpnpClient() != null) {
                         sendingNotificationAlive = new SendingNotificationAlive(getUpnpClient().getRegistry().getUpnpService(), localServer);
                         sendingNotificationAlive.run();
                     }
-                    if (localRenderer != null) {
+                    if (localRenderer != null && getUpnpClient() != null) {
                         sendingNotificationAlive = new SendingNotificationAlive(getUpnpClient().getRegistry().getUpnpService(), localRenderer);
                         sendingNotificationAlive.run();
                     }
@@ -448,6 +451,9 @@ public void run() {
      * @return the time
      */
     private int getUpnpNotificationFrequency() {
+        if (getUpnpClient() == null) {
+            return -1;
+        }
         return Integer.parseInt(preferences.getString(getUpnpClient().getContext().getString(R.string.settings_sending_upnp_alive_interval_key), "5000"));
     }