Author: kmorin Date: 2014-03-11 11:30:07 +0100 (Tue, 11 Mar 2014) New Revision: 70 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/70 Log: fixes #4678 [FAVORIS] La liste se vide quand on veut ajouter des favoris Modified: trunk/AndroidManifest.xml trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-03-04 09:42:48 UTC (rev 69) +++ trunk/AndroidManifest.xml 2014-03-11 10:30:07 UTC (rev 70) @@ -15,10 +15,10 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="fr.ifremer.wlo" - android:versionCode="1" - android:versionName="0.2"> + android:versionCode="2" + android:versionName="0.3"> - <uses-sdk minSdkVersion="15" + <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> Modified: trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-04 09:42:48 UTC (rev 69) +++ trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-11 10:30:07 UTC (rev 70) @@ -28,6 +28,7 @@ import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -53,6 +54,8 @@ */ public class MultiSelectionActivity extends ListActivity implements AdapterView.OnItemLongClickListener { + private static final String TAG = "MultiSelectionActivity"; + public static final String INTENT_FAVORITE_LIST = "favoriteList"; public static final String INTENT_UNIVERSE_CLASS = "universeClass"; Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-04 09:42:48 UTC (rev 69) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-11 10:30:07 UTC (rev 70) @@ -186,15 +186,6 @@ } }); - // favorites - initMultiSelectListPreference(MultiSelectItemPreference.COMMERCIAL_SPECIES_FAVORITES.getKey(), - CommercialSpecies.class, - REQUEST_FAVORITES_COMMERCIAL_SPECIES); - - initMultiSelectListPreference(MultiSelectItemPreference.SCIENTIFIC_SPECIES_FAVORITES.getKey(), - ScientificSpecies.class, - REQUEST_FAVORITES_SCIENTIFIC_SPECIES); - // update Preference updatePref = findPreference("preferences_check_update"); try { @@ -256,6 +247,15 @@ preference.setSummary(summary); } + // favorites + initMultiSelectListPreference(MultiSelectItemPreference.COMMERCIAL_SPECIES_FAVORITES.getKey(), + CommercialSpecies.class, + REQUEST_FAVORITES_COMMERCIAL_SPECIES); + + initMultiSelectListPreference(MultiSelectItemPreference.SCIENTIFIC_SPECIES_FAVORITES.getKey(), + ScientificSpecies.class, + REQUEST_FAVORITES_SCIENTIFIC_SPECIES); + Log.d(TAG, "registerOnSharedPreferenceChangeListener"); sharedPreferences.registerOnSharedPreferenceChangeListener(this); }