bump version

README.md

@@ -1,18 +1,19 @@
 # Forked Mastodon for Android
-[![Crowdin](https://badges.crowdin.net/mastodon-for-android/localized.svg)](https://crowdin.com/project/mastodon-for-android)
 
 This is the repository for an officially forked Android app for Mastodon.
 
-Learn more about this app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/).
+Learn more about the official app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/).
 
 ## Changes
 
 * [Enable "Unlisted" as a visibility option](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted)
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103)) and
   [set as default](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted-as-default)
-* [Add "Federation" tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/tree/feature/add-federated-timeline)
+* [Add "Federation" tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/tree/feature/add-federated-timeline) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/8))
 * [Add image description button and viewer](https://github.com/sk22/mastodon-android-fork/tree/feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
 * [Implement pinning posts and displaying pinned posts](https://github.com/sk22/mastodon-android-fork/tree/feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
+* [Display full image when adding image description](https://github.com/sk22/mastodon-android-fork/tree/feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
+* [Always preserve content warnings when replying](https://github.com/sk22/mastodon-android-fork/tree/feature/always-preserve-cw) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/113))
 
 ## Building
 

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 31
-		versionCode 11
+		versionCode 13
-		versionName '1.1.1+fork.11'
+		versionName '1.1.1+fork.13'
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -453,7 +453,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			if(savedInstanceState==null){
 				mainEditText.setText(initialText);
 				mainEditText.setSelection(mainEditText.length());
-				if(!TextUtils.isEmpty(replyTo.spoilerText) && AccountSessionManager.getInstance().isSelf(accountID, replyTo.account)){
+				// TODO: setting for preserving cw always / only when replying to own posts
+				// && AccountSessionManager.getInstance().isSelf(accountID, replyTo.account)
+				if(!TextUtils.isEmpty(replyTo.spoilerText)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
 					spoilerEdit.setText(replyTo.spoilerText);

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java

@@ -255,9 +255,14 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public boolean onBackPressed(){
 		if(currentTab==R.id.tab_profile)
-			return profileFragment.onBackPressed();
+			if (profileFragment.onBackPressed()) return true;
 		if(currentTab==R.id.tab_search)
-			return searchFragment.onBackPressed();
+			if (searchFragment.onBackPressed()) return true;
+		if (currentTab!=R.id.tab_home) {
+			tabBar.selectTab(R.id.tab_home);
+			onTabSelected(R.id.tab_home);
+			return true;
+		}
 		return false;
 	}