diff options
| author | Thomas <tschneider.ac@gmail.com> | 2023-01-23 15:01:44 +0100 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2023-01-23 15:01:44 +0100 |
| commit | 82a5bfebb42b0a1f82a38ddf3f2dda272a0c9611 (patch) | |
| tree | ee550ea4b61d0f7b42032f785b3a1a7df4b4c3b0 /app/src/main/java/app/fedilab/android/BaseMainActivity.java | |
| parent | 4c5232039a566aba74f0bc7d8f95d5f13567a3bd (diff) | |
Some changes
Diffstat (limited to 'app/src/main/java/app/fedilab/android/BaseMainActivity.java')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/BaseMainActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index 8d572ea89..9230ae23d 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -106,6 +106,7 @@ import java.util.regex.Pattern; import app.fedilab.android.activities.AboutActivity; import app.fedilab.android.activities.LoginActivity; import app.fedilab.android.activities.MainActivity; +import app.fedilab.android.activities.PeertubeBaseMainActivity; import app.fedilab.android.databinding.ActivityMainBinding; import app.fedilab.android.databinding.NavHeaderMainBinding; import app.fedilab.android.mastodon.activities.ActionActivity; @@ -334,6 +335,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt }); permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS); } + + filteredAccounts = new ArrayList<>(); mamageNewIntent(getIntent()); filterFetched = false; @@ -598,6 +601,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null); } currentAccount = new Account(BaseMainActivity.this).getConnectedAccount(); + if (currentAccount.api == Account.API.PEERTUBE) { + startActivity(new Intent(this, PeertubeBaseMainActivity.class)); + finish(); + } } catch (DBException e) { e.printStackTrace(); } @@ -1006,7 +1013,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt Bundle extras = intent.getExtras(); String userIdIntent, instanceIntent, urlOfMessage; if (extras != null && extras.containsKey(Helper.INTENT_ACTION)) { - userIdIntent = extras.getString(Helper.PREF_KEY_ID); //Id of the account in the intent + userIdIntent = extras.getString(Helper.PREF_USER_ID); //Id of the account in the intent instanceIntent = extras.getString(Helper.PREF_INSTANCE); urlOfMessage = extras.getString(Helper.PREF_MESSAGE_URL); if (extras.getInt(Helper.INTENT_ACTION) == Helper.NOTIFICATION_INTENT) { |