From e482789d4142890aa3eb6bd48a628acab20b87e3 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Tue, 26 Dec 2017 10:06:22 +0100
Subject: [PATCH] Fixes issue #198

---
 .../activities/ShowConversationActivity.java  | 10 +++++++
 .../mastodon/drawers/StatusListAdapter.java   | 30 +++++++++++++++++++
 app/src/main/res/layout/drawer_status.xml     |  6 ++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
index 62eca2acc..e05ec1ac2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
@@ -110,6 +110,15 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
             ImageView action_refresh = getSupportActionBar().getCustomView().findViewById(R.id.action_refresh);
             title.setText(R.string.conversation);
             ImageView close_conversation = getSupportActionBar().getCustomView().findViewById(R.id.close_conversation);
+
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if( lv_status != null) {
+                        lv_status.setAdapter(statusListAdapter);
+                    }
+                }
+            });
             if( close_conversation != null){
                 close_conversation.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -136,6 +145,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
         }else{
             setTitle(R.string.conversation);
         }
+
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
         Account account = new AccountDAO(getApplicationContext(),db).getAccountByID(userId);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 3e7cf9452..be3ee4972 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -15,6 +15,7 @@ package fr.gouv.etalab.mastodon.drawers;
  * see <http://www.gnu.org/licenses>. */
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Typeface;
 import android.os.Handler;
@@ -881,6 +882,35 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     holder.main_container.setBackgroundResource(R.color.mastodonC1_);
                 }
             }else {
+
+                holder.status_content.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(context, ShowConversationActivity.class);
+                        Bundle b = new Bundle();
+                        if( status.getReblog() == null)
+                            b.putString("statusId", status.getId());
+                        else
+                            b.putString("statusId", status.getReblog().getId());
+                        intent.putExtras(b);
+                        context.startActivity(intent);
+                        ((ShowConversationActivity)context).finish();
+                    }
+                });
+                holder.main_container.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(context, ShowConversationActivity.class);
+                        Bundle b = new Bundle();
+                        if( status.getReblog() == null)
+                            b.putString("statusId", status.getId());
+                        else
+                            b.putString("statusId", status.getReblog().getId());
+                        intent.putExtras(b);
+                        context.startActivity(intent);
+                        ((ShowConversationActivity)context).finish();
+                    }
+                });
                 if( position == conversationPosition){
                     if( theme == Helper.THEME_LIGHT)
                         holder.main_container.setBackgroundResource(R.color.mastodonC3_);
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index fe8cbd0d7..d63fc9fb5 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -246,9 +246,11 @@
                 </LinearLayout>
                 <FrameLayout
                     android:visibility="gone"
+                    android:layout_gravity="center"
                     android:id="@+id/status_cardview_video"
-                    android:layout_width="match_parent"
-                    android:layout_height="220dp">
+                    android:layout_width="300dp"
+                    android:layout_height="220dp"
+                    tools:ignore="WebViewLayout">
                     <WebView
                         android:id="@+id/status_cardview_webview"
                         android:layout_width="match_parent"