Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26dee93b authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Fix Null Pointer Exception. 

Intent parameter can be null in the onStartCommand() callback.
parent 2ac453e8

app/src/main/java/foundation/e/drive/services/InitializerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ public class InitializerService extends Service { 
    }

    }





    @Override

    @Override

    public int onStartCommand(@NonNull Intent intent, int flags, int startId) {

    public int onStartCommand(@Nullable Intent intent, int flags, int startId) {

        Timber.i("onStartCommand()");

        Timber.i("onStartCommand()");

        DavClientProvider.getInstance().cleanUp();

        DavClientProvider.getInstance().cleanUp();

        CommonUtils.setServiceUnCaughtExceptionHandler(this);

        CommonUtils.setServiceUnCaughtExceptionHandler(this);
@@ -58,7 +58,7 @@ public class InitializerService extends Service { 
        String accountName = prefs.getString(AccountManager.KEY_ACCOUNT_NAME, "");

        String accountName = prefs.getString(AccountManager.KEY_ACCOUNT_NAME, "");

        String accountType = prefs.getString(AccountManager.KEY_ACCOUNT_TYPE, "");

        String accountType = prefs.getString(AccountManager.KEY_ACCOUNT_TYPE, "");





        if (accountName.isEmpty() && accountType.isEmpty() && intent.getExtras() != null) {

        if (accountName.isEmpty() && accountType.isEmpty() && intent != null && intent.getExtras() != null) {





            accountName = intent.getExtras().getString(AccountManager.KEY_ACCOUNT_NAME, "");

            accountName = intent.getExtras().getString(AccountManager.KEY_ACCOUNT_NAME, "");

            accountType = intent.getExtras().getString(AccountManager.KEY_ACCOUNT_TYPE, "");

            accountType = intent.getExtras().getString(AccountManager.KEY_ACCOUNT_TYPE, "");