From 8f46767128c64bc05696d05bcc1e60d4fe046867 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Wed, 11 Apr 2018 19:04:38 +0530 Subject: [PATCH 1/5] travis: fix incorrect git commit count on travis This caused different version numbers failing the play publish task --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59d80d52..8e8284d1 100644 --- 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 From ec9b6d1296e0e8c3d7ba1f86bbb1c5ebfbb71119 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Thu, 12 Apr 2018 16:09:00 +0530 Subject: [PATCH 2/5] update store listing --- app/src/main/play/contactEmail | 2 +- .../main/play/en-US/listing/fulldescription | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/play/contactEmail b/app/src/main/play/contactEmail index 932d0633..e3c728a9 100644 --- a/app/src/main/play/contactEmail +++ b/app/src/main/play/contactEmail @@ -1 +1 @@ -shaleen.jain95+collegeacademics@gmail.com +support@8bitlabs.in diff --git a/app/src/main/play/en-US/listing/fulldescription b/app/src/main/play/en-US/listing/fulldescription index 398d39b2..62c7d382 100644 --- 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 \ No newline at end of file From bb6136d1da80a6c3b50cf47702c051dffc601585 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Thu, 12 Apr 2018 20:47:27 +0530 Subject: [PATCH 3/5] RxJava: tryOnError for normal error as well --- .../attendance/data/remote/RxJava2ErrorCallAdapterFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index fb184d4b..e796d82c 100644 --- 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 From 177c1150a25abca12c92226655004c8670af0231 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Fri, 13 Apr 2018 09:13:56 +0530 Subject: [PATCH 4/5] install ga CampaignTrackingReceiver --- app/src/main/AndroidManifest.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a18aa400..ca6b0d08 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -141,5 +141,17 @@ android:enabled="true" android:exported="false"/> + + + + + + + + From 1ecea351e64e93d2b3a3b798598348ef222cea33 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Fri, 13 Apr 2018 09:26:31 +0530 Subject: [PATCH 5/5] MainPresenter: fix ClassCastException --- .../main/java/com/shalzz/attendance/ui/main/MainPresenter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 317c2b39..d0cbc721 100644 --- 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