Skip to content
This repository was archived by the owner on Mar 27, 2020. It is now read-only.

Commit 5310182

Browse files
committed
Changing language from MainActivity crash fixed.
bug report - https://crashlytics.com/iilab/android/apps/com.apb.beacon/issues/5358f1a5e3de5099ba1e364d
1 parent c3549cd commit 5310182

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/java/com/apb/beacon/adapter/PageLanguageSettingsAdapter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@ public class PageLanguageSettingsAdapter extends ArrayAdapter<PageAction> {
4545
private String selectedLang;
4646
private int lastUpdatedVersion;
4747
private int latestVersion;
48+
private int parentActivity;
4849

49-
public PageLanguageSettingsAdapter(Context context) {
50+
public PageLanguageSettingsAdapter(Context context, int parentActivity) {
5051
super(context, R.layout.row_page_language_settings);
5152
this.mContext = context;
5253
mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
5354
this.currentLang = ApplicationSettings.getSelectedLanguage(mContext);
5455
latestVersion = -1;
5556
lastUpdatedVersion = ApplicationSettings.getLastUpdatedVersion(mContext);
57+
this.parentActivity = parentActivity;
5658
}
5759

5860

@@ -117,6 +119,9 @@ public void restartApp(){
117119
i.putExtra("page_id", pageId);
118120
mContext.startActivity(i);
119121

122+
if(parentActivity == AppConstants.FROM_WIZARD_ACTIVITY){
123+
((WizardActivity) mContext).callFinishActivityReceiver();
124+
}
120125
((Activity) mContext).finish();
121126
}
122127

src/main/java/com/apb/beacon/fragment/LanguageSettingsFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
8484
tvIntro.setText(currentPage.getIntroduction());
8585

8686

87-
pageLanguageSettingsAdapter = new PageLanguageSettingsAdapter(activity);
87+
pageLanguageSettingsAdapter = new PageLanguageSettingsAdapter(activity, parentActivity);
8888
lvActions.setAdapter(pageLanguageSettingsAdapter);
8989

9090
pageLanguageSettingsAdapter.setData(currentPage.getAction());

0 commit comments

Comments
 (0)