wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4239 from k9mail/fix_app_start

Browse source 
Fix app start and launcher activities after 'Accounts' activity removal
This commit is contained in:
cketti 2019-11-06 04:59:12 +01:00 committed by GitHub
commit a2d11393cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/k9mail/src/main/AndroidManifest.xml
View file

@ -84,12 +84,8 @@
<!-- TODO: Remove after 2020-12-31 --> <!-- TODO: Remove after 2020-12-31 -->
<activity-alias <activity-alias
android:name=".activity.Accounts" android:name=".activity.Accounts"
android:targetActivity=".activity.MessageList" > android:targetActivity=".activity.MessageList"
<intent-filter> android:exported="true" />
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity <activity
android:name=".ui.onboarding.OnboardingActivity" android:name=".ui.onboarding.OnboardingActivity"

8
app/ui/src/main/java/com/fsck/k9/activity/MessageList.java
View file

@ -59,6 +59,7 @@ import com.fsck.k9.ui.R;
import com.fsck.k9.ui.Theme; import com.fsck.k9.ui.Theme;
import com.fsck.k9.ui.messageview.MessageViewFragment; import com.fsck.k9.ui.messageview.MessageViewFragment;
import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener; import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener;
import com.fsck.k9.ui.onboarding.OnboardingActivity;
import com.fsck.k9.ui.settings.SettingsActivity; import com.fsck.k9.ui.settings.SettingsActivity;
import com.fsck.k9.view.ViewSwitcher; import com.fsck.k9.view.ViewSwitcher;
import com.fsck.k9.view.ViewSwitcher.OnSwitchCompleteListener; import com.fsck.k9.view.ViewSwitcher.OnSwitchCompleteListener;
@ -208,6 +209,13 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
List<Account> accounts = preferences.getAccounts();
if (accounts.isEmpty()) {
OnboardingActivity.launch(this);
finish();
return;
}
if (UpgradeDatabases.actionUpgradeDatabases(this, getIntent())) { if (UpgradeDatabases.actionUpgradeDatabases(this, getIntent())) {
finish(); finish();
return; return;