Merge branch 'Upstream_release' into Upstream_master

chrislacy · Sep 30, 2013 · 21269cd · 21269cd
2 parents b9f6f68 + 9337a78
commit 21269cd
Show file tree

Hide file tree

Showing 159 changed files with 3,983 additions and 5,845 deletions.
diff --git a/android/client/.idea/dictionaries/Jason.xml b/android/client/.idea/dictionaries/Jason.xml
diff --git a/android/client/AndroidManifest.xml b/android/client/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android"
     android:versionCode="51"
-    android:versionName="1.2.0">
+    android:versionName="1.2.1">
 
     <uses-sdk android:targetSdkVersion="17"
         android:minSdkVersion="14" />
@@ -32,6 +32,24 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="twitter.com" android:pathPattern="/.*/status/.*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="mobile.twitter.com" android:pathPattern="/.*/status/.*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="alpha.app.net" android:pathPattern="/.*/post/.*" />
+            </intent-filter>
         </activity>
 
         <activity

diff --git a/android/client/TweetLanes.iml b/android/client/TweetLanes.iml
@@ -4,6 +4,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="UPDATE_PROPERTY_FILES" value="true" />
+        <notImportedProperties>
+          <property>MANIFEST_FILE_PATH</property>
+          <property>RESOURCES_DIR_PATH</property>
+          <property>ASSETS_DIR_PATH</property>
+          <property>NATIVE_LIBS_DIR_PATH</property>
+        </notImportedProperties>
       </configuration>
     </facet>
   </component>
@@ -13,7 +19,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="module" module-name="TweetLanesCore" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

diff --git a/android/client/project.properties b/android/client/project.properties
@@ -13,3 +13,4 @@ target=android-17
 proguard.config=proguard.cfg
 android.library.reference.1=../libraries/TweetLanesCore
 
+
diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
-    android:versionCode="5"
-    android:versionName="1.2.0_b2">
+    android:versionCode="51"
+    android:versionName="1.2.1_b8">
+
+
 
     <uses-sdk android:targetSdkVersion="17"
         android:minSdkVersion="14" />
@@ -32,6 +34,24 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="twitter.com" android:pathPattern="/.*/status/.*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="mobile.twitter.com" android:pathPattern="/.*/status/.*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="alpha.app.net" android:pathPattern="/.*/post/.*" />
+            </intent-filter>
         </activity>
 
         <activity

diff --git a/android/clientbeta/clientbeta.iml b/android/clientbeta/clientbeta.iml
@@ -4,6 +4,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="UPDATE_PROPERTY_FILES" value="true" />
+        <notImportedProperties>
+          <property>MANIFEST_FILE_PATH</property>
+          <property>RESOURCES_DIR_PATH</property>
+          <property>ASSETS_DIR_PATH</property>
+          <property>NATIVE_LIBS_DIR_PATH</property>
+        </notImportedProperties>
       </configuration>
     </facet>
   </component>
@@ -13,7 +19,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="module" module-name="TweetLanesCore" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

diff --git a/android/clientbeta/project.properties b/android/clientbeta/project.properties
@@ -14,3 +14,4 @@ proguard.config=proguard.cfg
 android.library.reference.1=../libraries/TweetLanesCore
 
 
+
diff --git a/android/libraries/SocialNetLib/SocialNetLib.iml b/android/libraries/SocialNetLib/SocialNetLib.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="libs1" level="project" />
+    <orderEntry type="library" name="libs" level="project" />
+  </component>
+</module>
+
diff --git a/android/libraries/SocialNetLib/TL-SocialNetLib.iml b/android/libraries/SocialNetLib/TL-SocialNetLib.iml
@@ -15,6 +15,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="LIBRARY_PROJECT" value="true" />
+        <notImportedProperties>
+          <property>MANIFEST_FILE_PATH</property>
+          <property>RESOURCES_DIR_PATH</property>
+          <property>ASSETS_DIR_PATH</property>
+          <property>NATIVE_LIBS_DIR_PATH</property>
+        </notImportedProperties>
       </configuration>
     </facet>
   </component>
@@ -25,7 +31,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="library" name="twitter4j-media-support-3.0.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="twitter4j-core-3.0.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="basic-http-client-android-0.88" level="project" />