From f3db1090e940ae95fbfa734e734844cf8dd6a40b Mon Sep 17 00:00:00 2001
From: Lyndon <lyndonj@gmx.de>
Date: Tue, 28 Nov 2017 17:28:48 +0100
Subject: [PATCH] kek

---
 BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle  | 4 ++--
 .../de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java | 9 +--------
 .../ownchat/page/contacts/ContactsAdapter.java           | 5 +++++
 .../ownchat/page/contacts/ContactsFragment.java          | 3 +--
 .../ownchat/page/contacts/ContactsPresenter.java         | 1 +
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
index 713dc76..ee67134 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "de.beyondsoft.ownchat"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 7
-        versionName "1.7"
+        versionCode 9
+        versionName "1.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
index 3a2d97d..8f8521e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
@@ -325,7 +325,7 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 } else {
                     viewHolder.filenameTextView.setVisibility(View.GONE);
                 }
-            } else if (message.filePath.toLowerCase().endsWith(".png") || message.filePath.toLowerCase().endsWith(".jpg") || message.filePath.toLowerCase().endsWith(".gif")) {
+            } else {
                 viewHolder.donutProgress.setVisibility(View.GONE);
                 viewHolder.fileImageView.setVisibility(View.VISIBLE);
                 viewHolder.filenameTextView.setVisibility(View.GONE);
@@ -338,13 +338,6 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         .override(500, 500)
                         .diskCacheStrategy(DiskCacheStrategy.ALL)
                         .into(viewHolder.fileImageView);
-            } else {
-                viewHolder.donutProgress.setVisibility(View.GONE);
-                viewHolder.fileImageView.setVisibility(View.VISIBLE);
-                viewHolder.filenameTextView.setVisibility(View.VISIBLE);
-                viewHolder.fileImageView.setImageDrawable(null);
-                viewHolder.fileImageView.setImageResource(R.drawable.document);
-                viewHolder.filenameTextView.setText(message.originalFilename);
             }
 
 			if (!TextUtils.isEmpty(message.message)) {
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
index 89e8589..b421d6c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
@@ -82,10 +82,12 @@ class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         setLastMessage(group, viewHolder);
 
         int type = getItemViewType(position);
+
         if (type == GROUP_TYPE) {
             viewHolder.name.setText(group.name);
             viewHolder.name.setTextColor(ContextCompat.getColor(viewHolder.name.getContext(), group.isHelpGroup() ? R.color.colorHelpGroup : R.color.colorTeamGroup));
             viewHolder.avatar.setImageResource(group.isHelpGroup() ? R.drawable.avatar_help_group : R.drawable.avatar_team_group);
+
             return;
         } else if(!group.onlyEmployees) {
             viewHolder.avatar.setImageResource(R.drawable.avatar_help);
@@ -134,6 +136,7 @@ class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         if (resourceId != 0) {
             viewHolder.messageStatusPending.setVisibility(resourceId == -1 ? View.VISIBLE : View.GONE);
+
             if (resourceId != -1) {
                 viewHolder.messageStatus.setImageResource(group.lastMessage.getStatusResourceId());
             } else {
@@ -174,10 +177,12 @@ class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         @OnClick(R.id.contact_container)
         void onClickContact() {
             int type = getItemViewType();
+
             if (type == GROUP_TYPE) {
                 mItemClickListener.onOpenGroupMessage(mGroups.get(getAdapterPosition()));
                 return;
             }
+
             mItemClickListener.onOpenPrivateMessage(mGroups.get(getAdapterPosition()));
         }
     }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
index dcd9d38..d150b67 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
@@ -54,8 +54,7 @@ import butterknife.ButterKnife;
 /**
  * Created by imarneanu on 2/13/17.
  */
-public class ContactsFragment extends BaseFragment
-        implements ContactsView, ContactsAdapter.OnOpenClickListener, SearchView.OnQueryTextListener {
+public class ContactsFragment extends BaseFragment implements ContactsView, ContactsAdapter.OnOpenClickListener, SearchView.OnQueryTextListener {
 
     @BindView(R.id.contacts_recycler_view)
     RecyclerView mContactsRecyclerView;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
index 5e9d3df..d7ade96 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
@@ -161,6 +161,7 @@ class ContactsPresenter extends MVPAbstractPresenter<ContactsView> implements Co
         if (!isAttached()) {
             return;
         }
+/**/
         getView().hideProgress();
         getView().setGroups(groups);
     }