From c04e1dc584ff1f0ca89595000bbba595d7c1be0a Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Sat, 9 Apr 2022 11:23:49 +0200 Subject: [PATCH] Fix crash on new app (#1082) Co-authored-by: qwerty287 Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@noreply.codeberg.org> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1082 Reviewed-by: M M Arif Co-authored-by: qwerty287 Co-committed-by: qwerty287 --- .../org/mian/gitnex/activities/LoginActivity.java | 15 +++++++++++---- .../org/mian/gitnex/activities/MainActivity.java | 7 ++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index 9c549657..d731bde6 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -11,6 +11,7 @@ import android.widget.EditText; import android.widget.RadioGroup; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; +import org.gitnex.tea4j.ApiInterface; import org.gitnex.tea4j.models.GiteaVersion; import org.gitnex.tea4j.models.UserInfo; import org.gitnex.tea4j.models.UserTokens; @@ -219,9 +220,15 @@ public class LoginActivity extends BaseActivity { String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); - callVersion = - (loginOTP != 0) ? RetrofitClient.getApiInterface(ctx).getGiteaVersionWithOTP(credential, loginOTP) : - RetrofitClient.getApiInterface(ctx).getGiteaVersionWithBasic(credential); + ApiInterface apiClient = RetrofitClient.getApiInterface(ctx); + + if (loginOTP != 0) { + + callVersion = apiClient.getGiteaVersionWithOTP(credential, loginOTP); + } else { + + callVersion = apiClient.getGiteaVersionWithBasic(credential); + } } callVersion.enqueue(new Callback() { @@ -584,7 +591,7 @@ public class LoginActivity extends BaseActivity { instanceUrlET.setText(tinyDB.getString("instanceUrlRaw")); } - if(getAccount() != null) { + if(getAccount() != null && getAccount().getAccount() != null) { loginUidET.setText(getAccount().getAccount().getUserName()); } diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index ab24d4c4..10ed8c91 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -107,13 +107,14 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig } // DO NOT MOVE - instanceToken = getAccount().getAuthorization(); - noConnection = false; - if(tinyDB.getInt("currentActiveAccountId", -1) <= 0) { AppUtil.logout(ctx); + return; } + instanceToken = getAccount().getAuthorization(); + noConnection = false; + Toolbar toolbar = activityMainBinding.toolbar; toolbarTitle = activityMainBinding.toolbarTitle;