Merge branch 'develop'

99 files changed, 2907 insertions, 1698 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 4804f4692..e3bad0031 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 372
-        versionName "2.35.8"
+        versionCode 374
+        versionName "2.36.0"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
@@ -117,6 +117,7 @@ dependencies {
     implementation "info.guardianproject.netcipher:netcipher:2.0.0-alpha1"
     implementation "info.guardianproject.netcipher:netcipher-okhttp3:2.0.0-alpha1"
 
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation  'com.github.adrielcafe:AndroidAudioRecorder:0.3.0'
     implementation 'yogesh.firzen:MukkiyaSevaigal:1.0.6'
     implementation 'com.iceteck.silicompressorr:silicompressor:2.2.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f01b939ca..c3f41fc6d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,6 +69,11 @@
             android:name="app.fedilab.android.services.BackupNotificationInDataBaseService"
             android:exported="false" />
 
+        <receiver android:name=".services.UpgradeReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
         <receiver
             android:name="app.fedilab.android.services.RestartLiveNotificationReceiver"
             android:exported="false">
@@ -527,5 +532,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
     </application>
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/changelogs/373.txt b/app/src/main/assets/changelogs/373.txt
new file mode 100644
index 000000000..f8a871c33
--- /dev/null
+++ b/app/src/main/assets/changelogs/373.txt
@@ -0,0 +1,18 @@
+Added:
+- Select text for media description
+
+changed:
+- Increase media description length to 1500 chars
+- More details about accounts in notifications
+- Media management in timelines
+- Allow cross-account replies on followed instances
+
+Fixed:
+- Remove extra spaces at the bottom of messages
+- Some issue with custom emoji
+- Fix issue with "Your toots/notifications"
+- Fix issue with CW and Pixelfed
+- Fix some media not loaded in profiles
+- Scheduled toots from server side have an incorrect date
+- Incorrect feeds when checking instance admin account
+- Some crashes
\ No newline at end of file
diff --git a/app/src/main/assets/changelogs/374.txt b/app/src/main/assets/changelogs/374.txt
new file mode 100644
index 000000000..dd6256ca4
--- /dev/null
+++ b/app/src/main/assets/changelogs/374.txt
@@ -0,0 +1,19 @@
+Added:
+- Select text for media description
+
+changed:
+- Increase media description length to 1500 chars
+- More details about accounts in notifications
+- Media management in timelines
+- Allow cross-account replies on followed instances
+
+Fixed:
+- Crash when adding media
+- Remove extra spaces at the bottom of messages
+- Some issue with custom emoji
+- Fix issue with "Your toots/notifications"
+- Fix issue with CW and Pixelfed
+- Fix some media not loaded in profiles
+- Scheduled toots from server side have an incorrect date
+- Incorrect feeds when checking instance admin account
+- Some crashes
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
index 96f7a25d9..a1a7fef80 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
@@ -5,9 +5,11 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.ActionMode;
 import android.view.View;
+import android.view.Window;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -67,6 +69,9 @@ public class BaseActivity extends CyaneaAppCompatActivity {
                     .build());
         }*/
         canShowActionMode = true;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().requestFeature(Window.FEATURE_CONTENT_TRANSITIONS);
+        }
         super.onCreate(savedInstanceState);
 
     }
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index f22ff876b..06e9fcfb4 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -986,8 +986,8 @@ public abstract class BaseMainActivity extends BaseActivity
                         SeekBar set_icon_size = popup_quick_settings.findViewById(R.id.set_icon_size);
                         final TextView set_text_size_value = popup_quick_settings.findViewById(R.id.set_text_size_value);
                         final TextView set_icon_size_value = popup_quick_settings.findViewById(R.id.set_icon_size_value);
-                        set_text_size_value.setText(String.format("%s%%", String.valueOf(textSize)));
-                        set_icon_size_value.setText(String.format("%s%%", String.valueOf(iconSize)));
+                        set_text_size_value.setText(String.format("%s%%", textSize));
+                        set_icon_size_value.setText(String.format("%s%%", iconSize));
 
                         set_text_size.setMax(20);
                         set_icon_size.setMax(20);
@@ -1008,7 +1008,7 @@ public abstract class BaseMainActivity extends BaseActivity
                             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 
                                 int value = 80 + progress * 5;
-                                set_text_size_value.setText(String.format("%s%%", String.valueOf(value)));