diff --git a/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/activity/ChooseSyncActivity.java b/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/activity/ChooseSyncActivity.java
index 1e14c8d..1ec3eac 100644
--- a/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/activity/ChooseSyncActivity.java
+++ b/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/activity/ChooseSyncActivity.java
@@ -27,7 +27,6 @@
public class ChooseSyncActivity extends AbstractPADListenerActivity {
public static final String EXTRA_ACCOUNT_ID_NAME = "account_id";
- public static final String EXTRA_SYNC_RESULT_NAME = "sync_result";
public static final String EXTRA_CHOOSE_SYNC_RESULT_NAME = "choose_sync_result";
private int mAccountId;
private ChooseSyncModel mChooseResult;
@@ -40,11 +39,10 @@ public void onCreate(Bundle savedInstanceState) {
final Bundle extras = getIntent().getExtras();
- final ComputeSyncResultModel result = (ComputeSyncResultModel) extras.getSerializable(EXTRA_SYNC_RESULT_NAME);
mAccountId = extras.getInt(EXTRA_ACCOUNT_ID_NAME);
mChooseResult = (ChooseSyncModel) extras.getSerializable(ChooseSyncActivity.EXTRA_CHOOSE_SYNC_RESULT_NAME);
- if (result.isHasEncounteredUnknownMonster()) {
+ if (mChooseResult.isHasEncounteredUnknownMonster()) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.choose_sync_alert_unknown_monster_encountered_title);
builder.setMessage(R.string.choose_sync_alert_unknown_monster_encountered_content);
diff --git a/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/fragment/ComputeSyncFragment.java b/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/fragment/ComputeSyncFragment.java
index 23ff698..080f6b6 100644
--- a/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/fragment/ComputeSyncFragment.java
+++ b/PADListenerApp/src/main/java/fr/neraud/padlistener/ui/fragment/ComputeSyncFragment.java
@@ -132,7 +132,6 @@ public void updateState(RestCallState state, RestCallRunningStep runningStep, Co
} else {
if (initHelper.isHasDataToSync()) {
final Bundle extras = new Bundle();
- extras.putSerializable(ChooseSyncActivity.EXTRA_SYNC_RESULT_NAME, syncResult);
extras.putSerializable(ChooseSyncActivity.EXTRA_CHOOSE_SYNC_RESULT_NAME, chooseSyncModel);
extras.putInt(ChooseSyncActivity.EXTRA_ACCOUNT_ID_NAME, mAccountId);
((AbstractPADListenerActivity) getActivity()).goToScreen(UiScreen.CHOOSE_SYNC, extras);
diff --git a/PADListenerApp/src/main/res/xml/changelog_master.xml b/PADListenerApp/src/main/res/xml/changelog_master.xml
index 36be4a7..a9f7a22 100644
--- a/PADListenerApp/src/main/res/xml/changelog_master.xml
+++ b/PADListenerApp/src/main/res/xml/changelog_master.xml
@@ -6,6 +6,7 @@
Fixed #90 : repaired Manual capture for M (thanks olifozzy !)
Fixed #91 : Tapping on "PAD data captured" notification dismisses it
Fixed #94 : Added support for CardID
+ Fixed #101 : the app crashed when too many monsters are synced at the same time