asfFix email not saved

.gitignore

@@ -14,5 +14,7 @@ res/values/com_crashlytics_export_strings.xml
 *.iml
 .idea
 
+app/gradle.properties
+
 # mac files
 .DS_Store

README.rst

@@ -1,13 +1,86 @@
+
+
 =================
 Zulip for Android
 =================
 
+This is the 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
+<https://play.google.com/apps/testing/com.zulip.android>`_ after which
+the Play store should auto-update you. (Caution: beta releases will
+have more bugs than final releases, including (potentially) security
+or data loss bugs.)
+
 This is a Gradle project, and can be built via the provided ``gradlew``
 or by using Android Studio.
 
+**Index**
+---------------
+
+
+-  `Getting Started`_
+-  `Getting Help`_
+-  `Build instructions (Android Studio)`_)
+-  `Build instructions (without Android Studio)`_)
+-  `Running server on device`_
+-  `Coding Style`_
+-  `Mailing List`_
+-  `Export`_
+-  `License`_
+
+.. _Getting Started: #getting-started
+.. _Getting Help: #getting-help
+.. _Build instructions (Android Studio): #build-instructions-android-studio
+.. _Build instructions (without Android Studio): #build-instructions-without-android-studio
+.. _Running server on device: #browsing-server-on-device
+.. _Coding Style: #coding-style
+.. _Mailing List: #mailing-list
+.. _Export: #export
+.. _License: #license
+
+Getting Started
+---------------
+
+- First, clone this repository and follow the Android Studio build
+  instructions (below) to compile the project.  If you don't have an
+  existing Zulip account to login with, you can create one on the
+  Zulip development community server at https://zulip.tabbott.net/.
+  Note that this server is used for development discussions, so don't
+  use it for sending lots of test messages!
+
+- For testing, it can be helpful to have your own Zulip development
+  server that the app can connect to.  Instructions for setting up a
+  Zulip development server are here:
+  http://zulip.readthedocs.io/en/latest/dev-overview.html
+
+- And then follow the `Connecting to a development server`_ guide to get the
+  Android app to connect to the Zulip development server.
+
+.. _Connecting to a development server: #connecting-to-a-development-server
+
+Getting Help
+---------------
+
+- For real-time help, you can join the Zulip development community's
+  Zulip server at https://zulip.tabbott.net and post on the `android`
+  stream.
+
+- For questions on development for the Zulip Android App you can post here:
+https://groups.google.com/forum/#!forum/zulip-android
+
+- For questions on development for the Zulip Server you can post here:
+https://groups.google.com/forum/#!forum/zulip-devel
+
+Any issues or bugs should be posted in the Github Issue Tracker!
+
+
 Build instructions (Android Studio)
 -----------------------------------
 
+0. Fork the zulip-android repository from GitHub and clone your fork.
+
 1. Open the project in the IDE.
     a) From the "Welcome to Android Studio" menu, select "Open an
        existing Android Studio project" option, or
@@ -16,10 +89,17 @@ Build instructions (Android Studio)
 2. If you want to test Google sign in, add the required metadata:
     1. Go to https://developers.google.com/mobile/add?platform=android
     2. Type in "Zulip" as "App name" and "com.zulip.android" as
-       "Android package name".)
-    3. Put the generated file in the "app/" directory of the project.
-    4. Google app id. You will also get it from the above given link.
-       This id should be written as the following string resource in
+       "Android package name" and continue to Choose and configure services.
+    3. Select the "Google Sign-In" service, you'll need to provide the
+       SHA-1 of your signing certificate. For that, first follow the manual instructions
+       to Sign Your Release Build and generate a new Key Store
+       if you haven't already:
+       https://developer.android.com/studio/publish/app-signing.html#release-mode
+    4. Use keytool to get the SHA-1 fingerprint of the certificate:
+       ``keytool -exportcert -list -v \    -alias <your-key-name> -keystore <path-to-production-keystore>``
+    5. Put the generated file in the "app/" directory of the project.
+    6. Get your Google app id from the Google Developer console, and
+       add it as the following string resource in
        ``app/src/main/res/values/strings.xml``::
             <string name="google_app_id">GOOGLE_APP_ID</string>
 
@@ -91,6 +171,56 @@ Build instructions (without Android Studio)
    default because it is unsigned. You will be told the APK cannot be
    parsed.
 
+Connecting to a development server
+----------------------------------
+
+Once you are running a Zulip development server on your laptop, you
+will need to do some additional configuration of the Android
+development environment to connect to your development server.
+
+| If you are using a Genymotion Emulator you can access the server by
+  browsing to http://10.0.3.2:9991 or http://10.0.3.1:9991 (one of these
+  two URL’s)
+
+To access the vagrant server on a physical device:
+
+* connect the computer and Android device to the same network (router)
+
+* modify ``VagrantFile`` `here`_ in the server change the host\_ip
+  ‘127.0.0.1’ to ‘0.0.0.0’ Like this-
+
+    config.vm.network “forwarded\_port”, guest: 9991, host: host\_port,
+    host\_ip: “0.0.0.0”
+
+* Now find the IP address of the computer, and start the Android app.
+  For the server, specify the computer's IP address and port number as
+  the Zulip Server. For example:
+
+    192.168.0.1:9991
+
+  Note that if you have internet access on your android device through
+  a proxy server, you might have to use a VPN application like `this
+  one`_ to connect to the server.
+
+| You can also route the IP address to a domain name like
+  www.local.test.com (this routing is useful when testing the Google OAuth
+  Backend)
+| No need to modify the ``VagrantFile`` to achieve this
+
+-  Remap the hosts by fiddler by adding this line in TOOLS> HOSTS
+
+    localhost:9991 www.local.test.com
+
+If unclear you can follow tutorial here `Host Remapping`_
+
+-  Now configure your android device following `this`_ detailed tutorial
+
+.. _here: https://github.com/zulip/zulip/blob/1c40df9363b70af0e275c44a03f9627808852616/Vagrantfile#L37
+.. _Host Remapping: http://docs.telerik.com/fiddler/KnowledgeBase/HOSTS
+.. _this one: https://play.google.com/store/apps/details?id=com.psiphon3&hl=en
+.. _this: http://docs.telerik.com/fiddler/Configure-Fiddler/Tasks/ConfigureForAndroid
+
+
 Coding Style
 ------------
 
@@ -141,3 +271,4 @@ 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.
+

app/build.gradle

@@ -1,4 +1,19 @@
+buildscript {
+    repositories {
+        maven { url 'https://maven.fabric.io/public' }
+    }
+
+    dependencies {
+        classpath 'io.fabric.tools:gradle:1.+'
+    }
+}
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
+
+repositories {
+    maven { url 'https://maven.fabric.io/public' }
+}
+
 
 android {
     compileSdkVersion 24
@@ -8,8 +23,8 @@ android {
         minSdkVersion 13
         targetSdkVersion 23
 
-        versionCode 11
-        versionName "0.8.9"
+        versionCode 19
+        versionName "0.9.2"
 
         testApplicationId "com.zulip.android.test"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
@@ -26,15 +41,17 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix '.dev'
-            manifestPlaceholders = [ permissionPackage : "com.humbughq.mobile.dev"]
+            manifestPlaceholders = [ fabricKey : ""]
+            ext.enableCrashlytics = false
             buildConfigField "String", "GOOGLE_CLIENT_ID", "\"659545034376-78hg5hmrvqr50nn53t0nme97ndhqjmvs.apps.googleusercontent.com\""
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            manifestPlaceholders = [ permissionPackage : "com.humbughq.mobile"]
-            buildConfigField "String", "GOOGLE_CLIENT_ID", "TODO: FILL THIS IN"
+            manifestPlaceholders = [ fabricKey : project.property("fabricKey")]
+            buildConfigField "String", "GOOGLE_CLIENT_ID", "\"835904834568-77mtr5mtmpgspj9b051del9i9r5t4g4n.apps.googleusercontent.com\""
         }
+
     }
     compileOptions {
         targetCompatibility JavaVersion.VERSION_1_7
@@ -44,16 +61,24 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    compile 'com.android.support:design:24.0.0'
-    compile 'com.android.support:recyclerview-v7:24.0.0'
+    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.google.android.gms:play-services-gcm:8.4.0'
     compile 'com.google.android.gms:play-services-auth:8.4.0'
-    compile 'com.j256.ormlite:ormlite-core:4.48'
-    compile 'com.j256.ormlite:ormlite-android:4.48'
+    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
+    compile 'com.squareup.okhttp3:okhttp:3.4.1'
+    compile 'com.j256.ormlite:ormlite-core:5.0'
+    compile 'com.j256.ormlite:ormlite-android:5.0'
     compile 'commons-lang:commons-lang:2.6'
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
-    compile files('libs/crashlytics.jar')
+    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
+        transitive = true;
+    }
+
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') {
         exclude group: 'com.android.support'
     }
@@ -66,11 +91,12 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2') {
         exclude group: 'com.android.support'
     }
-    androidTestCompile('com.android.support:support-annotations:24.0.0') {
+    androidTestCompile('com.android.support:support-annotations:24.1.1') {
         exclude group: 'com.android.support'
     }
+
     testCompile 'junit:junit:4.12'
-    compile 'com.squareup.okhttp3:okhttp:3.3.1'
+
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/androidTest/java/com/zulip/android/activities/BaseTest.java

@@ -3,13 +3,14 @@
 
 import android.support.test.espresso.Root;
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.zulip.android.R;
 import com.zulip.android.ToastMatcher;
 import com.zulip.android.ZulipApp;
+import com.zulip.android.util.ZLog;
 
 import org.hamcrest.Matcher;
 import org.junit.Before;
@@ -38,6 +39,7 @@ public class BaseTest {
 
     private static final String PASSWORD_TEST = "yourpasswordhere";
     private static final String EMAIL_TEST = "iago@zulip.com";
+    public static final String SERVER_URL = "www.local.test.com";
 
     @Rule
     public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
@@ -53,7 +55,22 @@ public void setUp() {
     public void WrongLoginPasswordToast() {
         if (ZulipApp.get().getApiKey() != null) {
             logout();
+            try {
+                Thread.sleep(4000);
+            } catch (InterruptedException e) {
+                ZLog.logException(e);
+            }
         }
+
+        //Fill Server URL
+        ViewInteraction serverURLInteraction = onView(allOf(withId(R.id.server_url_in), isDisplayed()));
+        serverURLInteraction.perform(replaceText(SERVER_URL));
+
+        //Click Enter server URL
+        ViewInteraction enterServerUrl = onView(allOf(withId(R.id.server_btn), withText(R.string.enter), isDisplayed()));
+        enterServerUrl.perform(click());
+
+
         //Fill Username
         ViewInteraction usernameVI = onView(
                 allOf(withId(R.id.username), isDisplayed()));
@@ -78,6 +95,23 @@ public static Matcher<Root> isToast() {
 
     @Test
     public void logout() {
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            ZLog.logException(e);
+        }
+        mActivityTestRule.getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mActivityTestRule.getActivity().showView(mActivityTestRule.getActivity().findViewById(R.id.appBarLayout));
+            }
+        });
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            ZLog.logException(e);
+        }
+
         //Open overflow menu
         openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
 
@@ -88,21 +122,28 @@ public void logout() {
         assertNull(ZulipApp.get().getApiKey());
     }
 
+    @Test
     public void login() {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            ZLog.logException(e);
         }
 
+        //Fill Server URL
+        ViewInteraction serverURLInteraction = onView(allOf(withId(R.id.server_url_in), isDisplayed()));
+        serverURLInteraction.perform(replaceText(SERVER_URL));
+
+        //Click Enter server URL
+        ViewInteraction enterServerUrl = onView(allOf(withId(R.id.server_btn), withText(R.string.enter), isDisplayed()));
+        enterServerUrl.perform(click());
+
         //Fill Username
-        ViewInteraction usernameVI = onView(
-                allOf(withId(R.id.username), isDisplayed()));
+        ViewInteraction usernameVI = onView(allOf(withId(R.id.username), isDisplayed()));
         usernameVI.perform(replaceText(EMAIL_TEST));
 
         //Fill Password
-        ViewInteraction passwordVI = onView(
-                allOf(withId(R.id.password), isDisplayed()));
+        ViewInteraction passwordVI = onView(allOf(withId(R.id.password), isDisplayed()));
         passwordVI.perform(replaceText(PASSWORD_TEST));
 
         //Click Login