From 4f7ebb9ec29d449468127806adb379f87d2d8cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 11 Aug 2019 19:14:16 -0400
Subject: [PATCH] build: update version to 185

Change-Id: I3e3dee545982f464a69e0fe838f0904b301fdd11
---
 ring-android/app/build.gradle                                 | 4 ++--
 .../java/cx/ring/about/AboutBottomSheetDialogFragment.java    | 2 +-
 .../app/src/main/java/cx/ring/client/HomeActivity.java        | 4 ++--
 .../app/src/main/java/cx/ring/service/RingJobService.java     | 1 -
 .../app/src/main/java/cx/ring/tv/main/HomeActivity.java       | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 18df31572..748d53450 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 184
-        versionName "20190810-01"
+        versionCode 185
+        versionName "20190811-01"
     }
 
     sourceSets {
diff --git a/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java b/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java
index 9a79361ef..43ebee60f 100644
--- a/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java
@@ -52,7 +52,7 @@ public class AboutBottomSheetDialogFragment extends BottomSheetDialogFragment {
         CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) ((View) contentView.getParent()).getLayoutParams();
         CoordinatorLayout.Behavior behavior = params.getBehavior();
 
-        if (behavior != null && behavior instanceof BottomSheetBehavior) {
+        if (behavior instanceof BottomSheetBehavior) {
             ((BottomSheetBehavior) behavior).setBottomSheetCallback(mCallback);
         }
     }
diff --git a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
index 67b8aa3b8..945d08894 100644
--- a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
@@ -312,9 +312,9 @@ public class HomeActivity extends AppCompatActivity implements RingNavigationFra
     @Override
     protected void onStart() {
         File path = AndroidFileUtils.ringtonesPath(this);
-        if (!(new File(path, "default.opus")).exists()) {
+        //if (!(new File(path, "default.opus")).exists()) {
             AndroidFileUtils.copyAssetFolder(getAssets(), "ringtones", path);
-        }
+        //}
         super.onStart();
     }
 
diff --git a/ring-android/app/src/main/java/cx/ring/service/RingJobService.java b/ring-android/app/src/main/java/cx/ring/service/RingJobService.java
index 6d1fc6f97..3992db0a6 100644
--- a/ring-android/app/src/main/java/cx/ring/service/RingJobService.java
+++ b/ring-android/app/src/main/java/cx/ring/service/RingJobService.java
@@ -47,7 +47,6 @@ public class RingJobService extends JobService
         try {
             RingApplication.getInstance().startDaemon();
             new Thread(() -> {
-                RingApplication.getInstance().getHardwareService().connectivityChanged();
                 synchronized (this) {
                     try {
                         wait(JOB_DURATION);
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/HomeActivity.java b/ring-android/app/src/main/java/cx/ring/tv/main/HomeActivity.java
index 92480c38f..e8f5f4d09 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/HomeActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/HomeActivity.java
@@ -62,9 +62,9 @@ public class HomeActivity extends FragmentActivity {
     @Override
     protected void onStart() {
         File path = AndroidFileUtils.ringtonesPath(this);
-        if (!(new File(path, "default.opus")).exists()) {
+        //if (!(new File(path, "default.opus")).exists()) {
             AndroidFileUtils.copyAssetFolder(getAssets(), "ringtones", path);
-        }
+        //}
         super.onStart();
     }
 }
\ No newline at end of file
-- 
GitLab