Travis espresso patch

.travis.yml

@@ -0,0 +1,21 @@
+language: android
+jdk: oraclejdk8
+android:
+  components:
+    - tools # to get the new `repository-11.xml`
+    - tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
+    - platform-tools
+    - build-tools-25.0.2
+    - android-25
+    - extra-android-m2repository
+    - extra-google-m2repository
+before_script: 
+  - cd outlay
+  - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+script:
+- ./gradlew assembleDebug
+- ./gradlew connectedAndroidTest
+

outlay/app/google-services.json

@@ -0,0 +1,55 @@
+{
+  "project_info": {
+    "project_number": "493988397268",
+    "firebase_url": "https://outlay-c8db8.firebaseio.com",
+    "project_id": "outlay-c8db8",
+    "storage_bucket": "outlay-c8db8.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:493988397268:android:95649c21a8bc6266",
+        "android_client_info": {
+          "package_name": "app.outlay"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "493988397268-1thsbh8c2rtbbc38hd9opj2d4ggpff7s.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "app.outlay",
+            "certificate_hash": "90e14b32ea082f18eccd422a24e9b40b7cb18a03"
+          }
+        },
+        {
+          "client_id": "493988397268-d8h6qppkcq2r87coobac4pl7rigsd5j3.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDjc1HdmPnYw74rY4tQyZLzQTvXPwsdXRM"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "493988397268-d8h6qppkcq2r87coobac4pl7rigsd5j3.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

outlay/app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:theme="@style/Theme.Material.Custom">
         <activity
             android:name="app.outlay.view.activity.MainActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="app.outlay.view.activity.SingleFragmentActivity"

outlay/app/src/main/java/app/outlay/di/module/AppModule.java

@@ -83,8 +83,7 @@ List<Category> defaultCategories() {
     @Provides
     @Singleton
     Gson providerGson() {
-        Gson gson = new GsonBuilder().create();
-        return gson;
+        return new GsonBuilder().create();
     }
 
     private static Category category(String title, String icon, int color, int order) {

outlay/app/src/main/java/app/outlay/executor/JobExecutor.java

@@ -1,6 +1,8 @@
 package app.outlay.executor;
 
 
+import android.support.annotation.NonNull;
+
 import app.outlay.core.executor.ThreadExecutor;
 
 import java.util.concurrent.BlockingQueue;
@@ -39,7 +41,7 @@ public JobExecutor() {
     }
 
     @Override
-    public void execute(Runnable runnable) {
+    public void execute(@NonNull Runnable runnable) {
         if (runnable == null) {
             throw new IllegalArgumentException("Runnable to execute cannot be null");
         }
@@ -51,7 +53,7 @@ private static class JobThreadFactory implements ThreadFactory {
         private int counter = 0;
 
         @Override
-        public Thread newThread(Runnable runnable) {
+        public Thread newThread(@NonNull Runnable runnable) {
             return new Thread(runnable, THREAD_NAME + counter++);
         }
     }

outlay/app/src/main/java/app/outlay/firebase/ExpenseFirebaseSource.java

@@ -133,7 +133,7 @@ public void onCancelled(DatabaseError databaseError) {
                     }
                     return categoryMap;
                 }).switchMap(categoryMap ->
-                        listObservable.flatMap(expenses -> Observable.from(expenses))
+                        listObservable.flatMap(Observable::from)
                                 .map(expense -> {
                                     String currentCatId = expense.getCategory().getId();
                                     return expense.setCategory(categoryMap.get(currentCatId));

outlay/app/src/main/java/app/outlay/firebase/FirebaseAuthRxWrapper.java

@@ -41,67 +41,44 @@ public Observable<String> getUserToken(FirebaseUser firebaseUser) {
         });
     }
 
+    private void addListener(Task<AuthResult> task, rx.Subscriber<? super AuthResult> subscriber) {
+        task.addOnCompleteListener(resultTask -> {
+            if (task.isSuccessful()) {
+                AuthResult authResult = task.getResult();
+                subscriber.onNext(authResult);
+                subscriber.onCompleted();
+            } else {
+                Exception e = task.getException();
+                subscriber.onError(e);
+            }
+        });
+    }
+
     public Observable<AuthResult> signUp(String email, String password) {
         return Observable.create(subscriber -> {
             Task<AuthResult> task = firebaseAuth.createUserWithEmailAndPassword(email, password);
-            task.addOnCompleteListener(resultTask -> {
-                if (task.isSuccessful()) {
-                    AuthResult authResult = task.getResult();
-                    subscriber.onNext(authResult);
-                    subscriber.onCompleted();
-                } else {
-                    Exception e = task.getException();
-                    subscriber.onError(e);
-                }
-            });
+            addListener(task, subscriber);
         });
     }
 
     public Observable<AuthResult> signIn(String email, String password) {
         return Observable.create(subscriber -> {
             Task<AuthResult> task = firebaseAuth.signInWithEmailAndPassword(email, password);
-            task.addOnCompleteListener(resultTask -> {
-                if (task.isSuccessful()) {
-                    AuthResult authResult = task.getResult();
-                    subscriber.onNext(authResult);
-                    subscriber.onCompleted();
-                } else {
-                    Exception e = task.getException();
-                    subscriber.onError(e);
-                }
-            });
+            addListener(task, subscriber);
         });
     }
 
     public Observable<AuthResult> signInAnonymously() {
         return Observable.create(subscriber -> {
             Task<AuthResult> task = firebaseAuth.signInAnonymously();
-            task.addOnCompleteListener(resultTask -> {
-                if (task.isSuccessful()) {
-                    AuthResult authResult = task.getResult();
-                    subscriber.onNext(authResult);
-                    subscriber.onCompleted();
-                } else {
-                    Exception e = task.getException();
-                    subscriber.onError(e);
-                }
-            });
+            addListener(task, subscriber);
         });
     }
 
     public Observable<AuthResult> linkAccount(AuthCredential credentials) {
         return Observable.create(subscriber -> {
             Task<AuthResult> task = firebaseAuth.getCurrentUser().linkWithCredential(credentials);
-            task.addOnCompleteListener(resultTask -> {
-                if (task.isSuccessful()) {
-                    AuthResult authResult = task.getResult();
-                    subscriber.onNext(authResult);
-                    subscriber.onCompleted();
-                } else {
-                    Exception e = task.getException();
-                    subscriber.onError(e);
-                }
-            });
+            addListener(task, subscriber);
         });
     }
 

outlay/app/src/main/java/app/outlay/firebase/FirebaseAuthService.java

@@ -1,6 +1,7 @@
 package app.outlay.firebase;
 
 import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import app.outlay.domain.model.Credentials;
 import app.outlay.domain.model.User;
@@ -26,30 +27,30 @@ public FirebaseAuthService(FirebaseAuthRxWrapper firebaseWrapper) {
     @Override
     public Observable<User> signIn(Credentials credentials) {
         return firebaseWrapper.signIn(credentials.getEmail(), credentials.getPassword())
-                .map(authResult -> authResult.getUser())
-                .map(firebaseUser -> UserAdapter.fromFirebaseUser(firebaseUser));
+                .map(AuthResult::getUser)
+                .map(UserAdapter::fromFirebaseUser);
     }
 
     @Override
     public Observable<User> signUp(Credentials credentials) {
         return firebaseWrapper.signUp(credentials.getEmail(), credentials.getPassword())
-                .map(authResult -> authResult.getUser())
-                .map(firebaseUser -> UserAdapter.fromFirebaseUser(firebaseUser));
+                .map(AuthResult::getUser)
+                .map(UserAdapter::fromFirebaseUser);
     }
 
     @Override
     public Observable<User> linkCredentials(Credentials credentials) {
         AuthCredential emailCredentials = EmailAuthProvider.getCredential(credentials.getEmail(), credentials.getPassword());
         return firebaseWrapper.linkAccount(emailCredentials)
-                .map(authResult -> authResult.getUser())
-                .map(firebaseUser -> UserAdapter.fromFirebaseUser(firebaseUser));
+                .map(AuthResult::getUser)
+                .map(UserAdapter::fromFirebaseUser);
     }
 
     @Override
     public Observable<User> signInAnonymously() {
         return firebaseWrapper.signInAnonymously()
-                .map(authResult -> authResult.getUser())
-                .map(firebaseUser -> UserAdapter.fromFirebaseUser(firebaseUser));
+                .map(AuthResult::getUser)
+                .map(UserAdapter::fromFirebaseUser);
     }
 
     @Override

outlay/app/src/main/java/app/outlay/mvp/presenter/AnalysisPresenter.java

@@ -35,7 +35,9 @@ public void getCategories() {
             @Override
             public void onNext(List<Category> categories) {
                 super.onNext(categories);
-                getView().setCategories(categories);
+                if (getView()!=null){
+                    getView().setCategories(categories);
+                }
             }
         });
     }
@@ -47,7 +49,7 @@ public void getExpenses(Date startDate, Date endDate, Category category) {
                     @Override
                     public void onNext(Report report) {
                         super.onNext(report);
-                        if (isViewAttached()) {
+                        if (isViewAttached() && getView()!=null) {
                             getView().showAnalysis(report);
                         }
                     }

outlay/app/src/main/java/app/outlay/mvp/presenter/CategoriesPresenter.java

@@ -31,7 +31,9 @@ public void getCategories() {
         getCategoriesUseCase.execute(new DefaultSubscriber<List<Category>>() {
             @Override
             public void onNext(List<Category> categories) {
-                getView().showCategories(categories);
+                if (getView()!=null){
+                    getView().showCategories(categories);
+                }
             }
         });
     }

outlay/app/src/main/java/app/outlay/mvp/presenter/CategoryDetailsPresenter.java

@@ -33,7 +33,9 @@ public void getCategory(String id) {
         getCategoryUseCase.execute(id, new DefaultSubscriber<Category>() {
             @Override
             public void onNext(Category category) {
-                getView().showCategory(category);
+                if (getView()!=null){
+                    getView().showCategory(category);
+                }
             }
         });
     }
@@ -42,7 +44,9 @@ public void updateCategory(Category category) {
         updateCategoryUseCase.execute(category, new DefaultSubscriber<Category>() {
             @Override
             public void onCompleted() {
-                getView().finish();
+                if (getView()!=null){
+                    getView().finish();
+                }
             }
         });
 
@@ -52,7 +56,9 @@ public void deleteCategory(Category category) {
         deleteCategoryUseCase.execute(category, new DefaultSubscriber<Category>() {
             @Override
             public void onCompleted() {
-                getView().finish();
+                if (getView()!=null){
+                    getView().finish();
+                }
             }
         });
     }

outlay/app/src/main/java/app/outlay/mvp/presenter/EnterExpensePresenter.java

@@ -42,7 +42,9 @@ public void getCategories() {
         getCategoriesUseCase.execute(new DefaultSubscriber<List<Category>>() {
             @Override
             public void onNext(List<Category> categories) {
-                getView().showCategories(categories);
+                if (getView()!=null){
+                    getView().showCategories(categories);
+                }
             }
         });
     }
@@ -52,7 +54,9 @@ public void createExpense(Expense expense) {
         createExpenseUseCase.execute(expense, new DefaultSubscriber<Expense>() {
             @Override
             public void onNext(Expense expense) {
-                getView().alertExpenseSuccess(expense);
+                if (getView()!=null){
+                    getView().alertExpenseSuccess(expense);
+                }
 
             }
         });

outlay/app/src/main/java/app/outlay/mvp/presenter/ExpenseDetailsPresenter.java

@@ -41,7 +41,9 @@ public void findExpense(String expenseId, Date date) {
         getExpenseUseCase.execute(new GetExpenseUseCase.Input(expenseId, date), new DefaultSubscriber<Expense>() {
             @Override
             public void onNext(Expense expense) {
-                getView().showExpense(expense);
+                if (getView()!=null){
+                    getView().showExpense(expense);
+                }
             }
         });
 
@@ -52,7 +54,9 @@ public void getCategories() {
             @Override
             public void onNext(List<Category> categories) {
                 super.onNext(categories);
-                getView().showCategories(categories);
+                if (getView()!=null){
+                    getView().showCategories(categories);
+                }
             }
         });
     }

outlay/app/src/main/java/app/outlay/mvp/presenter/ExpensesListPresenter.java

@@ -28,7 +28,9 @@ public void findExpenses(Date dateFrom, Date dateTo, String categoryId) {
         loadReportUseCase.execute(input, new DefaultSubscriber<Report>() {
             @Override
             public void onNext(Report report) {
-                getView().showReport(report);
+                if (getView()!=null){
+                    getView().showReport(report);
+                }
             }
         });
     }