Merge branch 'dev'

* dev: MainPresenter: fix ClassCastException install ga CampaignTrackingReceiver RxJava: tryOnError for normal error as well update store listing travis: fix incorrect git commit count on travis
shalzz · Apr 13, 2018 · 524cce7 · 524cce7
2 parents f784cd2 + 1ecea35
commit 524cce7
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,13 +26,14 @@ deploy:
   api_key:
     secure: WK/kKL09FEBTCpQg5CDqfZorSybOL+TYMzylqKSgLUilAxByDK6tD0ZHSnNnoZjyX7wC8xhtA9jU/dChUHT4SGPoqDabn1EvfMlGuGym1iIzi76S9yo41llx5Ddjc1uTBsE8PhVWoqC889EeMoVkykOCoYytqJThw61Z9AEq1AWNX2ue/28YLfr0trZWDTZJHOFv61lW6zB0cSOtTCIa7I+//1OLL/pdwvFObj01p879ehctsvdBqPg00iFP6voJBCyu8v8rKEEJWRNT1qU39lb5xC/AR3CWNPXSfiIi7Er7bLJ1OhNXwDSugivaA/iIsBwooRt28reUbrdTkqk15HyU5xB7XsQHEAF6CjscS9wl0urtvNfWbLWV9R9oRAdC+q4OKcGbJ/TUrY5yRmm4V1WmC2V9utCM4iPjG7bSImdq7M7M7/d9YNAOFlLrKjC84PrPFR8bsZM8bO8BWxClyG6w8qpgstG/OcalNuAXsCeYZPSxr9iKlC9aIShH6VNgBQjgrpJ7aRqGD4cNekqfUQJ/7sHuZQJ7pw6rjdAsvkof87BGAjypdhGs5nZ7EysCCD3X7nWVP3TdcE2OfU1MCVSm+nugc40Yccreof2JuR0jgZWVN5evI+rn4wZvgUCVQYs5DJ+VI4qjiXA/tCmT3bKB2LhvfjwpgldxVyv0glc=
   skip_cleanup: true
-  file: "./app/build/outputs/apk/app-release.apk"
+  file: "./app/build/outputs/apk/release/app-release.apk"
   on:
     branch: master
     tags: true
     repo: shalzz/college-academics
 after_deploy: "./gradlew publishRelease --no-daemon --stacktrace"
 before_install:
+- git fetch --unshallow
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_3476a8f5fa31_key
   -iv $encrypted_3476a8f5fa31_iv -in play-service-account-key.json.enc -out play-service-account-key.json
   -d; fi

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -141,5 +141,17 @@
             android:enabled="true"
             android:exported="false"/>
 
+        <!-- Used for Google Play Store Campaign Measurement-->
+        <receiver android:name="com.google.android.gms.analytics.CampaignTrackingReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.vending.INSTALL_REFERRER" />
+            </intent-filter>
+        </receiver>
+        <service android:name="com.google.android.gms.analytics.CampaignTrackingService"
+            android:enabled="true"
+            android:exported="false" />
+
     </application>
 </manifest>
diff --git a/app/src/main/java/com/shalzz/attendance/data/remote/RxJava2ErrorCallAdapterFactory.java b/app/src/main/java/com/shalzz/attendance/data/remote/RxJava2ErrorCallAdapterFactory.java
@@ -97,7 +97,7 @@ public void onNext(Object object) {
 
                                 @Override
                                 public void onError(Throwable e) {
-                                    source.onError(asRetrofitException(e));
+                                    source.tryOnError(asRetrofitException(e));
                                 }
 
                                 @Override

diff --git a/app/src/main/java/com/shalzz/attendance/ui/main/MainPresenter.java b/app/src/main/java/com/shalzz/attendance/ui/main/MainPresenter.java
@@ -112,8 +112,7 @@ public void onNext(User user) {
 
                     @Override
                     public void onError(Throwable e) {
-                        RetrofitException error = (RetrofitException) e;
-                        Timber.e(e, error.getMessage());
+                        Timber.e(e);
                     }
 
                     @Override

diff --git a/app/src/main/play/contactEmail b/app/src/main/play/contactEmail
@@ -1 +1 @@
-[email protected]
+[email protected]
diff --git a/app/src/main/play/en-US/listing/fulldescription b/app/src/main/play/en-US/listing/fulldescription
@@ -1,4 +1,15 @@
-An application that lets you view your current attendance and time table.
+View your current attendance and time table on the go with amazing and useful features. Checking your attendance was never so pleasant.
+
+College academics currently supports the following Colleges/Universities:
+✨ Chaitanya Bharathi Institute of Technology
+✨ Matrusri Engineering College
+✨ Mahatma Gandhi Institute of Technology
+✨ Pearl Academy
+✨ PSG Institute of Management
+✨ St. Francis College for Women
+✨ Siva Sivani Institute of Management
+✨ Vaagdevi Institute of Technology & Science
+✨ Vignana Jyothi Institute of Management
 
 Features:
 • One time login and no Captcha!
@@ -7,8 +18,3 @@ Features:
 • Background syncing of attendance and time table.
 • Search: Jump straight to a subject to see its details.
 
-College academics currently supports the following Colleges and Universities:
-• Chaitanya Bharathi Institute of Technology
-• Mahatma Gandhi Institute of Technology
-• Pearl Academy
-• St. Francis College for Women