Merge pull request #496 from Intelehealth/472-image-restore

472 image restore
Intelehealth · Jul 20, 2018 · 6613560 · 6613560
2 parents bbe420f + 2162d3b
commit 6613560
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
     implementation "joda-time:joda-time:$rootProject.jodaTimeVersion"
 
-    implementation "com.google.firebase:firebase-messaging:$rootProject.firebaseVersion"
+    implementation "com.google.firebase:firebase-messaging:17.1.0"
     implementation "com.firebase:firebase-jobdispatcher:$rootProject.jobDispatcherVersion"
 
     implementation "com.github.hotchemi:permissionsdispatcher:$rootProject.permissionDispatcherVersion"
@@ -84,8 +84,8 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation('com.android.support.test:runner:1.0.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/src/main/java/io/intelehealth/client/activities/home_activity/BackupCloud.java b/app/src/main/java/io/intelehealth/client/activities/home_activity/BackupCloud.java
@@ -177,8 +177,8 @@ public void startCloudRestore() {
             try {
                 boolean isSuccess = backup.createFileInMemory(context, false);
                 if (isSuccess) {
-                    Intent serviceIntent = new Intent(context, ImageDownloadService.class);
-                    context.startService(serviceIntent);
+                   // Intent serviceIntent = new Intent(context, ImageDownloadService.class);
+                   //context.startService(serviceIntent); removed on 2018.07.18 due to issues finding the right images
                 }
             } catch (IOException e1) {
                 e1.printStackTrace();
@@ -355,8 +355,8 @@ public void done(byte[] data, ParseException e) {
                                     fileOutputStream.close();
                                     boolean isSuccess = backup.createFileInMemory(context, false);
                                     if (isSuccess) {
-                                        Intent serviceIntent = new Intent(context, ImageDownloadService.class);
-                                        context.getApplicationContext().startService(serviceIntent);
+                                       // Intent serviceIntent = new Intent(context, ImageDownloadService.class);
+                                        //context.getApplicationContext().startService(serviceIntent); //removed on 2018.07.18
                                     }
 
                                 } catch (FileNotFoundException exfnf) {

diff --git a/app/src/main/java/io/intelehealth/client/activities/home_activity/HomeActivity.java b/app/src/main/java/io/intelehealth/client/activities/home_activity/HomeActivity.java
@@ -150,7 +150,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
             parseLoginValidation();
         }*/
 
-        handler = new Handler();
+        /*handler = new Handler();
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -166,7 +166,7 @@ public void run() {
                 }
                 handler.postDelayed(this, 1000 * 60);
             }
-        }, 1000 * 60);
+        }, 1000 * 60);*/
 
         handler = new Handler();
 

diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ ext {
     supportLibraryVersion = '27.1.1'
     jodaTimeVersion = '2.9.3'
     arcaVersion = '4.9.2'
-    firebaseVersion = '15.0.2'
+    firebaseVersion = '16.0.1'
     cameraviewVersion = '9bbe07ba44'
     permissionDispatcherVersion = '2.3.2'
     debugDbVersion = '1.0.0'
@@ -58,6 +58,6 @@ ext {
     glideVersion = '3.8.0'
     parseAndroidVersion = '1.15.7'
     guavaVersion = '22.0-android'
-    constraintLayoutVersion = '1.1.0'
-    crashlyticsVersion = '2.9.2'
+    constraintLayoutVersion = '1.1.2'
+    crashlyticsVersion = '2.9.4'
 }