Remove FLAG_ACTIVITY_NEW_TASK when choosing a channel to share a file to

irccloud · Mar 27, 2017 · 3bc82b3 · 3bc82b3
1 parent 771dbc5
commit 3bc82b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/com/irccloud/android/activity/ShareChooserActivity.java b/src/com/irccloud/android/activity/ShareChooserActivity.java
@@ -280,9 +280,6 @@ public void run() {
     @Override
     public void onBufferSelected(int bid) {
         Intent i = new Intent(this, MainActivity.class);
-        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-            i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
         i.putExtra("bid", bid);
         if (getIntent() != null && getIntent().getData() != null)
             i.setData(getIntent().getData());

diff --git a/src/com/irccloud/android/fragment/MessageViewFragment.java b/src/com/irccloud/android/fragment/MessageViewFragment.java
@@ -556,7 +556,7 @@ public void insertAbove(long eid, Event e) {
 
         public void insertBelow(long eid, Event e) {
             synchronized (data) {
-                if(data.get(data.size() - 1).eid == eid) {
+                if(data.size() == 0 || data.get(data.size() - 1).eid == eid) {
                     data.add(e);
                     return;
                 }

diff --git a/src/com/irccloud/android/fragment/WhoWasFragment.java b/src/com/irccloud/android/fragment/WhoWasFragment.java
@@ -90,7 +90,10 @@ public void onBindViewHolder(ViewHolder holder, final int position) {
                 row.usermask.setVisibility(View.GONE);
             }
             row.setRealname(node.get("realname").asText());
-            row.setLastconnected(node.get("last_seen").asText());
+            if(node.get("last_seen") != null)
+                row.setLastconnected(node.get("last_seen").asText());
+            else
+                row.setLastconnected("");
             row.setConnectedvia(node.get("ircserver").asText());
             if(node.has("connecting_from")) {
                 row.setInfo(node.get("connecting_from").asText());