Merge branch 'develop' into release

chrislacy · Sep 17, 2013 · 000a98a · 000a98a
2 parents 598d72f + cf0f76f
commit 000a98a
Show file tree

Hide file tree

Showing 13 changed files with 199 additions and 51 deletions.
diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
-    android:versionCode="8"
-    android:versionName="1.2.1_b2">
+    android:versionCode="51"
+    android:versionName="1.2.1_b5">
 
 
 

diff --git a/android/libraries/SocialNetLib/src/com/twitter/Autolink.java b/android/libraries/SocialNetLib/src/com/twitter/Autolink.java
@@ -70,6 +70,10 @@ public Autolink() {
         extractor.setExtractURLWithoutProtocol(false);
     }
 
+    public void setExtractURLWithoutProtocol(boolean newValue){
+        extractor.setExtractURLWithoutProtocol(newValue);
+    }
+
     String escapeBrackets(String text) {
         int len = text.length();
         if (len == 0) return text;
@@ -179,7 +183,14 @@ void linkToURL(Entity entity, String text, StringBuilder builder,
         linkText = linkText.replaceAll("^https?://", "").replaceAll("^www.", "");
 
         Map<String, String> attrs = new LinkedHashMap<String, String>();
-        attrs.put("href", url.toString());
+
+        if(urlEntity != null && urlEntity.getExpandedURL() != null){
+            attrs.put("href", urlEntity.getExpandedURL());
+        }
+        else
+        {
+            attrs.put("href", url.toString());
+        }
 
         linkToText(entity, linkText, attrs, builder);
     }

diff --git a/android/libraries/SocialNetLib/src/org/appdotnet4j/model/AdnPost.java b/android/libraries/SocialNetLib/src/org/appdotnet4j/model/AdnPost.java
@@ -20,6 +20,8 @@
 import java.text.ParseException;
 import java.util.Date;
 
+import twitter4j.URLEntity;
+
 public class AdnPost {
 
     public long mId;
@@ -34,6 +36,7 @@ public class AdnPost {
     public boolean mIsFavorited;
     public AdnUser mOriginalAuthor;
     public AdnMedia mEmbeddedMedia;
+    public URLEntity[] mUrls;
 
     public AdnPost() {
     }
@@ -113,6 +116,17 @@ public AdnPost(String jsonAsString) {
                         }
                     }
                 }
+                if (entities.has("links")) {
+                    JSONArray jsonArray = entities.getJSONArray("links");
+                    mUrls = new URLEntity[jsonArray.length()];
+                    for (int i = 0; i < jsonArray.length(); i++) {
+                        JSONObject link = jsonArray.getJSONObject(i);
+                        if (link.has("text") && link.has("url")) {
+                            URLEntity url = new AdnUrl(link.getString("text"),link.getString("url"));
+                            mUrls[i] = url;
+                        }
+                    }
+                }
             }
 
             if (object.has("annotations")) {

diff --git a/android/libraries/SocialNetLib/src/org/appdotnet4j/model/AdnUrl.java b/android/libraries/SocialNetLib/src/org/appdotnet4j/model/AdnUrl.java
@@ -0,0 +1,44 @@
+package org.appdotnet4j.model;
+
+import twitter4j.URLEntity;
+
+public class AdnUrl implements URLEntity {
+
+    private String text;
+    private String url;
+
+    public AdnUrl(String text, String url){
+        this.text = text;
+        this.url = url;
+    }
+
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public String getURL() {
+        return url;
+    }
+
+    @Override
+    public String getExpandedURL() {
+        return url;
+    }
+
+    @Override
+    public String getDisplayURL() {
+        return text;
+    }
+
+    @Override
+    public int getStart() {
+        return 0;
+    }
+
+    @Override
+    public int getEnd() {
+        return 0;
+    }
+}
diff --git a/android/libraries/SocialNetLib/src/org/socialnetlib/android/AppdotnetApi.java b/android/libraries/SocialNetLib/src/org/socialnetlib/android/AppdotnetApi.java
@@ -304,7 +304,9 @@ private AdnUsers getUsers(String path, ParameterMap params) {
 	 *
 	 */
     public AdnPost getAdnPost(long id) {
-        String postString = doGet("/stream/0/posts/" + id, null);
+        ParameterMap params = new ParameterMap();
+        params.add("include_post_annotations", "1");
+        String postString = doGet("/stream/0/posts/" + id, params);
         if (postString != null) {
             return new AdnPost(postString);
         }

diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterUtil.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterUtil.java
@@ -35,11 +35,17 @@
 public class TwitterUtil {
 
     private static Autolink mAutoLink;
+    private static boolean mAllowReInit = true;
 
     private static void initCommon() {
 
-        if (mAutoLink == null) {
-            mAutoLink = new Autolink();
+        if(mAllowReInit)
+        {
+            if (mAutoLink == null) {
+                mAutoLink = new Autolink();
+            }
+
+            mAutoLink.setExtractURLWithoutProtocol(false);
         }
     }
 
@@ -68,7 +74,14 @@ public static String getStatusMarkup(Status status) {
 	 */
     public static String getStatusMarkup(AdnPost post) {
 
-        return getStatusMarkup(post.mText, null, null);
+        initCommon();
+        mAutoLink.setExtractURLWithoutProtocol(true);
+        mAllowReInit = false;
+
+        String statusMarkup =  getStatusMarkup(post.mText, null, post.mUrls);
+        mAllowReInit = true;
+
+        return statusMarkup;
     }
 
     /*

diff --git a/android/libraries/TweetLanesCore/res/layout/account_row.xml b/android/libraries/TweetLanesCore/res/layout/account_row.xml
@@ -33,7 +33,7 @@
     <TextView
             android:id="@+id/accountScreenName"
             android:layout_width="fill_parent"
-            android:layout_height="48dp"
+            android:layout_height="fill_parent"
             android:gravity="center_vertical"
             android:text="ScreenName"
             android:textSize="@dimen/account_row_size"

diff --git a/android/libraries/TweetLanesCore/res/xml/changelog.xml b/android/libraries/TweetLanesCore/res/xml/changelog.xml
@@ -24,6 +24,8 @@
         <change>Fix - Profile URL is now expanded from a t.co</change>
         <change>Fix - Close several leaks dealing with the image loader</change>
         <change>Fix - Significantly reduce overdraw in lists containing tweets</change>
+        <change>Fix - Force close when switching accounts</change>
+        <change>Fix - New tweet count on close and re-open</change>
 	    <change>Other - Large codebase tidy-up - hopefully small improvement to performance, size and reliability</change>
     </release>
     <release version="1.2.0" versioncode="49">

diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/BaseLaneActivity.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/BaseLaneActivity.java
@@ -246,7 +246,6 @@ protected void onDestroy() {
         LocalBroadcastManager.getInstance(this).unregisterReceiver(
                 mRestartAppReceiver);
 
-        clearCompose();
         super.onDestroy();
     }
 

diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/BootActivity.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/BootActivity.java
@@ -40,13 +40,12 @@ App getApp() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setTheme(AppSettings.get().getCurrentThemeStyle());
-
         if (Constant.ENABLE_CRASH_TRACKING) {
             Crittercism.init(getApplicationContext(),
                     ConsumerKeyConstants.CRITTERCISM_APP_ID);
         }
 
+        setTheme(AppSettings.get().getCurrentThemeStyle());
         // LocalBroadcastManager.getInstance(this).registerReceiver(mOAuthLoginStateChangeReceiver,
         // new IntentFilter("" + SystemEvent.OAuthLoginStateChange));
     }
@@ -89,43 +88,40 @@ void jumpToNext() {
                 Uri uriData = getIntent().getData();
                 if (uriData != null) {
                     String host = uriData.getHost();
+                    boolean urlValid = false;
+                    finish();
 
-
-                    if(uriData.getPath().contains("/status/") || uriData.getPath().contains("/post/"))
-                    {
-                        String statusId = "";
-
-                        finish();
-
-                        if (host.contains("twitter")) {
-                            boolean nextPartStatus = false;
-                            for (String uriPart : uriData.getPathSegments()){
-                                if(nextPartStatus==true){
-                                    statusId = uriPart;
-                                    break;
-                                }
-                                if(uriPart.toLowerCase().equals("status")){
-                                    nextPartStatus = true;
-                                }
-                            }
-                            if (getApp().getCurrentAccount().getSocialNetType() != SocialNetConstant.Type.Twitter) {
-                                changeToFirstAccountOfType(SocialNetConstant.Type.Twitter);
-                            }
+                    if (host.contains("twitter")) {
+                        if (getApp().getCurrentAccount().getSocialNetType() != SocialNetConstant.Type.Twitter) {
+                            changeToFirstAccountOfType(SocialNetConstant.Type.Twitter);
                         }
-                        else if (host.contains("app.net")) {
-                            statusId = uriData.getLastPathSegment();
 
-                            if (getApp().getCurrentAccount().getSocialNetType() != SocialNetConstant.Type.Appdotnet) {
-                                changeToFirstAccountOfType(SocialNetConstant.Type.Appdotnet);
-                            }
+                        if(uriData.getPath().contains("/status/"))
+                        {
+                            String statusId = getUriPartAfterText(uriData, "status");
+                            startTweetSpotlight(statusId);
+                            urlValid = true;
+                        }
+                    }
+                    else if (host.contains("app.net")) {
+                        if (getApp().getCurrentAccount().getSocialNetType() != SocialNetConstant.Type.Appdotnet) {
+                            changeToFirstAccountOfType(SocialNetConstant.Type.Appdotnet);
                         }
 
-                        startTweetSpotlight(statusId);
+                        if(uriData.getPath().contains("/post/"))
+                        {
+                            String statusId = getUriPartAfterText(uriData, "post");
+                            startTweetSpotlight(statusId);
+                            urlValid = true;
+                        }
                     }
-                    else
+
+                    if(!urlValid)
                     {
                         Toast.makeText(getApplicationContext(), getString(R.string.unknown_intent),
                                 Constant.DEFAULT_TOAST_DISPLAY_TIME).show();
+
+                        startHomeActivity("");
                     }
                 }
                 else if (mLastStartedClass != HomeActivity.class) {
@@ -153,6 +149,21 @@ else if (mLastStartedClass != HomeActivity.class) {
 
     }
 
+    private String getUriPartAfterText(Uri uriData, String partBefore)
+    {
+        boolean nextPartStatus = false;
+        for (String uriPart : uriData.getPathSegments()){
+            if(nextPartStatus==true){
+                return uriPart;
+            }
+            if(uriPart.toLowerCase().equals(partBefore)){
+                nextPartStatus = true;
+            }
+        }
+
+        return "";
+    }
+
     private void changeToFirstAccountOfType(SocialNetConstant.Type socialNetType) {
         for (AccountDescriptor account : getApp().getAccounts()) {
             if (account.getSocialNetType() == socialNetType) {
@@ -169,4 +180,21 @@ private void startTweetSpotlight(String statusId) {
         overridePendingTransition(0, 0);
         startActivity(tweetSpotlightIntent);
     }
+
+    private void startHomeActivity(String composeText) {
+        Intent tweetSpotlightIntent = new Intent(this, HomeActivity.class);
+        if(!composeText.isEmpty()){
+            tweetSpotlightIntent.putExtra("composeText", composeText);
+        }
+        overridePendingTransition(0, 0);
+        startActivity(tweetSpotlightIntent);
+    }
+
+    private void startProfileSpotlight(String userName) {
+        Intent tweetSpotlightIntent = new Intent(this, ProfileActivity.class);
+        tweetSpotlightIntent.putExtra("userScreenName", userName);
+        tweetSpotlightIntent.putExtra("clearCompose", "true");
+        overridePendingTransition(0, 0);
+        startActivity(tweetSpotlightIntent);
+    }
 }
diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/HomeActivity.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/HomeActivity.java
@@ -194,9 +194,17 @@ void onCreateHandleIntents() {
         boolean turnSoftKeyboardOff = true;
 
         Intent intent = getIntent();
+
+        Bundle extras = intent.getExtras();
+        if (extras != null) {
+            String composeText = extras.getString("composeText");
+            if(composeText!= null && !composeText.isEmpty()){
+                beginShareStatus(composeText);
+            }
+        }
+
         if (intent.getAction() == Intent.ACTION_SEND) {
 
-            Bundle extras = intent.getExtras();
             String type = intent.getType();
             if (type.equals("text/plain")) {
 
@@ -545,6 +553,7 @@ private void showAccount(AccountDescriptor selectedAccount, Constant.LaneType la
             clearFragmentsCache();
 
             app.setCurrentAccount(selectedAccount.getId());
+            mHomeLaneAdapter.notifyDataSetChanged();
 
             // From http://stackoverflow.com/a/3419987/328679
             Intent intent = getIntent();