From 893928985a7827c4c90854c33e2543f3a405519b Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 6 Feb 2019 14:59:52 +0100
Subject: [PATCH] Fix crashes & improve GNUSocial urls

---
 .../mastodon/drawers/StatusListAdapter.java      | 16 ++++++++++------
 .../fr/gouv/etalab/mastodon/helper/Helper.java   |  4 +++-
 .../res/layout-sw600dp/activity_show_account.xml |  9 +++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

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 217e2e14c..6b9b14e86 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
@@ -2517,12 +2517,16 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 imageView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        Intent intent = new Intent(context, MediaActivity.class);
-                        Bundle b = new Bundle();
-                        intent.putParcelableArrayListExtra("mediaArray", status.getMedia_attachments());
-                        b.putInt("position", finalPosition);
-                        intent.putExtras(b);
-                        context.startActivity(intent);
+                        if( attachment.getType().equals("web")){
+                            Helper.openBrowser(context, attachment.getUrl());
+                        }else {
+                            Intent intent = new Intent(context, MediaActivity.class);
+                            Bundle b = new Bundle();
+                            intent.putParcelableArrayListExtra("mediaArray", status.getMedia_attachments());
+                            b.putInt("position", finalPosition);
+                            intent.putExtras(b);
+                            context.startActivity(intent);
+                        }
                     }
                 });
                 i++;
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 4f12a2a12..c0927c2ff 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -2938,7 +2938,9 @@ public class Helper {
         try {
             takenImage = MediaStore.Images.Media.getBitmap(context.getContentResolver(), uriFile);
         } catch (IOException e) {
-            Toasty.error(context, context.getString(R.string.toast_error),Toast.LENGTH_LONG).show();
+            try {
+                Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
+            }catch (Exception ignored){};
             return null;
         }
         ExifInterface exif = null;
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 313ba628e..f0936bd77 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -156,6 +156,15 @@
                                 android:id="@+id/account_type"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content" />
+                            <TextView
+                                android:layout_marginTop="5dp"
+                                android:visibility="gone"
+                                android:textColor="@color/mastodonC4"
+                                android:background="@drawable/blue_border"
+                                android:text="@string/bot"
+                                android:id="@+id/account_bot"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
                             <TextView
                                 android:id="@+id/temp_mute"
                                 android:visibility="gone"