Commit 36e3804b authored by Andreas Kromke's avatar Andreas Kromke

version 1.1 RC

parent 2e7ae570
......@@ -6,7 +6,8 @@
<body>
<h3>Programmänderungen</h3>
<h4>Version 1.1</h4>
<p>- Die Liste der geänderten Dateien wird an den <i>Classical Music Scanner</i> übermittelt.</p>
<p>- Die Liste der geänderten oder gelöschten Dateien wird an den <i>Classical Music Scanner</i> übermittelt.</p>
<p>- Menüeintrag zum Löschen von Dateien hinzugefügt</p>
<p>- Die Mitteilung über Dateiänderungen wird auch beim Zurücksetzen und Löschen übermittelt.</p>
<p>- Änderungsmitteilung für die Android-Mediendatenbank verbessert.</p>
......
......@@ -7,7 +7,7 @@
<h3>List of Changes</h3>
<h4>Version 1.1</h4>
<p>- Pass list of changed files to <i>Classical Music Scanner</i>.</p>
<p>- Pass list of changed or deleted files to <i>Classical Music Scanner</i>.</p>
<p>- New menu entry for removing files permanently.</p>
<p>- Pass file change messages also in case of reverting or removing files.</p>
<p>- Update method for Android media database improved.</p>
......
......@@ -406,36 +406,40 @@ public class BasicActivity extends AppCompatActivity
*************************************************************************/
private void startScanner(final ArrayList<String> audioPathList)
{
final String packageN = "de.kromke.andreas.mediascanner";
final String ServiceN = ".BackgroundService";
Intent theIntent = new Intent();
theIntent.setComponent(new ComponentName(packageN, packageN + ServiceN));
theIntent.putExtra("pathTable", audioPathList);
try
{
/*ComponentName c = */ startService(theIntent);
}
catch (Exception e)
{
Log.d(LOG_TAG, "startScanner(): package not installed");
}
/*
if (audioPathList.size() > 0)
{
Intent theIntent = getPackageManager().getLaunchIntentForPackage(packageN);
if (theIntent != null)
final String packageN = "de.kromke.andreas.mediascanner";
boolean bLaunchActivity = UserSettings.getBool(UserSettings.PREF_DBG_SCANNER_FG, false);
if (bLaunchActivity)
{
theIntent.addCategory(Intent.CATEGORY_LAUNCHER);
theIntent.putExtra("pathTable", audioPathList);
startActivity(theIntent);
Intent theIntent = getPackageManager().getLaunchIntentForPackage(packageN);
if (theIntent != null)
{
theIntent.addCategory(Intent.CATEGORY_LAUNCHER);
theIntent.putExtra("pathTable", audioPathList);
startActivity(theIntent);
} else
{
Log.d(LOG_TAG, "startScanner(): package not installed");
}
} else
{
Log.d(LOG_TAG, "startScanner(): package not installed");
final String ServiceN = ".BackgroundService";
Intent theIntent = new Intent();
theIntent.setComponent(new ComponentName(packageN, packageN + ServiceN));
theIntent.putExtra("pathTable", audioPathList);
try
{
/*ComponentName c = */
startService(theIntent);
} catch (Exception e)
{
Log.d(LOG_TAG, "startScanner(): package not installed");
}
}
}
*/
}
......
......@@ -48,6 +48,7 @@ public class UserSettings
public static final String PREF_MUSIC_BASE_PATH = "prefMusicBasePath";
public static final String PREF_REMOVE_ID3V1_TAGS = "prefRemoveId3v1Tags";
public static final String PREF_HINTS_VERSION = "prefHintsVersion";
public static final String PREF_DBG_SCANNER_FG = "prefDebugLaunchScannerActivity";
private static SharedPreferences mSharedPrefs;
......
......@@ -79,4 +79,6 @@
<string name="str_remove_selected_files">Ausgewählte Dateien permament löschen?</string>
<string name="str_files_will_be_removed">Dieser Schritt kann nicht rückgängig gemacht werden, aber vorhandene .backup-Dateien bleiben unberührt.</string>
<string name="str_files_are_removed">Ausgewählte Dateien werden entfernt …</string>
<string name="str_DebugLaunchScannerActivity">TEST: Scanner im Vordergrund</string>
<string name="str_DebugLaunchScannerActivitySummary">Starte den Classical Music Scanner im Vordergrund (Activity) statt unsichtbar (Service)</string>
</resources>
......@@ -78,4 +78,6 @@
<string name="str_remove_selected_files">Remove Selected Files?</string>
<string name="str_files_will_be_removed">The files will be permanently removed, but backups will be kept if exist.</string>
<string name="str_files_are_removed">Selected files are being removed…</string>
<string name="str_DebugLaunchScannerActivity">TEST: Scanner in Foreground</string>
<string name="str_DebugLaunchScannerActivitySummary">The Classical Music Scanner will be launched in foreground (Activity) instead of background (Service).</string>
</resources>
......@@ -39,29 +39,9 @@
android:dependency="prefExpertMode"
android:entryValues="@array/array_prefStandardOrApple_values" />
<!--
<ListPreference android:key="prefMp4StandardOrApple"
android:title="@string/str_Mp4MovementTags"
android:summary="@string/str_Mp4MovementTagsSummary"
android:entries="@array/array_prefMp4StandardOrApple"
android:defaultValue="1"
android:dependency="prefExpertMode"
android:entryValues="@array/array_prefMp4StandardOrApple_values" />
<ListPreference android:key="prefMp3StandardOrApple"
android:title="@string/str_Mp3MovementTags"
android:summary="@string/str_Mp3MovementTagsSummary"
android:entries="@array/array_prefMp3StandardOrApple"
android:defaultValue="1"
android:dependency="prefExpertMode"
android:entryValues="@array/array_prefMp3StandardOrApple_values" />
<CheckBoxPreference android:key="prefDebugLaunchScannerActivity"
android:title="@string/str_DebugLaunchScannerActivity"
android:defaultValue="false"
android:summary="@string/str_DebugLaunchScannerActivitySummary" />
<ListPreference android:key="prefVorbisStandardOrApple"
android:title="@string/str_VorbisMovementTags"
android:summary="@string/str_VorbisMovementTagsSummary"
android:entries="@array/array_prefVorbisStandardOrApple"
android:defaultValue="1"
android:dependency="prefExpertMode"
android:entryValues="@array/array_prefVorbisStandardOrApple_values" />
-->
</PreferenceScreen>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment