Merge remote-tracking branch 'origin/master'

y20k · Feb 14, 2018 · 5eafc7e · 5eafc7e
2 parents a5fa349 + 88acd82
commit 5eafc7e
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 4 deletions.
diff --git a/app/src/main/java/org/y20k/transistor/MainActivityFragment.java b/app/src/main/java/org/y20k/transistor/MainActivityFragment.java
@@ -211,6 +211,8 @@ public void onResume() {
         // refresh app state
         loadAppState(mActivity);
 
+        LogHelper.e(LOG_TAG, "!!! Intent! -> " + mActivity.getIntent().getAction() + mActivity.getIntent().getData() ); // todo remove
+
         // handles the activity's intent
         Intent intent = mActivity.getIntent();
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {

diff --git a/app/src/main/java/org/y20k/transistor/helpers/NotificationHelper.java b/app/src/main/java/org/y20k/transistor/helpers/NotificationHelper.java
@@ -130,7 +130,7 @@ private static NotificationCompat.Builder getNotificationBuilder(Context context
         style.setMediaSession(mSession.getSessionToken());
         style.setShowActionsInCompactView(0);
         style.setShowCancelButton(true); // pre-Lollipop workaround
-        style.setCancelButtonIntent(swipeActionPendingIntent); // todo check if swipeActionPendingIntent is called
+        style.setCancelButtonIntent(swipeActionPendingIntent);
 
         // construct notification in builder
         NotificationCompat.Builder builder;

diff --git a/app/src/main/java/org/y20k/transistor/helpers/PackageValidator.java b/app/src/main/java/org/y20k/transistor/helpers/PackageValidator.java
@@ -125,7 +125,7 @@ public boolean isCallerAllowed(Context context, String callingPackage, int calli
         }
 
         // Check if the package name is valid for the certificate:
-        StringBuffer expectedPackages = new StringBuffer();
+        StringBuilder expectedPackages = new StringBuilder();
         for (CallerInfo info: validCallers) {
             if (callingPackage.equals(info.packageName)) {
                 LogHelper.v(LOG_TAG, "Valid caller: " + info.name + "  package=" + info.packageName +

diff --git a/app/src/main/java/org/y20k/transistor/helpers/StationListHelper.java b/app/src/main/java/org/y20k/transistor/helpers/StationListHelper.java
@@ -148,7 +148,6 @@ public static ArrayList<Station> loadStationListFromStorage(Context context) {
         // get Uri of currently playing station - CASE: PlayerService is active, but Activity has been killed
         String urlString = PreferenceManager.getDefaultSharedPreferences(context).getString(PREF_STATION_URL, null);
         Uri uri = null;
-        LogHelper.e(LOG_TAG, "!!!! MediaSession active: " +  PlayerService.isMediaSessionActive()); // todo remove
         if (urlString != null && PlayerService.isMediaSessionActive()) {
             uri = Uri.parse(urlString);
         }

diff --git a/app/src/main/res/layout/fragment_main_onboarding.xml b/app/src/main/res/layout/fragment_main_onboarding.xml
@@ -26,6 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="32dp"
+        android:contentDescription="@string/descr_arrow_upward"
         app:layout_constraintBottom_toBottomOf="@+id/onboarding_headline"
         app:layout_constraintEnd_toStartOf="@+id/onboarding_headline"
         app:layout_constraintTop_toTopOf="@+id/onboarding_headline"
@@ -36,6 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
+        android:contentDescription="@string/descr_arrow_upward"
         app:layout_constraintBottom_toBottomOf="@+id/onboarding_headline"
         app:layout_constraintStart_toEndOf="@+id/onboarding_headline"
         app:layout_constraintTop_toTopOf="@+id/onboarding_headline"
@@ -46,6 +48,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
+        android:contentDescription="@string/descr_app_icon"
         app:layout_constraintEnd_toEndOf="@+id/onboarding_headline"
         app:layout_constraintStart_toStartOf="@+id/onboarding_headline"
         app:layout_constraintTop_toBottomOf="@+id/onboarding_headline"

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Com utilitzar</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Mostra les opcions per l\'estació de ràdio</string>
     <string name="descr_station_icon">Icona de l\'emissora de ràdio</string>
     <string name="descr_station_name">Nom de l\'emissora de ràdio</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Wie Transistor funktioniert</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App-Icon in der Form eines alten Radios</string>
+    <string name="descr_arrow_upward">Nach oben weisender Pfeil</string>
     <string name="descr_station_options_button">Optionen für Radiosender anzeigen</string>
     <string name="descr_station_icon">Logo der Radiosender</string>
     <string name="descr_station_name">Name des Radiosenders</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Οδηγίες χρήσης</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Προβολή των επιλογών για το ραδιοσταθμό</string>
     <string name="descr_station_icon">Εικονίδιο του ραδιοσταθμού</string>
     <string name="descr_station_name">Το όνομα του ραδιοσταθμού</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Cómo utilizar</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Mostrar las opciones para la emisora de radio</string>
     <string name="descr_station_icon">Icono de emisora de radio</string>
     <string name="descr_station_name">Nombre de emisora de radio</string>

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Nola erabili</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Bistaratu irrati estazioaren aukerak</string>
     <string name="descr_station_icon">Irrati estazioaren ikonoa</string>
     <string name="descr_station_name">Irrati estazioaren izena</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Guide</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Options d\'affichage pour la station radio</string>
     <string name="descr_station_icon">Logo de la station radio</string>
     <string name="descr_station_name">Nom de la station radio</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">使用方法</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">ラジオ局の表示オプション</string>
     <string name="descr_station_icon">ラジオ局のアイコン</string>
     <string name="descr_station_name">ラジオ局の名前</string>

diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Amek ara tesqedceḍ</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Iɣewwaṛen n uskan n ṛṛadyu</string>
     <string name="descr_station_icon">Tignit n ṛṛadyu</string>
     <string name="descr_station_name">Isem n ṛṛadyu</string>

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Bruksanvisning</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Vis valg for radiostasjon</string>
     <string name="descr_station_icon">Miniatrybilde tilhørende radiostasjon</string>
     <string name="descr_station_name">Navn på radiostasjon</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Instrukcja obsługi</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Wyświetl opcje dla stacji</string>
     <string name="descr_station_icon">Ikona stacji</string>
     <string name="descr_station_name">Nazwa stacji</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Как использовать</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Показать опции радиостанции</string>
     <string name="descr_station_icon">Иконка радиостанции</string>
     <string name="descr_station_name">Название радиостанции</string>

diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Kako uporabljati</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Prikaz možnosti za radisjko postajo</string>
     <string name="descr_station_icon">Ikona radijske postaje</string>
     <string name="descr_station_name">Ime radijske postaje</string>

diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Како се користи</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Прикажи опције за радио станицу</string>
     <string name="descr_station_icon">Икона радио станице</string>
     <string name="descr_station_name">Назив радио станице</string>

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Nasıl kullanılır</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Radyo istasyonu için seçenekleri göster</string>
     <string name="descr_station_icon">Radyo istasyonunun simgesi</string>
     <string name="descr_station_name">Radyo istasyonunun ismi</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">Як користуватися</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Показ параметрів радіостанції</string>
     <string name="descr_station_icon">Піктограма для радіостанції</string>
     <string name="descr_station_name">Назва радіостанції</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -25,6 +25,8 @@
     <string name="header_howto">如何使用</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">显示电台选项</string>
     <string name="descr_station_icon">电台图标</string>
     <string name="descr_station_name">电台名称</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -24,6 +24,8 @@
     <string name="header_howto">How to use</string>
 
     <!-- descriptions -->
+    <string name="descr_app_icon">App icon depicting an old radio</string>
+    <string name="descr_arrow_upward">Arrow facing upward</string>
     <string name="descr_station_options_button">Display options for radio station</string>
     <string name="descr_station_icon">Icon of radio station</string>
     <string name="descr_station_name">Name of radio station</string>

diff --git a/javadoc_library.gradle b/javadoc_library.gradle
@@ -14,7 +14,7 @@
 android.libraryVariants.all { variant ->
     def name = variant.buildType.name
     if (!name.equals("release")) {
-        return; // Skip non-release builds.
+        return // Skip non-release builds.
     }
     task("generateJavadoc", type: Javadoc) {
         description = "Generates Javadoc for the ${javadocTitle}."