diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java index 7bdf4f2c..a18ed1d1 100644 --- a/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java @@ -184,6 +184,9 @@ public class SWADMain extends MenuExpandableListActivity { initializeMainViews(); try { + // Initialize WorkManager + workManager = WorkManager.getInstance(this); + // Create Notifications channel if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { AlertNotificationFactory.createNotificationChanel(this); @@ -212,8 +215,6 @@ public class SWADMain extends MenuExpandableListActivity { View view = findViewById(R.id.main_view); setOnApplyWindowInsetsListener(view); - - workManager = WorkManager.getInstance(this); } catch (Exception ex) { error(ex.getMessage(), ex); } diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java index 238da8fd..cbf436ae 100644 --- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java @@ -271,6 +271,9 @@ public class Notifications extends Module implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + workManager = WorkManager.getInstance(this); + setContentView(R.layout.expandablelist_items_pulltorefresh); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -318,8 +321,6 @@ public class Notifications extends Module implements View view = findViewById(R.id.expandablelist_items_pulltorefresh); setOnApplyWindowInsetsListener(view); - - workManager = WorkManager.getInstance(this); } /** diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java index 652763f9..343e5751 100644 --- a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java @@ -149,6 +149,8 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + workManager = WorkManager.getInstance(ctx); //Restore preferences getPreferenceManager().setSharedPreferencesName(Preferences.PREFS_NAME); @@ -238,8 +240,6 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere } catch (PackageManager.NameNotFoundException ex) { error(ex.getMessage(), ex); } - - workManager = WorkManager.getInstance(ctx); } /* (non-Javadoc)