add "Get in on F-Droid" badge

.github/workflows/release.yml

@@ -63,7 +63,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
-          body: "Auto-generated release"
+          body: '[<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite) [<img src="store/get-it-on-IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite) [<img src="store/get-it-on-apklis.png" alt="Disponible en Apklis" height="48">](https://www.apklis.cu/application/chat.delta.lite) [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)'
           prerelease: ${{ contains(github.event.ref, '-beta') }}
           fail_on_unmatched_files: true
           files: build/outputs/apk/foss/release/*.apk

README.md

@@ -2,15 +2,10 @@
 
 A [Delta Chat](https://delta.chat/) client for Android.
 
-[<img src="store/get-it-on-IzzyOnDroid.png"
-     alt="Get it on IzzyOnDroid"
-     height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite)
-[<img src="store/get-it-on-apklis.png"
-     alt="Disponible en Apklis"
-     height="48">](https://www.apklis.cu/application/chat.delta.lite)
-[<img src="store/get-it-on-github.png"
-     alt="Get it on GitHub"
-     height="48">](https://github.com/ArcaneChat/android/releases/latest)
+[<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite)
+[<img src="store/get-it-on-IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="48">](https://apt.izzysoft.de/fdroid/index/apk/chat.delta.lite)
+[<img src="store/get-it-on-apklis.png" alt="Disponible en Apklis" height="48">](https://www.apklis.cu/application/chat.delta.lite)
+[<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)
 
 
 <img alt="Screenshot" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="298" /> <img alt="Screenshot" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="298" />

build.gradle

@@ -33,8 +33,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000690
-        versionName "1.46.18"
+        versionCode 30000689
+        versionName "1.46.17"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -1056,6 +1056,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         e.printStackTrace();
       }
     }
+    else if (action == ACTION_SEND_OUT && quote.isPresent() && EmojiProvider.getInstance(this).maybeEmoji(body)){
+      int quotedMsg = quote.get().getQuotedMsg().getId();
+      try {
+        rpc.sendReaction(dcContext.getAccountId(), quotedMsg, body.equals(getSelfReaction(quotedMsg))? "" : body);
+        future.set(chatId);
+        return future;
+      } catch (RpcException e) {
+        e.printStackTrace();
+        msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+        msg.setText(body);
+      }
+    }
     else if (!body.isEmpty()){
       msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
       msg.setText(body);

src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -186,7 +186,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
     TooltipCompat.setTooltipText(selfAvatar, getText(R.string.switch_account));
     selfAvatar.setOnClickListener(v -> AccountManager.getInstance().showSwitchAccountMenu(this));
-    findViewById(R.id.avatar_and_title).setOnClickListener(v -> {
+    title.setOnClickListener(v -> {
       if (!isRelayingMessageContent(this)) {
         AccountManager.getInstance().showSwitchAccountMenu(this);
       }
@@ -460,10 +460,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
         startActivity(new Intent(this, ProfileActivity.class));
         return true;
       case R.id.menu_webxdc_apps_store:
-        handleShowBot("juegos@buzon.uy", "OPENPGP4FPR:d3d403a734be71fe9293a00311fef80dbe5dbc89#a=juegos%40buzon.uy&n=&i=WQZY-8FODS3&s=ZQBkaclFzao");
+          handleShowBot("xstore@testrun.org", "OPENPGP4FPR:37DC2B704A2AE2F6A96235CE0C3A0EBCA4F5801D#a=xstore%40testrun.org&n=&i=-1IGtynaivZ&s=JqHsvvcDmnW");
         return true;
       case R.id.menu_public_bots:
-        handleShowBot("puente@buzon.uy", "OPENPGP4FPR:4B41E5AFAF78A0C71DB56138D5BEFED00A45F97A#a=puente%40buzon.uy&n=Public%20Bots&i=ZC_oaJtuvJP&s=5SE96rRovsK");
+          handleShowBot("publicbots@testrun.org", "OPENPGP4FPR:4DB8117591B27184A903FF7E9F469E00D40E13E7#a=publicbots%40testrun.org&n=Public%20Bots&i=zSuQpFtBa_Q&s=weLMu1-o1o1");
         return true;
     }
 

src/main/res/layout/conversation_list_activity.xml

@@ -1,112 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@id/container"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@id/container"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-  <androidx.appcompat.widget.Toolbar
-      android:id="@+id/toolbar"
-      android:layout_alignParentTop="true"
-      android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
-      android:minHeight="?attr/actionBarSize"
-      android:background="?attr/colorPrimary"
-      app:contentInsetStart="0dp"
-      app:contentInsetLeft="0dp"
-      android:elevation="4dp"
-      android:theme="?attr/actionBarStyle">
+    <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:contentInsetStart="14dp"
+            app:contentInsetLeft="14dp"
+            android:elevation="4dp"
+            android:theme="?attr/actionBarStyle">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-      <LinearLayout
-          android:id="@+id/avatar_and_title"
-          android:orientation="horizontal"
-          android:layout_width="0dp"
-          android:layout_weight="1"
-          android:paddingStart="14dp"
-          android:layout_height="match_parent"
-          android:layout_marginEnd="10dp">
+          <RelativeLayout
+              android:id="@+id/self_avatar_container"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:layout_height="45dp">
+            <org.thoughtcrime.securesms.components.AvatarView
+                android:id="@+id/self_avatar"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:clickable="true"
+                app:inverted="true"
+                android:contentDescription="@string/pref_profile_info_headline" />
+            <ImageView android:id="@+id/unread_indicator"
+                       android:layout_width="20dp"
+                       android:layout_height="20dp"
+                       android:layout_marginLeft="20dp"
+                       android:layout_marginStart="20dp"
+                       app:layout_constraintTop_toTopOf="parent"
+                       android:layout_marginBottom="16dp"
+                       android:contentDescription="@null"
+                       android:visibility="gone"
+                       />
+          </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/self_avatar_container"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="45dp">
-          <org.thoughtcrime.securesms.components.AvatarView
-              android:id="@+id/self_avatar"
-              android:layout_width="35dp"
-              android:layout_height="35dp"
-              android:layout_marginRight="10dp"
-              android:layout_marginEnd="10dp"
-              android:layout_marginTop="5dp"
-              android:layout_marginBottom="5dp"
-              android:clickable="true"
-              app:inverted="true"
-              android:contentDescription="@string/pref_profile_info_headline" />
-          <ImageView
-              android:id="@+id/unread_indicator"
-              android:layout_width="20dp"
-              android:layout_height="20dp"
-              android:layout_marginLeft="20dp"
-              android:layout_marginStart="20dp"
-              app:layout_constraintTop_toTopOf="parent"
-              android:layout_marginBottom="16dp"
-              android:contentDescription="@null"
-              android:visibility="gone"
-              />
-        </RelativeLayout>
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView style="@style/TextSecure.TitleTextStyle"
+                      android:id="@+id/toolbar_title"
+                      android:layout_width="0dp"
+                      android:layout_height="wrap_content"
+                      android:text="@string/app_name"
+                      android:layout_weight="1"
+                      android:layout_gravity="center_vertical"
+                      android:paddingRight="10dp"
+                      android:ellipsize="end"
+                      android:maxLines="1"/>
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            style="@style/TextSecure.TitleTextStyle"
-            android:id="@+id/toolbar_title"
-            android:layout_width="0dp"
+            <ImageView android:id="@+id/search_action"
+                       android:layout_width="wrap_content"
+                       android:layout_height="match_parent"
+                       android:src="@drawable/ic_search_white_24dp"
+                       android:paddingRight="12dp"
+                       android:paddingEnd="12dp"
+                       android:paddingLeft="12dp"
+                       android:paddingStart="12dp"
+                       android:layout_marginTop="4dp"
+                       android:layout_marginBottom="4dp"
+                       android:layout_gravity="center_vertical"
+                       android:contentDescription="@string/search"/>
+
+        </LinearLayout>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <FrameLayout android:id="@+id/fragment_container"
+                 android:layout_below="@id/toolbar"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent"/>
+
+    <org.thoughtcrime.securesms.components.SearchToolbar
+            android:id="@+id/search_toolbar"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:paddingRight="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"/>
-      </LinearLayout>
-
-      <ImageView
-          android:id="@+id/search_action"
-          android:layout_width="wrap_content"
-          android:layout_height="match_parent"
-          android:src="@drawable/ic_search_white_24dp"
-          android:paddingRight="12dp"
-          android:paddingEnd="12dp"
-          android:paddingLeft="12dp"
-          android:paddingStart="12dp"
-          android:layout_marginTop="4dp"
-          android:layout_marginBottom="4dp"
-          android:layout_gravity="center_vertical"
-          android:contentDescription="@string/search"/>
-
-    </LinearLayout>
-
-  </androidx.appcompat.widget.Toolbar>
-
-  <FrameLayout
-      android:id="@+id/fragment_container"
-      android:layout_below="@id/toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-
-  <org.thoughtcrime.securesms.components.SearchToolbar
-      android:id="@+id/search_toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"
-      android:elevation="4dp"
-      android:visibility="invisible"
-      tools:visibility="visible"/>
+            android:layout_alignParentTop="true"
+            android:elevation="4dp"
+            android:visibility="invisible"
+            tools:visibility="visible"/>
 
 </RelativeLayout>