@@ -188,12 +188,14 @@ protected void onCreate(Bundle savedInstanceState) {
188
188
189
189
completeHandler = DownloadCompleteHandler .with (context );
190
190
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 ( )) {
193
193
downloadFromAssets ();
194
+ } else {
195
+ downloadData ();
194
196
}
195
197
} else {
196
- downloadData ();
198
+ completeHandler . hide ();
197
199
}
198
200
199
201
if (savedInstanceState == null ) {
@@ -429,23 +431,20 @@ public void downloadData() {
429
431
@ Override
430
432
public void networkAvailable () {
431
433
// 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
+
449
448
}
450
449
451
450
@ Override
0 commit comments