Rename 'FolderList' to 'ManageFoldersActivity' (828e851d) · Commits · e / os / Mail

app/k9mail/src/main/AndroidManifest.xml

+9 −8

Original line number	Diff line number	Diff line
		@@ -197,15 +197,12 @@
		android:label="@string/ac_transfer_title"
		/>

		<activity
		<!-- activity-alias so old launcher shortcuts work -->
		<!-- TODO: Remove after 2020-12-31 -->
		<activity-alias
		android:name=".activity.FolderList"
		android:configChanges="locale"
		android:uiOptions="splitActionBarWhenNarrow">
		<intent-filter>
		<!-- This action is only to allow an entry point for launcher shortcuts -->
		<action android:name="android.intent.action.MAIN"/>
		</intent-filter>
		</activity>
		android:targetActivity=".activity.MessageList"
		android:exported="true" />

		<activity
		android:name=".activity.MessageList"
		@@ -303,6 +300,10 @@
		android:name=".activity.UpgradeDatabases"
		android:label="@string/upgrade_databases_title"/>

		<activity
		android:name=".activity.ManageFoldersActivity"
		android:label="@string/folders_action" />

		<activity
		android:name=".ui.settings.SettingsActivity"
		android:label="@string/prefs_title" />

app/ui/src/main/java/com/fsck/k9/activity/FolderList.java→app/ui/src/main/java/com/fsck/k9/activity/ManageFoldersActivity.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ import timber.log.Timber;
		* Activity shows list of the Account's folders
		*/

		public class FolderList extends K9ListActivity {
		public class ManageFoldersActivity extends K9ListActivity {
		private static final String EXTRA_ACCOUNT = "account";

		private static final String EXTRA_FROM_SHORTCUT = "fromShortcut";
		@@ -87,7 +87,7 @@ public class FolderList extends K9ListActivity {
		public void run() {
		actionBar.setTitle(R.string.folders_action);

		String operation = adapter.activityListener.getOperation(FolderList.this);
		String operation = adapter.activityListener.getOperation(ManageFoldersActivity.this);
		if (operation.length() < 1) {
		actionBar.setSubtitle(account.getEmail());
		} else {
		@@ -159,7 +159,7 @@ public class FolderList extends K9ListActivity {
		}

		public static Intent actionHandleAccountIntent(Context context, Account account, boolean fromShortcut) {
		Intent intent = new Intent(context, FolderList.class);
		Intent intent = new Intent(context, ManageFoldersActivity.class);
		intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
		intent.putExtra(EXTRA_ACCOUNT, account.getUuid());

		@@ -193,7 +193,7 @@ public class FolderList extends K9ListActivity {
		listView.setScrollingCacheEnabled(false);
		listView.setOnItemClickListener(new OnItemClickListener() {
		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
		FolderSettings.actionSettings(FolderList.this, account, ((FolderInfoHolder) adapter.getItem(position)).serverId);
		FolderSettings.actionSettings(ManageFoldersActivity.this, account, ((FolderInfoHolder) adapter.getItem(position)).serverId);
		}
		});

		@@ -455,7 +455,7 @@ public class FolderList extends K9ListActivity {
		private ActivityListener activityListener = new ActivityListener() {
		@Override
		public void listFoldersStarted(Account account) {
		if (account.equals(FolderList.this.account)) {
		if (account.equals(ManageFoldersActivity.this.account)) {
		handler.progress(true);
		}
		super.listFoldersStarted(account);
		@@ -464,7 +464,7 @@ public class FolderList extends K9ListActivity {

		@Override
		public void listFoldersFailed(Account account, String message) {
		if (account.equals(FolderList.this.account)) {
		if (account.equals(ManageFoldersActivity.this.account)) {
		handler.progress(false);
		runOnUiThread(new Runnable() {
		@Override
		@@ -479,7 +479,7 @@ public class FolderList extends K9ListActivity {

		@Override
		public void listFoldersFinished(Account account) {
		if (account.equals(FolderList.this.account)) {
		if (account.equals(ManageFoldersActivity.this.account)) {

		handler.progress(false);
		MessagingController.getInstance(getApplication()).refreshListener(adapter.activityListener);
		@@ -491,7 +491,7 @@ public class FolderList extends K9ListActivity {

		@Override
		public void listFolders(Account account, List<LocalFolder> folders) {
		if (account.equals(FolderList.this.account)) {
		if (account.equals(ManageFoldersActivity.this.account)) {

		List<FolderInfoHolder> newFolders = new LinkedList<>();
		List<FolderInfoHolder> topFolders = new LinkedList<>();
		@@ -516,9 +516,9 @@ public class FolderList extends K9ListActivity {
		}

		if (holder == null) {
		holder = new FolderInfoHolder(folder, FolderList.this.account, -1);
		holder = new FolderInfoHolder(folder, ManageFoldersActivity.this.account, -1);
		} else {
		holder.populate(folder, FolderList.this.account, -1);
		holder.populate(folder, ManageFoldersActivity.this.account, -1);

		}
		if (folder.isInTopGroup()) {
		@@ -537,7 +537,7 @@ public class FolderList extends K9ListActivity {

		@Override
		public void accountSizeChanged(Account account, long oldSize, long newSize) {
		if (account.equals(FolderList.this.account)) {
		if (account.equals(ManageFoldersActivity.this.account)) {
		handler.accountSizeChanged(oldSize, newSize);
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
		return;
		}

		FolderList.actionHandleAccount(this, account);
		ManageFoldersActivity.actionHandleAccount(this, account);
		}

		public void openRealAccount(Account account) {