Merge pull request #41 from J05HI/wrong-confirm-button

Fix wrong confirm button label

README.md

@@ -19,8 +19,9 @@ There is also a nice library you can simply use in your projects.
 **This app and the included library will require root access to your device!
 If your device is not rooted you can neither use this app nor the library.**
 
-This app uses API Level 21, which has been introduced by Android Lollipop. If you use KitKat
-or lower, this app will not work.
+This app uses multiple features introduced in API Level 21 (Android 5.0 Lollipop), the JobScheduler
+and the the folder selection of the storage access framework. 
+If you use KitKat or lower, this app will not work.
 
 ### Credits
 
@@ -57,8 +58,6 @@ If you are unable to do that, but you still want to support this project, you co
 
 I will distribute bitcoins send to me to others helping on the project too, so that other people contributing also have a piece of the cake.
 
-I might later set up [BitHub](https://github.com/WhisperSystems/BitHub) for this purpose later (if there are a lot of donations to distribute), but this project is a little small for that, and BitHub works based on the commit count only, which I would like to modify before setting that up.
-
 ### Copyright
 
 Copyright (c) 2016 Jan Christian Grünhage. See LICENSE.txt for details.  

build.gradle

@@ -27,7 +27,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'
     }
 }
 

framework/src/main/java/de/arcus/framework/superuser/SuperUserPermissionRequestListener.java

@@ -1,9 +1,5 @@
 package de.arcus.framework.superuser;
 
-/**
- * Created by jcgruenhage on 1/18/17.
- */
-
 public interface SuperUserPermissionRequestListener {
     void superUserGranted(boolean granted);
 }

framework/src/main/java/de/arcus/framework/utils/FileTools.java

@@ -22,6 +22,8 @@
 
 package de.arcus.framework.utils;
 
+import android.os.Environment;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -42,10 +44,12 @@ public class FileTools {
     /**
      * Private constructor
      */
-    private FileTools() {}
+    private FileTools() {
+    }
 
     /**
      * Creates a directory if it not exists
+     *
      * @param dir Directory path
      * @return Returns true if the directory was created or already exists
      */
@@ -75,6 +79,7 @@ public class FileTools {
 
     /**
      * Checks if the directory exists
+     *
      * @param dir Path of the file
      * @return Return whether the directory exists
      */
@@ -87,6 +92,7 @@ public class FileTools {
 
     /**
      * Creates an empty file
+     *
      * @param file File path
      * @return Returns true if the file was successfully created
      */
@@ -98,7 +104,7 @@ public class FileTools {
             return (new File(file)).createNewFile();
         } catch (IOException e) {
             // Failed
-            Logger.getInstance().logError("FileCreate",  "Could not create file: " + e.getMessage());
+            Logger.getInstance().logError("FileCreate", "Could not create file: " + e.getMessage());
 
             return false;
         }
@@ -106,7 +112,8 @@ public class FileTools {
 
     /**
      * Moves a file
-     * @param src Soruce path
+     *
+     * @param src  Soruce path
      * @param dest Destination path
      * @return Return whether the moving was successful
      */
@@ -122,7 +129,8 @@ public class FileTools {
 
     /**
      * Copies a stream
-     * @param inputStream Source stream
+     *
+     * @param inputStream  Source stream
      * @param outputStream Destination stream
      * @return Return whether the stream was copied successful
      */
@@ -155,7 +163,8 @@ public class FileTools {
 
     /**
      * Copies a file
-     * @param src Source path
+     *
+     * @param src  Source path
      * @param dest Destination path
      * @return Return whether the file was copied successful
      */
@@ -195,6 +204,7 @@ public class FileTools {
 
     /**
      * Deletes a file
+     *
      * @param file Path of the file
      * @return Returns whether the deleting was successful
      */
@@ -205,6 +215,7 @@ public class FileTools {
 
     /**
      * Checks if the file exists
+     *
      * @param file Path of the file
      * @return Return whether the file exists
      */
@@ -217,6 +228,7 @@ public class FileTools {
 
     /**
      * Checks whether the file or directory is a link
+     *
      * @param path Path of the file / directory
      * @return Returns whether the file or directory is a link
      */
@@ -235,6 +247,7 @@ public class FileTools {
 
     /**
      * Gets the root canonical file of a symbolic link
+     *
      * @param path The path
      * @return The root file
      */
@@ -244,6 +257,7 @@ public class FileTools {
 
     /**
      * Gets the root canonical file of a symbolic link
+     *
      * @param file The file
      * @return The root file
      */
@@ -269,19 +283,20 @@ public class FileTools {
 
     /**
      * Gets all storages; eg. all sdcards
+     *
      * @return List of all storages
      */
     public static String[] getStorages() {
         List<String> storages = new ArrayList<>();
 
         // Hard coded mount points
-        final String[] mountPointBlacklist = new String[] { "/mnt/tmp", "/mnt/factory", "/mnt/obb", "/mnt/asec", "/mnt/secure", "/mnt/media_rw", "/mnt/shell", "/storage/emulated" };
-        final String[] mountPointDirectories = new String[] { "/mnt", "/storage" };
-        final String[] mountPoints = new String[] { "/sdcard", "/external_sd" };
+        final String[] mountPointBlacklist = new String[]{"/mnt/tmp", "/mnt/factory", "/mnt/obb", "/mnt/asec", "/mnt/secure", "/mnt/media_rw", "/mnt/shell", "/storage/emulated"};
+        final String[] mountPointDirectories = new String[]{"/mnt", "/storage"};
+        final String[] mountPoints = new String[]{Environment.getExternalStorageDirectory().getAbsolutePath(), "/external_sd"};
 
 
         // Adds all mount point directories
-        for(String mountPointDirectory : mountPointDirectories) {
+        for (String mountPointDirectory : mountPointDirectories) {
             // Checks all subdirectories
             File dir = getRootCanonicalFile(mountPointDirectory);
             if (dir.exists() && dir.isDirectory()) {
@@ -301,7 +316,7 @@ public class FileTools {
         }
 
         // Adds all direct mount points
-        for(String mountPoint : mountPoints) {
+        for (String mountPoint : mountPoints) {
             File file = getRootCanonicalFile(mountPoint);
             if (file.isDirectory() && file.canRead()) {
                 if (!storages.contains(file.getAbsolutePath()))

playmusicexporter/build.gradle

@@ -35,9 +35,6 @@ android {
         versionName '0.9.6.0'
         vectorDrawables.useSupportLibrary = true
 
-        jackOptions {
-            enabled true
-        }
         buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
     }
     buildTypes {
@@ -62,4 +59,7 @@ dependencies {
     compile 'com.android.support:support-vector-drawable:25.3.1'
     compile 'com.github.paolorotolo:appintro:4.1.0'
     compile 'ly.count.android:sdk:16.12.2'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 }

playmusicexporter/src/main/AndroidManifest.xml

@@ -33,7 +33,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:name=".PlayMusicExporter">
         <activity
             android:name=".activities.MusicContainerListActivity"
             android:label="@string/app_name">

playmusicexporter/src/main/java/re/jcg/playmusicexporter/PlayMusicExporter.java

@@ -0,0 +1,24 @@
+package re.jcg.playmusicexporter;
+
+import android.app.Application;
+
+import com.squareup.leakcanary.LeakCanary;
+
+
+/**
+ * Android Application.
+ * Normally, we would not need to extend this, but it is required for
+ * the leak detection library we use.
+ * See {@link LeakCanary}
+ */
+public class PlayMusicExporter extends Application {
+    @Override public void onCreate() {
+        super.onCreate();
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);
+    }
+}

playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/Intro.java

@@ -1,9 +1,9 @@
 package re.jcg.playmusicexporter.activities;
 
 import android.Manifest;
+import android.app.Dialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -29,49 +29,41 @@ public class Intro extends AppIntro {
     Fragment warning;
     Fragment storage;
     Fragment superuser;
+    Fragment error;
     Fragment finish;
 
     private void initFragments() {
+        int color = ContextCompat.getColor(this, R.color.application_main);
         welcome = AppIntroFragment.newInstance(
-                "Welcome!",
-                "This is the Play Music Exporter. It can export songs from Play Music " +
-                        "and save them as MP3 files where you want them to be.",
+                getString(R.string.intro_welcome_title),
+                getString(R.string.intro_welcome_description),
                 R.drawable.ic_launcher_transparent,
-                Color.parseColor("#ef6c00"));
+                color);
         warning = AppIntroFragment.newInstance(
-                "Warning!",
-                "You are responsible for what you do with this app. Depending on where you live " +
-                        "it might be illegal to use this app. We discourage piracy of music " +
-                        "and other intellectual property. Sharing music you exported with " +
-                        "this tool might be a very bad idea, Google could put an invisible " +
-                        "watermark on the music, so that people can trace the MP3s back to " +
-                        "the owner of the Google account that was used.",
+                getString(R.string.intro_warning_title),
+                getString(R.string.intro_warning_description),
                 R.drawable.ic_warning_white,
-                Color.parseColor("#ef6c00"));
+                color);
         storage = AppIntroFragment.newInstance(
-                "We need access to your storage.",
-                "We need to access the external storage, " +
-                        "for copying the Play Music database to a folder," +
-                        "where we have the right to work with it. " +
-                        "We also need access to the external storage," +
-                        "to finish up the MP3s, from encrypted without ID3 tags," +
-                        "to decrypted with ID3 tags, before we save them to your export path.",
+                getString(R.string.intro_storage_title),
+                getString(R.string.intro_storage_description),
                 R.drawable.ic_folder_white,
-                Color.parseColor("#ef6c00"));
+                color);
         superuser = AppIntroFragment.newInstance(
-                "We need root access.",
-                "Some of the files we need to access are in the private folders of Play Music. " +
-                        "Android prevents apps from accessing the private folders " +
-                        "of other apps, but luckily, you can circumvent this protection " +
-                        "with root access. Without root access this app can't do anything.",
+                getString(R.string.intro_superuser_title),
+                getString(R.string.intro_superuser_description),
                 R.drawable.ic_superuser,
-                Color.parseColor("#ef6c00"));
+                color);
+        error = AppIntroFragment.newInstance(
+                getString(R.string.intro_error_title),
+                getString(R.string.intro_error_description),
+                R.drawable.ic_error_white,
+                color);
         finish = AppIntroFragment.newInstance(
-                "Tutorial finished!",
-                "One note: Should you revoke any of these permission, the tutorial will be " +
-                        "shown again on the next launch.",
+                getString(R.string.intro_finish_title),
+                getString(R.string.intro_finish_description),
                 R.drawable.ic_launcher_transparent,
-                Color.parseColor("#ef6c00"));
+                color);
     }
 
     @Override
@@ -87,6 +79,7 @@ public class Intro extends AppIntro {
         addSlide(warning);
         addSlide(storage);
         addSlide(superuser);
+        addSlide(error);
         addSlide(finish);
 
         pager.setPagingEnabled(true);
@@ -100,7 +93,7 @@ public class Intro extends AppIntro {
             promptAcceptWarning();
         } else if (storage.equals(oldFragment) && superuser.equals(newFragment)) {
             requestStoragePermission();
-        } else if (superuser.equals(oldFragment) && finish.equals(newFragment)) {
+        } else if (superuser.equals(oldFragment) && error.equals(newFragment)) {
             SuperUser.askForPermissionInBackground(granted -> {
                 if (!granted) {
                     AlertDialog.Builder builder =
@@ -113,9 +106,30 @@ public class Intro extends AppIntro {
                     builder.show();
                 }
             });
+        } else if (error.equals(oldFragment) && finish.equals(newFragment)) {
+            promptEnableErrorReporting();
         }
     }
 
+    private void promptEnableErrorReporting() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        Dialog.OnClickListener enable = (dialog, which) -> {
+            PlayMusicExporterPreferences.setReportStats(true);
+            dialog.dismiss();
+        };
+        Dialog.OnClickListener disable = (dialog, which) -> {
+            PlayMusicExporterPreferences.setReportStats(false);
+            dialog.dismiss();
+        };
+        builder.setTitle(R.string.error_alert_dialog_title);
+        builder.setMessage(R.string.error_alert_dialog_message);
+        builder.setCancelable(false);
+        builder.setNegativeButton(R.string.no, disable);
+        builder.setNeutralButton(R.string.whatever, enable);
+        builder.setPositiveButton(R.string.yes, enable);
+        builder.show();
+    }
+
     private void requestStoragePermission() {
         if (ContextCompat.checkSelfPermission(this,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE)
@@ -151,12 +165,12 @@ public class Intro extends AppIntro {
 
     private void promptAcceptWarning() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Understood?");
-        builder.setMessage("Have you read and understood this?");
+        builder.setTitle(R.string.warning_alert_dialog_title);
+        builder.setMessage(R.string.warning_alert_dialog_message);
         builder.setCancelable(false);
-        builder.setNegativeButton("No", ((dialog, which)
+        builder.setNegativeButton(getString(R.string.no), ((dialog, which)
                 -> pager.setCurrentItem(pager.getCurrentItem() - 1)));
-        builder.setPositiveButton("Yes", (((dialog, which) -> dialog.dismiss())));
+        builder.setPositiveButton(getString(R.string.yes), (((dialog, which) -> dialog.dismiss())));
         builder.show();
     }
 

playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java

@@ -108,17 +108,15 @@ public class MusicContainerListActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        Countly.sharedInstance().init(this, getString(R.string.countly_url), getString(R.string.countly_token), null, DeviceId.Type.OPEN_UDID);
-        Countly.sharedInstance().enableCrashReporting();
-
-
         PlayMusicExporterPreferences.init(this);
         if (!PlayMusicExporterPreferences.getSetupDone()) {
             startActivity(new Intent(this, Intro.class));
             finish();
         } else {
-
+            if (PlayMusicExporterPreferences.getReportStats()) {
+                Countly.sharedInstance().init(this, getString(R.string.countly_url), getString(R.string.countly_token), null, DeviceId.Type.OPEN_UDID);
+                Countly.sharedInstance().enableCrashReporting();
+            }
             setContentView(R.layout.activity_track_list);
 
 
@@ -379,12 +377,14 @@ public class MusicContainerListActivity extends AppCompatActivity
     @Override
     public void onStart() {
         super.onStart();
-        Countly.sharedInstance().onStart(this);
+        if (PlayMusicExporterPreferences.getReportStats())
+            Countly.sharedInstance().onStart(this);
     }
 
     @Override
     public void onStop() {
-        Countly.sharedInstance().onStop();
+        if (PlayMusicExporterPreferences.getReportStats())
+            Countly.sharedInstance().onStop();
         super.onStop();
     }
 }

playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportAllService.java

@@ -75,7 +75,8 @@ public class ExportAllService extends IntentService {
                     try {
                         if (lPlayMusicManager.exportMusicTrack(lTrack, lUri, lPath, PlayMusicExporterPreferences.getFileOverwritePreference())) {
                             Log.i(TAG, "Exported Music Track: " + getStringForTrack(lTrack));
-                            Countly.sharedInstance().recordEvent("Exported Song", 1);
+                            if (PlayMusicExporterPreferences.getReportStats())
+                                Countly.sharedInstance().recordEvent("Exported Song", 1);
                         } else {
                             Log.i(TAG, "Failed to export Music Track: " + getStringForTrack(lTrack));
                         }
@@ -90,7 +91,8 @@ public class ExportAllService extends IntentService {
                             Log.i(TAG, "Automatic export failed, because the URI is invalid.");
                         } else throw e;
                     } catch (Exception e) {
-                        Countly.sharedInstance().logException(e);
+                        if (PlayMusicExporterPreferences.getReportStats())
+                            Countly.sharedInstance().logException(e);
                         e.printStackTrace();
                     }
                 }

playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportService.java

@@ -203,13 +203,15 @@ public class ExportService extends IntentService {
                 // Exports the song
                 try {
                     if (playMusicManager.exportMusicTrack(mTrackCurrent, uri, path, PlayMusicExporterPreferences.getFileOverwritePreference())) {
-                        Countly.sharedInstance().recordEvent("Exported Song", 1);
+                        if (PlayMusicExporterPreferences.getReportStats())
+                            Countly.sharedInstance().recordEvent("Exported Song", 1);
                     } else {
                         // Export failed
                         mTracksFailed ++;
                     }
                 } catch (Exception e) {
-                    Countly.sharedInstance().logException(e);
+                    if (PlayMusicExporterPreferences.getReportStats())
+                        Countly.sharedInstance().logException(e);
                     e.printStackTrace();
                 }
             } else {

playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java

@@ -7,6 +7,7 @@ import android.net.Uri;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 
+import re.jcg.playmusicexporter.BuildConfig;
 import re.jcg.playmusicexporter.fragments.NavigationDrawerFragment;
 
 public class PlayMusicExporterPreferences {
@@ -49,6 +50,9 @@ public class PlayMusicExporterPreferences {
     public static final String SETUP_DONE = "preference_setup_done";
     public static final boolean SETUP_DONE_DEFAULT = false;
 
+    public static final String REPORT_STATS = "preference_report_stats";
+    public static final boolean REPORT_STATS_DEFAULT = true;
+
 
     private PlayMusicExporterPreferences() {
     }
@@ -175,4 +179,13 @@ public class PlayMusicExporterPreferences {
     public static void setAlbumArtSize(int size) {
         preferences.edit().putString(EXPORT_ALBUM_ART_SIZE, "" + size).apply();
     }
+
+    public static boolean getReportStats() {
+        //Never report stats in debug builds
+        return preferences.getBoolean(REPORT_STATS, REPORT_STATS_DEFAULT) && !BuildConfig.DEBUG;
+    }
+
+    public static void setReportStats(boolean reportStats) {
+        preferences.edit().putBoolean(REPORT_STATS, reportStats).apply();
+    }
 }

playmusicexporter/src/main/res/drawable/ic_error_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="240dp"
+        android:height="240dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+</vector>

playmusicexporter/src/main/res/values-de/strings.xml

@@ -22,18 +22,17 @@
   -->
 
 <resources>
-    <string name="app_name">Play Music Exporter</string>
     <string name="navigation_drawer_close">Drawer schließen</string>
     <string name="view_type_selection_title">Ansicht</string>
     <string name="title_view_rated">Positiv bewertet</string>
-    <string name="title_view_playlist">Playlists</string>
+    <string name="title_view_playlist">Playlisten</string>
     <string name="title_view_artist">Interpreten</string>
     <string name="title_view_album">Alben</string>
     <string name="navigation_drawer_open">Drawer öffnen</string>
     <string name="title_track_detail">Titeldetails</string>
     <string name="title_settings">Einstellungen</string>
     <string name="settings_category_about_me">Über mich</string>
-    <string name="settings_category_export">Export-Einstellungen</string>
+    <string name="settings_category_export">Export Einstellungen</string>
     <string name="settings_category_extra">Extras</string>
     <string name="settings_category_thanks">Dank an</string>
     <string name="settings_export_path">Speicherort</string>
@@ -54,13 +53,13 @@
     <string name="action_share">Teilen</string>
     <string name="action_select_all">Alles markieren</string>
     <string name="settings_export_path_custom">Benutzerdefinierter Pfad</string>
-    <string name="settings_export_id3_artwork_size">Maximale Artworkgröße</string>
+    <string name="settings_export_id3_artwork_size">Maximale Covergröße</string>
     <string name="settings_export_id3_artwork_size_summary">Wenn die Größe des Artworks größer als der eingestellte Wert ist, wird das Artwork auf diesen Wert runter skalliert.</string>
     <string name="action_mode_track_selection">%d Titel ausgewählt</string>
     <string name="action_deselect_all">Auswahl aufheben</string>
-    <string name="toast_error_track_not_offline">Sie können nur offline Titel exportieren. Versuchen Sie das Album in Play Music offline herunterzuladen.</string>
+    <string name="toast_error_track_not_offline">Du kannst nur offline Titel exportieren. Versuche das Album in Play Music offline herunterzuladen.</string>
     <string name="settings_build_date">Kompilationsdatum</string>
-    <string name="settings_category_develop">Entwicklung</string>
+    <string name="settings_category_develop">Über diese Version</string>
     <string name="dialog_storage_access_denied_title">Speicher-Zugriff verweigert</string>
     <string name="dialog_storage_access_denied">Der Play Music Exporter benötigt Schreibzugriff auf den externen Speicher, ohne diesen kann die App nicht genutzt werden.</string>
     <string name="text_okay">OK</string>
@@ -81,8 +80,8 @@
     <string name="settings_export_subdirectory_structure_group_example">Beispiel: Great Songs/4. Beatles - Yesterday.mp3</string>
     <string name="settings_version_number">Versionsnummer</string>
     <string name="debug_trigger_export_all_title">Jetzt den ExportAllService starten</string>
-    <string name="settings_category_debug">Debug</string>
-    <string name="pref_header_debug">Debug</string>
+    <string name="settings_category_debug">Debuggen</string>
+    <string name="pref_header_debug">Debuggen</string>
     <string name="settings_auto_export_different_path">Export Pfad</string>
     <string name="settings_auto_export_different_path_switch">Nutze einen anderen Export Pfad</string>
     <string name="settings_auto_export_different_path_switch_summary">Wenn dieser Schalter aus ist nutzt der automatische Export den gleichen Pfad wie der manuelle Export von Alben</string>
@@ -91,22 +90,44 @@
     <string name="settings_auto_export_different_structure_switch_summary">Wenn dieser Schalter aus ist nutzt der automatische Export den gleichen Verzeichnisbaum wie der manuelle Export von Alben</string>
     <string name="settings_auto_export_enable_checkbox">Automatischer Export aktiviert</string>
     <string name="settings_auto_export_interval_list">Export Interval</string>
-    <string name="settings_auto_export_require_charging_checkbox">Setze laden voraus</string>
+    <string name="settings_auto_export_require_charging_checkbox">Setze Laden des Geräts voraus</string>
     <string name="settings_auto_export_require_unmetered_checkbox">Setze eine unbeschränkte Netzwerkverbindung voraus</string>
-    <string name="settings_category_alba_export">Export Speichereinstellungen Alben</string>
+    <string name="settings_category_alba_export">Export Speichereinstellungen für Alben</string>
     <string name="settings_category_auto_export_conditions">Export Bedingungen</string>
     <string name="settings_category_auto_export_path_subdir">Export Pfad und Verzeichnisbaum</string>
     <string name="settings_category_groups_export">Export Speichereinstellungen für Playlists</string>
     <string name="settings_export_path_alba">Export Pfad für Alben</string>
     <string name="settings_export_path_groups">Export Pfad für Playlists</string>
-    <string name="dialog_superuser_access_denied_title">Administrator-Zugriff verweigert</string>
+    <string name="dialog_superuser_access_denied_title">Root-Zugriff verweigert</string>
     <string name="dialog_superuser_access_denied">Der Play Music Exporter benötigt Administrator Rechte, ohne diese Rechte kann die App nicht genutzt werden.</string>
     <string name="settings_auto_export_different_structure_dialog_title">Verzeichnisbaum</string>
     <string name="settings_export_overwrite_existing">Bestehende Dateien überschreiben</string>
     <string name="file_handling_category">Dateiverarbeitung</string>
-    <string name="overwrite_summary">Überschreiben Sie die exportierte Datei immer, auch wenn sie bereits existiert</string>
+    <string name="overwrite_summary">Überschreibe die exportierte Datei immer, auch wenn sie bereits existiert</string>
     <string name="overwrite_title">Bestehende Dateien überschreiben</string>
 	<string name="action_refesh">Datenbank neu laden</string>
 	<string name="database_reloaded">Datenbank neu geladen</string>
     <string name="debug_test_crash_handler">Teste Fehlerbehandlung</string>
+    <string name="settings_donation_summery">An den Entwickler über Bitcoin spenden. Dies erfordert ein Bitcoin Wallet auf deinem Handy. Besuche die Homepage für Spenden von einem Computer.</string>
+    <string name="settings_donation_title">Unterstütze mich</string>
+    <string name="intro_welcome_title">Willkommen!</string>
+    <string name="intro_welcome_description">Das ist der Play Music Exporter. Er ermöglicht dir Export und die Speicherung von Liedern aus Play Music als MP3 Dateien.</string>
+    <string name="intro_warning_title">Warnung!</string>
+    <string name="intro_warning_description">Du bist verantwortlich für das, was du mit dieser App machst. Die App könnte in deinem Land möglicherweiße illegal sein. Wir raten von Musikpiraterie und dem Stehlen anderen geistigen Eigentums ab. Das Teilen von Musik, die du mit diesem Tool exportiert hast, wäre keine gute Idee, da Google möglicherweise ein unsichtbares Wasserzeichen auf die Musik setzt, um das Google Konto zurück verfolgen zu können.</string>
+    <string name="intro_storage_title">Wir benötigen Zugriff auf deinen Speicher.</string>
+    <string name="intro_storage_description">Wir benötigen Zugriff auf den externen Speicher, um die Play Music Datenbank in einen Ordner zu kopieren, in dem wir das Recht haben, mit ihr zu arbeiten. Außerdem benötigen wir den Zugriff auch, um die verschlüsselten MP3s ohne ID3-Tags zu entschlüsseln und mit ID3-Tags im Exportpfad zu speichern.</string>
+    <string name="intro_superuser_description">Einige der Dateien, auf die wir zugreifen müssen, befinden sich in den privaten Ordnern von Play Music. Android verhindert, dass andere Apps auf diese zugreifen können. Glücklicherweise kannst du diesen Schutz mit Root-Zugriff umgehen. Ohne Root-Zugriff können wir leider nichts machen.</string>
+    <string name="intro_superuser_title">Wir benötigen Root-Zugriff.</string>
+    <string name="intro_error_description">Keine Software ist perfekt. Wir haben eine automatisierte Fehlerberichterstattung hinzugefügt, um die App zu verbessern. Aktiviere sie, wenn du gerne dazu beitragen möchtest, die App zu verbessern. Falls du dies nicht aktivierst, und etwas nicht funktioniert, bist du auf eigene Faust angewiesen, da wir dir ohne Logs nicht helfen können. Die gesammelten Daten enthalten nichts, was zur Identifizierung deiner Identität verwendet werden könnte. (Auf der nächsten Seite wirst du aufgefordert werden, dies zu akzeptieren oder zu verbieten)</string>
+    <string name="intro_error_title">Anonyme Fehlerbericht Erstattung.</string>
+    <string name="intro_finish_description">Hinweis: Solltest du eine dieser Berechtigungen deaktivieren, wird das Tutorial erneut angezeigt.</string>
+    <string name="intro_finish_title">Einführung abgeschlossen!</string>
+    <string name="error_alert_dialog_title">Anonyme Fehlerbericht Erstattung?</string>
+    <string name="error_alert_dialog_message">Aktiviere bitte die automatische Fehlerberichterstattung, um die App zu verbessern. Du wirst keine Hilfe bekommen, falls du dies deaktivierst, da wir keine Fehler ohne die dazugehörigen Logs beheben können. Die gesammelten Daten enthalten nichts, was zur Identifizierung deiner Identität verwendet werden könnte.</string>
+    <string name="no">Nein</string>
+    <string name="yes">Ja</string>
+    <string name="whatever">Mir egal, lass mich einfach die App nutzen!</string>
+    <string name="warning_alert_dialog_title">Verstanden?</string>
+    <string name="warning_alert_dialog_message">Hast du das gelesen und verstanden?</string>
+    <string name="settings_open_homepage_title">Webseite</string>
 </resources>

playmusicexporter/src/main/res/values/constants.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="countly_url">https://countly.jcg.re/</string>
-    <string name="countly_token">82a1d9405388c4dd73dc9835f84c59cf4274086d</string>
+    <string name="countly_url" translatable="false">https://countly.jcg.re/</string>
+    <string name="countly_token" translatable="false">82a1d9405388c4dd73dc9835f84c59cf4274086d</string>
 </resources>

playmusicexporter/src/main/res/values/strings.xml

@@ -22,7 +22,7 @@
 
 <resources>
 
-    <string name="app_name">Play Music Exporter</string>
+    <string name="app_name" translatable="false">Play Music Exporter</string>
     <string name="title_track_detail">Track Detail</string>
 
     <string name="action_select_all">Select all</string>
@@ -52,7 +52,7 @@
     <string name="dialog_storage_access_denied_title">Storage access denied</string>
     <string name="dialog_storage_access_denied">The Play Music Exporter does not work without write access to the external storage. You can not use this app without granting it write access.</string>
 
-    <string name="dialog_superuser_access_denied_title">Superuser access denied</string>
+    <string name="dialog_superuser_access_denied_title">Root access denied</string>
     <string name="dialog_superuser_access_denied">The Play Music Exporter does not work without superuser access. You can not use this app without granting it superuser access.</string>
 
 
@@ -72,8 +72,8 @@
     <string name="settings_category_auto_export_conditions">Export conditions</string>
     <string name="settings_category_auto_export_path_subdir">Export path and subdirectory structure</string>
     <string name="settings_category_debug">Debug</string>
-    <string name="settings_category_alba_export">Export location albums</string>
-    <string name="settings_category_groups_export">Export location playlists</string>
+    <string name="settings_category_alba_export">Export location for albums</string>
+    <string name="settings_category_groups_export">Export location for playlists</string>
 
 
     <string name="settings_version_number">Version Number</string>
@@ -121,8 +121,8 @@
     <string name="settings_open_old_homepage_title" translatable="false">David-Schulte.de</string>
     <string name="settings_open_old_homepage_url" translatable="false"><![CDATA[http://www.david-schulte.de/]]></string>
 
-    <string name="settings_open_homepage_title" translatable="false">Website</string>
-    <string name="settings_open_homepage_url" translatable="false"><![CDATA[https://jcg.re/]]></string>
+    <string name="settings_open_homepage_title">Website</string>
+    <string name="settings_open_homepage_url" translatable="false"><![CDATA[https://github.com/jcgruenhage/PlayMusicExporter]]></string>
 
     <string name="settings_mp3agic_title" translatable="false">Mp3agic ID3 Libary</string>
     <string name="settings_mp3agic_summery" translatable="false">Michael Patricios &#169; 2006&#8211;2013</string>
@@ -149,4 +149,26 @@
     <string name="action_refesh">Refresh</string>
     <string name="database_reloaded">Music Database Reloaded</string>
     <string name="debug_test_crash_handler">Test Crash Handler</string>
+    <string name="settings_donation_title">Support me</string>
+    <string name="settings_donation_summery">Donate to the current developer via Bitcoin. This requires that you have installed a bitcoin wallet on your phone. For donations from a computer, see the homepage.</string>
+    <string name="settings_donation_url" translatable="false"><![CDATA[bitcoin:1NdzpDWPQ53xWT5fraGPZX5F9XrKiPBXjp]]></string>
+    <string name="intro_welcome_title">Welcome!</string>
+    <string name="intro_welcome_description">This is the Play Music Exporter. It can export songs from Play Music and save them as MP3 files where you want them to be.</string>
+    <string name="intro_warning_title">Warning!</string>
+    <string name="intro_warning_description">You are responsible for what you do with this app. Depending on where you live it might be illegal to use this app. We discourage piracy of music and other intellectual property. Sharing music you exported with this tool might be a very bad idea, Google could put an invisible watermark on the music, so that people can trace the MP3s back to the owner of the Google account that was used.</string>
+    <string name="intro_storage_title">We need access to your storage.</string>
+    <string name="intro_storage_description">We need to access the external storage, for copying the Play Music database to a folder, where we have the right to work with it. We also need access to the external storage, to finish up the MP3s, from encrypted without ID3 tags, to decrypted with ID3 tags, before we save them to your export path.</string>
+    <string name="intro_superuser_description">Some of the files we need to access are in the private folders of Play Music. Android prevents apps from accessing the private folders of other apps, but luckily, you can circumvent this protection with root access. Without root access this app can\'t do anything.</string>
+    <string name="intro_superuser_title">We need root access.</string>
+    <string name="intro_error_description">No single piece of software is perfect. To get this closer though, we have added automated error reporting to this app. If you would like to help make this app better, let us enable that. If you don\'t enable this and something does not work, you are on your own, since we can\'t help you without having the logs this provides us with. The data collected by this does not include anything that could be used to identify you. (You will be prompted to either accept or deny that when you go to the next slide)</string>
+    <string name="intro_error_title">Anonymous error reporting.</string>
+    <string name="intro_finish_description">One note: Should you revoke any of these permission, the tutorial will be shown again on the next launch.</string>
+    <string name="intro_finish_title">Introduction finished!</string>
+    <string name="error_alert_dialog_title">Anonymous error reporting?</string>
+    <string name="error_alert_dialog_message">In order to make this app better, please enable automatic crash reporting. You wont ever get any help, if you disable this, since we can\'t fix bugs without the logs provided by this. The data collected by this does not include anything that could be used to identify you.</string>
+    <string name="no">No</string>
+    <string name="yes">Yes</string>
+    <string name="whatever">I don\'t care, just let me use the app!</string>
+    <string name="warning_alert_dialog_title">Understood?</string>
+    <string name="warning_alert_dialog_message">Have you read and understood this?</string>
 </resources>

playmusicexporter/src/main/res/xml/pref_about.xml

@@ -12,7 +12,7 @@
         </Preference>
     </PreferenceCategory>
 
-    <!-- About David Schulte -->
+    <!-- About this project -->
     <PreferenceCategory android:title="@string/settings_category_about_me">
         <!-- Homepage -->
         <Preference
@@ -22,6 +22,15 @@
                 android:action="android.intent.action.VIEW"
                 android:data="@string/settings_open_homepage_url" />
         </Preference>
+
+        <!-- Donation -->
+        <Preference
+        android:summary="@string/settings_donation_summery"
+        android:title="@string/settings_donation_title">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:data="@string/settings_donation_url" />
+        </Preference>
     </PreferenceCategory>
 
     <!-- About David Schulte -->