Merge remote-tracking branch 'Upstream/develop' into Upstream_release

chrislacy · Sep 18, 2013 · 1d30e2c · 1d30e2c
2 parents 000a98a + e8d2c5d
commit 1d30e2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
     android:versionCode="51"
-    android:versionName="1.2.1_b5">
+    android:versionName="1.2.1_b6">
 
 
 

diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedFragment.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/TweetFeedFragment.java
@@ -491,7 +491,10 @@ boolean configureCachedStatuses() {
 
                             setStatusFeed(_mCachedStatusFeed, false);
                             if (getStatusFeed() != null && mLastTwitterStatusIdSeen != null) {
-                                updateListHeading(getStatusFeed().getStatusIndex(mLastTwitterStatusIdSeen));
+                                Integer index = getStatusFeed().getStatusIndex(mLastTwitterStatusIdSeen);
+                                if(index != null){
+                                    updateListHeading(index);
+                                }
                             }
 
                             return true;