From 3c55145f58946dcb69c5d0b1bbd14d5b4131adb2 Mon Sep 17 00:00:00 2001
From: y20k <mail@y20k.org>
Date: Tue, 10 Nov 2015 10:49:15 +0100
Subject: [PATCH] fixed a bug with notification update when renaming a station

---
 app/src/main/AndroidManifest.xml              |  7 ++++---
 .../y20k/transistor/helpers/DialogRename.java | 19 ++++++++++++++-----
 .../res/drawable/background_actionbar.xml     |  5 -----
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/xml/backupscheme.xml         |  5 +++++
 6 files changed, 24 insertions(+), 15 deletions(-)
 delete mode 100644 app/src/main/res/drawable/background_actionbar.xml
 create mode 100644 app/src/main/res/xml/backupscheme.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 299049c8..b87de91c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.y20k.transistor">
-<!--    android:versionCode="4"
+    package="org.y20k.transistor"
+    android:versionCode="4"
     android:versionName="0.9.3 (Young Americans)">
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" /> -->
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
+        android:fullBackupContent="@xml/backupscheme"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/TransistorAppTheme">
diff --git a/app/src/main/java/org/y20k/transistor/helpers/DialogRename.java b/app/src/main/java/org/y20k/transistor/helpers/DialogRename.java
index d4e5b641..7ba60887 100644
--- a/app/src/main/java/org/y20k/transistor/helpers/DialogRename.java
+++ b/app/src/main/java/org/y20k/transistor/helpers/DialogRename.java
@@ -17,6 +17,8 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -31,11 +33,13 @@
  */
 public class DialogRename {
 
-
     /* Define log tag */
     private static final String LOG_TAG = DialogRename.class.getSimpleName();
 
+
     /* Keys */
+    private static final String PLAYBACK = "playback";
+
 
     /* Main class variables */
     private final Context mContext;
@@ -88,11 +92,16 @@ public void onClick(DialogInterface arg0, int arg1) {
                         mStationRenamedListener.stationRenamed();
                     }
 
-//                    // put up changed notification (if playback)
-//                    NotificationHelper notificationHelper = new NotificationHelper(context);
-//                    notificationHelper.setStationName(mStationName);
-//                    notificationHelper.createNotification();
+                    // check for playback
+                    SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mContext);
+                    boolean playback = settings.getBoolean(PLAYBACK, false);
 
+                    if (playback) {
+                        // put up changed notification
+                        NotificationHelper notificationHelper = new NotificationHelper(mContext);
+                        notificationHelper.setStationName(mStationName);
+                        notificationHelper.createNotification();
+                    }
 
                 }
             }
diff --git a/app/src/main/res/drawable/background_actionbar.xml b/app/src/main/res/drawable/background_actionbar.xml
deleted file mode 100644
index f54b8c91..00000000
--- a/app/src/main/res/drawable/background_actionbar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#CC0000" />
-</shape>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f75a52d8..97c88b92 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -59,7 +59,7 @@
         <body>
             <h1>Wie Transistor funktioniert</h1>
             <h2>Wie füge ich eine neue Radiostation hinzu?</h2>
-            <p>Die einfachste Variante eine neue Station hinzuzufügen ist: Im Web nach Streaminglinks (M§U und PLS) suchen und diese dann mit Transistor öffnen. Man kann zudem auch auf das (+)-Symbol tippen und M3U-Links via Copy und Paste direkt eingeben.</p>
+            <p>Die einfachste Variante eine neue Station hinzuzufügen ist: Im Web nach Streaminglinks (M3U und PLS) suchen und diese dann mit Transistor zu öffnen. Man kann zudem auch auf das (+)-Symbol tippen und Streaminglinks via Copy und Paste direkt eingeben.</p>
             <h2>Wie schalte ich das Radio ein?</h2>
             <p>Den großen Play-Knopf drücken ;).</p>
             <h2>Wie schalte ich das Radio wieder aus?</h2>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 978fddb2..78eaf750 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,7 +47,6 @@
     <string name="notification_swipe_to_stop">Swipe to stop</string>
     <string name="notification_playing">Playing</string>
 
-
     <!-- misc -->
     <string name="title_activity_infosheet">Info Sheet</string>
 
diff --git a/app/src/main/res/xml/backupscheme.xml b/app/src/main/res/xml/backupscheme.xml
new file mode 100644
index 00000000..de7b18de
--- /dev/null
+++ b/app/src/main/res/xml/backupscheme.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- backup files from external storage -->
+    <include domain="external" />
+</full-backup-content>
\ No newline at end of file