Merge branch 'master' into arrowBranch

Author: abhaymaniyar

.travis.yml

@@ -11,10 +11,10 @@ android:
     - platform-tools
 
     # The BuildTools version used by your project
-    - build-tools-23.0.2
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
-    - android-24
+    - android-25
 
     # Additional components
     - extra-google-google_play_services
@@ -40,3 +40,9 @@ android:
 script:
   - ./gradlew lintDebug
   - ./gradlew assembleDebug
+notifications:
+  webhooks:
+    urls:
+      - https://zulip.org/zulipbot/travis
+    on_success: always
+    on_failure: always

README.rst

@@ -4,7 +4,20 @@
 Zulip for Android
 =================
 
-This is the Android client for `Zulip <http://www.zulip.org>`_.  It is
+**Note**: We've decided that our `React Native app`_ is far enough
+along that it makes sense to focus our efforts on making the React
+Native app better on Android and iOS rather than continuing to split
+our effort developing two similar apps in parallel. Hence, for GSoC we
+will be focused on making the React Native app awesome. The plan is in
+this `document`_, which also covers important FAQ for anyone
+interested in doing GSoC on Zulip mobile apps.
+
+.. _React Native app: https://github.com/zulip/zulip-mobile
+.. _document: https://github.com/zulip/zulip-android/blob/master/android-strategy.md
+
+---------------
+
+This is the native Android client for `Zulip <http://www.zulip.org>`_.  It is
 available `in the Google Play store
 <https://play.google.com/store/apps/details?id=com.zulip.android>`_.
 If you have a taste for adventure, you can also `join our beta channel
@@ -225,7 +238,7 @@ Another way to connect android device to local server is via adb
 
 -  Run ``adb reverse tcp:9991 tcp:9991`` in terminal
 
--  Connect to local server by entering url (**http://127.0.0.0.1:9991**) in app
+-  Connect to local server by entering url (**http://127.0.0.1:9991**) in app
 
 .. _here: https://github.com/zulip/zulip/blob/1c40df9363b70af0e275c44a03f9627808852616/Vagrantfile#L37
 .. _Host Remapping: http://docs.telerik.com/fiddler/KnowledgeBase/HOSTS
@@ -241,8 +254,8 @@ Contributing
 * For commit messages, be sure to checkout our `commit message style guidelines`_.
 
 * For code style, please read the `Zulip coding style`_ conventions carefully.
- 
-.. |@zulipbot| replace:: **@zulipbot** 
+
+.. |@zulipbot| replace:: **@zulipbot**
 .. _@zulipbot: https://github.com/zulip/zulipbot
 .. _commit message style guidelines: https://zulip.readthedocs.io/en/latest/version-control.html#commit-messages
 .. _Zulip coding style: https://zulip.readthedocs.org/en/latest/code-style.html#version-control
@@ -290,4 +303,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-

android-strategy.md

@@ -0,0 +1,91 @@
+# Zulip Android plan
+
+We are merging the Zulip Android and iOS development communities, to
+focus on the React Native app codebase (zulip-mobile.git).  We’ve
+found with the iOS React Native project that we’ve been able to build
+an app that performs well using the platform, and the benefits of
+being able to share a codebase (so that we only have to implement each
+feature and design each detail once) are huge, and outweigh the
+advantages of continuing to invest in the existing, more mature Java
+Android app.
+
+So, in preparation for Google Summer of Code applications opening on
+March 20th, we’re planning to merge the communities now so that we can
+direct students interested in Android to propose projects for the
+React Native app.  Our goal is to have the best possible Zulip Android
+app by the end of the summer, and we think the best way to achieve
+that is to combine the efforts of both the Zulip iOS/React Native
+developers and the Zulip Java/Android development team on a single app
+codebase.  This will also as a side effect benefit both the iOS app
+and potential future apps for other React-Native supported platforms
+like Windows Phone.
+
+Here’s how this will work practically:
+
+- The Java Android app will remain in the app store until the React
+  Native app is good enough to completely replace it.  This probably
+  means 3-6 months, depending how quickly RN development goes.  We’ll
+  continue doing releases both to fix bugs and to roll out features
+  that are already partially implemented, but want to avoid putting a
+  lot of work into totally new features for the Java app.
+- Folks who have open PRs on the Java Android app should work on
+  finishing them so that we can close out those features.  It’s still
+  super valuable.
+- The goal is to get the React Native app to be better than the Java
+  Android app as fast as possible (probably by end of August at the
+  latest), so that we can minimize total work.
+- This Android strategy means it doesn’t make sense for us to have
+  GSoC projects working on the Java Android app; those students would
+  be able to help Zulip more working on the React Native app.  So
+  students who were planning to do GSoC with the Java Android project
+  should write their proposals for improvements to the React Native
+  app instead.  A few important details are worth highlighting:
+- Zulip’s GSoC selection process is focused more on general
+  engineering skills and approach than specific language knowledge, so
+  good work done on the Java Android app is just as valuable for your
+  application as work done on the React Native app.
+- Good engineers can learn new tools and languages, so if you’re shown
+  your skills well on the Java project, we’re confident you’ll be able
+  to effectively contribute to the React Native project after a bit of
+  learning time.  Students are encouraged to start learning React
+  Native and contributing to the React Native app now to help prepare
+  for a successful summer.
+- Proposals should highlight any work done on either app as well as
+  describe a plan for the improvements they want to make to the React
+  Native app over the summer.
+
+
+Logistical details checklist for migration:
+
+* [x] Make sure all existing Java contributors understand the plan and
+  can give feedback on it and this plan.
+* [x] Announce on chat.zulip.org
+* [ ] Update GSoC ideas page to clarify the plan
+* [ ] Update zulip/zulip-mobile README.md
+* [x] Update zulip/zulip-android README.md
+* [ ] Update zulip/zulip README.md
+* [ ] Email zulip-devel@ and zulip-ios@ and zulip-android@ with the
+  announcement
+* [ ] Announce on Twitter @zuliposs, linking to email
+* [ ] Use @zulipbot to update open PRs and issues for Android app with
+  a heads-up about the plan
+
+Logistical details that can be follow-up items but are important to
+making the transition successful:
+
+* [ ] Get the Zulip RN app working on Android (main issue is
+implementing the scrolling extension)
+
+* [ ] Attempt to clear out Java Android open PRs and open bugs to buy
+  us 3-6 months of time without major development to the Java Android
+  app, since it may take a while for the React Native app to achieve
+  feature/quality parity.
+
+* [ ] Audit features of Java Android app and open issues for them in
+  the RN app project.
+* [ ] Audit open issues for feature ideas in the Java Android app and
+  open corresponding ones in the RN app project.
+* [ ] Add a bunch of links to JS, React, and RN tutorials to the RN app docs
+* [ ] Create good onboarding docs for RN for developers who only have Linux (and no Mac).
+* [ ] Move/rename/merge, as appropriate, the Zulip mobile mailing lists
+

app/build.gradle

@@ -16,14 +16,14 @@ repositories {
 
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 25
     //noinspection GradleDependency
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.zulip.android"
         minSdkVersion 13
         //noinspection OldTargetApi
-        targetSdkVersion 23
+        targetSdkVersion 25
 
         versionCode 27
         versionName "1.2.1"
@@ -67,9 +67,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:design:24.1.1'
-    compile 'com.android.support:recyclerview-v7:24.1.1'
+    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:design:25.1.1'
+    compile 'com.android.support:recyclerview-v7:25.1.1'
     compile 'com.google.android.gms:play-services-gcm:8.4.0'
     compile 'com.google.android.gms:play-services-auth:8.4.0'
     compile 'com.squareup.retrofit2:retrofit:2.2.0'
@@ -82,11 +82,11 @@ dependencies {
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     compile 'com.squareup.picasso:picasso:2.5.2'
     //noinspection GradleCompatible
-    compile 'com.android.support:customtabs:23.3.0'
+    compile 'com.android.support:customtabs:25.1.1'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.android.support:support-v4:24.1.0'
+    compile 'com.android.support:support-v4:25.1.1'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.+'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
         transitive = true;
     }
 
@@ -102,7 +102,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2') {
         exclude group: 'com.android.support'
     }
-    androidTestCompile('com.android.support:support-annotations:24.1.1') {
+    androidTestCompile('com.android.support:support-annotations:25.1.1') {
         exclude group: 'com.android.support'
     }
 

app/lint.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <issue id="GradleDependency" severity="ignore"/>
-    <issue id="GradleDynamicVersion" severity="ignore"/>
-    <issue id="GradleOverrides" severity="ignore"/>
-    <issue id="OldTargetApi" severity="ignore"/>
+    <issue id="GradleDependency" severity="ignore" />
+    <issue id="GradleDynamicVersion" severity="ignore" />
+    <issue id="GradleOverrides" severity="ignore" />
+    <issue id="OldTargetApi" severity="ignore" />
     <!-- Change the severity of hardcoded strings to "error"
     when #260 is merged-->
     <issue id="HardcodedText" severity="ignore" />
-    <issue id="IconDensities" severity="ignore"/>
-    <issue id="InvalidPackage" severity="ignore"/>
+    <issue id="IconDensities" severity="ignore" />
+    <issue id="InvalidPackage" severity="ignore" />
     <issue id="UnusedResources" severity="error">
-        <ignore path="**/ic_person_24dp.png"/>
-        <ignore path="**/ic_search_24dp.png"/>
+        <ignore path="**/ic_person_24dp.png" />
+        <ignore path="**/ic_search_24dp.png" />
     </issue>
-    <issue id="UnusedNamespace" severity="error"/>
-    <issue id="UnusedAttribute" severity="error"/>
-    <issue id="Deprecated" severity="error"/>
-    <issue id="Typos" severity="error"/>
-    <issue id="SdCardPath" severity="error"/>
-    <issue id="NewerVersionAvailable" severity="error"/>
+    <issue id="UnusedNamespace" severity="error" />
+    <issue id="UnusedAttribute" severity="error" />
+    <issue id="Deprecated" severity="error" />
+    <issue id="Typos" severity="error" />
+    <issue id="SdCardPath" severity="error" />
+    <issue id="NewerVersionAvailable" severity="error" />
 </lint>

app/src/main/AndroidManifest.xml

@@ -22,16 +22,18 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="13"
-        tools:overrideLibrary="com.android.support:customtabs:23.3.0,android.support.customtabs"/>
+    <uses-sdk
+        android:minSdkVersion="13"
+        android:targetSdkVersion="23"
+        tools:overrideLibrary="com.android.support:customtabs:23.3.0,android.support.customtabs" />
 
     <application
         android:name=".ZulipApp"
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme.DayNight.NoActionBar"
         android:supportsRtl="false"
+        android:theme="@style/AppTheme.DayNight.NoActionBar"
         tools:ignore="GoogleAppIndexingWarning">
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -50,27 +52,22 @@
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="image/*" />
+                <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
         <activity
             android:name=".activities.LoginActivity"
-            android:label="@string/app_name"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
-        </activity>
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"></activity>
         <activity
             android:name=".activities.PhotoViewActivity"
             android:parentActivityName=".activities.ZulipActivity"
-            tools:ignore="UnusedAttribute">
-        </activity>
+            tools:ignore="UnusedAttribute"></activity>
         <activity
             android:name=".activities.LegalActivity"
             android:label="@string/title_activity_legal" />

app/src/main/assets/legal.html

@@ -8,6 +8,7 @@
             white-space: pre-wrap;
             word-wrap: break-word;
         }
+
     </style>
 </head>
 <body>

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -30,6 +30,7 @@
 import com.zulip.android.models.Emoji;
 import com.zulip.android.models.Message;
 import com.zulip.android.models.MessageType;
+import com.zulip.android.models.PeopleDrawerList;
 import com.zulip.android.models.Person;
 import com.zulip.android.models.Presence;
 import com.zulip.android.models.Stream;
@@ -89,6 +90,11 @@ public class ZulipApp extends Application {
      * every couple of seconds
      */
     public final Queue<Integer> unreadMessageQueue = new ConcurrentLinkedQueue<>();
+    /**
+     * Map of recent PM person with their email
+     * Updated when new private message is arrived
+     */
+    public final Map<String, PeopleDrawerList> recentPMPersons = new ConcurrentHashMap<>();
     // This object's intrinsic lock is used to prevent multiple threads from
     // making conflicting updates to ranges
     public Object updateRangeLock = new Object();
@@ -99,6 +105,7 @@ public class ZulipApp extends Application {
     private int max_message_id;
     private DatabaseHelper databaseHelper;
     private ZulipServices zulipServices;
+    private ZulipServices uploadServices;
     private ReferenceObjectCache objectCache;
     private ZulipActivity zulipActivity;
     /**
@@ -210,6 +217,22 @@ public void setZulipServices(ZulipServices zulipServices) {
         this.zulipServices = zulipServices;
     }
 
+    public ZulipServices getUploadServices() {
+        if (uploadServices == null) {
+            HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.HEADERS);
+            uploadServices = new Retrofit.Builder()
+                    .client(new OkHttpClient.Builder().readTimeout(60, TimeUnit.SECONDS)
+                            .addInterceptor(new ZulipInterceptor())
+                            .addInterceptor(logging)
+                            .build())
+                    .addConverterFactory(GsonConverterFactory.create(getGson()))
+                    .baseUrl(getServerURI())
+                    .build()
+                    .create(ZulipServices.class);
+        }
+        return uploadServices;
+    }
+
     public Gson getGson() {
         if (gson == null) {
             gson = buildGson();
@@ -328,6 +351,8 @@ private void setupEmoji() {
                     new Callable<Void>() {
                         public Void call() throws Exception {
                             for (String newEmoji : emojis) {
+                                //currently emojis are in png format
+                                newEmoji = newEmoji.replace(".png", "");
                                 dao.create(new Emoji(newEmoji));
                             }
                             return null;
@@ -408,7 +433,7 @@ public void logOut() {
         ed.apply();
         this.api_key = null;
         setEventQueueId(null);
-
+        recentPMPersons.clear();
         new GoogleAuthHelper().logOutGoogleAuth();
     }