From e08c6ce4502cb13fe64197736ce9aa8634ee15aa Mon Sep 17 00:00:00 2001 From: Mark Gillespie Date: Wed, 8 Mar 2017 20:12:41 +0000 Subject: [PATCH] Pull Request actions. --- .../MusicContainerListActivity.java | 29 ++++++++----------- .../src/main/res/values-de/strings.xml | 2 ++ .../src/main/res/values/colors.xml | 2 +- .../src/main/res/values/strings.xml | 3 +- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java index 8f80b67..3ab64e5 100644 --- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java +++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/MusicContainerListActivity.java @@ -41,6 +41,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.EditText; +import android.widget.Toast; import de.arcus.framework.logger.Logger; import de.arcus.framework.crashhandler.CrashHandler; @@ -328,28 +329,22 @@ public class MusicContainerListActivity extends AppCompatActivity MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.music_track_list, menu); - MenuItem itemRefreshLibrary = menu. findItem(R.id.action_refresh); - itemRefreshLibrary.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() + MenuItem itemRefreshLibrary = menu.findItem(R.id.action_refresh); + itemRefreshLibrary.setOnMenuItemClickListener(item -> { - @Override - public boolean onMenuItemClick(MenuItem item) + try { - try - { - mPlayMusicManager.realoadDatabase(); - } - catch (NoSuperUserException e) - { - e.printStackTrace(); - } - catch (CouldNotOpenDatabaseException e) - { - e.printStackTrace(); - } + mPlayMusicManager.realoadDatabase(); mPlayMusicManager = null; loadPlayMusicExporter(); - return true; + Toast.makeText( this, R.string.databasereloaded, Toast.LENGTH_SHORT).show(); } + catch (NoSuperUserException | CouldNotOpenDatabaseException e) + { + Toast.makeText( this, R.string.dialog_superuser_access_denied_title, Toast.LENGTH_SHORT).show(); + e.printStackTrace(); + } + return true; }); // Finds the search item and create the search view diff --git a/playmusicexporter/src/main/res/values-de/strings.xml b/playmusicexporter/src/main/res/values-de/strings.xml index 2f8c224..3f8474f 100644 --- a/playmusicexporter/src/main/res/values-de/strings.xml +++ b/playmusicexporter/src/main/res/values-de/strings.xml @@ -106,4 +106,6 @@ Dateiverarbeitung Überschreiben Sie die exportierte Datei immer, auch wenn sie bereits existiert. Bestehende Dateien überschreiben. + Erfrischen + Reloaded Musikdatenbank \ No newline at end of file diff --git a/playmusicexporter/src/main/res/values/colors.xml b/playmusicexporter/src/main/res/values/colors.xml index b314ef7..d16b282 100644 --- a/playmusicexporter/src/main/res/values/colors.xml +++ b/playmusicexporter/src/main/res/values/colors.xml @@ -44,6 +44,6 @@ #11000000 #88000000 #ef6c00 - #ffffffff + #ffffffff #ff000000 \ No newline at end of file diff --git a/playmusicexporter/src/main/res/values/strings.xml b/playmusicexporter/src/main/res/values/strings.xml index a89a0d9..0bf92f7 100644 --- a/playmusicexporter/src/main/res/values/strings.xml +++ b/playmusicexporter/src/main/res/values/strings.xml @@ -146,5 +146,6 @@ File Handling Always overwrite the exported file, even if it already exists. Overwrite Existing Files - Refresh + Refresh + Music Database Reloaded