diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/BaseMainActivity.java')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/BaseMainActivity.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index be0682bb2..9f6fea70e 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -623,11 +623,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt BaseMainActivity.currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null); } String software = sharedpreferences.getString(PREF_USER_SOFTWARE, null); - if (software != null && software.equalsIgnoreCase("peertube")) { - startActivity(new Intent(this, PeertubeMainActivity.class)); - finish(); - return; - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { ActivityResultLauncher<String> permissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> { @@ -649,6 +645,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt } catch (DBException e) { e.printStackTrace(); } + if (currentAccount != null && currentAccount.peertube_account != null) { + //It is a peertube user + Intent myIntent = new Intent(this, PeertubeMainActivity.class); + startActivity(myIntent); + finish(); + return; + } //If the attached account is null, the app will fetch remote instance to get up-to-date values if (currentAccount != null && currentAccount.mastodon_account == null && currentAccount.peertube_account == null) { OkHttpClient okHttpClient = new OkHttpClient.Builder() |