Skip to content

Commit 3effc30

Browse files
simarsingh24iamareebjamal
authored andcommitted
fix: latest data download bug (fossasia#2194)
1 parent 4ab8bc8 commit 3effc30

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

android/app/src/main/java/org/fossasia/openevent/activities/MainActivity.java

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,14 @@ protected void onCreate(Bundle savedInstanceState) {
188188

189189
completeHandler = DownloadCompleteHandler.with(context);
190190

191-
if (Utils.isBaseUrlEmpty()) {
192-
if (!SharedPreferencesUtil.getBoolean(ConstantStrings.IS_DOWNLOAD_DONE, false)) {
191+
if(!SharedPreferencesUtil.getBoolean(ConstantStrings.IS_DOWNLOAD_DONE, false)) {
192+
if(Utils.isBaseUrlEmpty()) {
193193
downloadFromAssets();
194+
} else {
195+
downloadData();
194196
}
195197
} else {
196-
downloadData();
198+
completeHandler.hide();
197199
}
198200

199201
if (savedInstanceState == null) {
@@ -429,23 +431,20 @@ public void downloadData() {
429431
@Override
430432
public void networkAvailable() {
431433
// Network is available
432-
if (!SharedPreferencesUtil.getBoolean(ConstantStrings.IS_DOWNLOAD_DONE, false)) {
433-
DialogFactory.createDownloadDialog(context, R.string.download_assets, R.string.charges_warning,
434-
(dialogInterface, button) -> {
435-
switch (button) {
436-
case DialogInterface.BUTTON_POSITIVE:
437-
startDownloadFromNetwork();
438-
break;
439-
case DialogInterface.BUTTON_NEGATIVE:
440-
downloadFromAssets();
441-
break;
442-
default:
443-
// No action to be taken
444-
}
445-
}).show();
446-
} else {
447-
completeHandler.hide();
448-
}
434+
DialogFactory.createDownloadDialog(context, R.string.download_assets, R.string.charges_warning,
435+
(dialogInterface, button) -> {
436+
switch (button) {
437+
case DialogInterface.BUTTON_POSITIVE:
438+
startDownloadFromNetwork();
439+
break;
440+
case DialogInterface.BUTTON_NEGATIVE:
441+
downloadFromAssets();
442+
break;
443+
default:
444+
// No action to be taken
445+
}
446+
}).show();
447+
449448
}
450449

451450
@Override

0 commit comments

Comments
 (0)