diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle index 18df31572e42720b4d7c4f57b49f38938e4e51cb..748d53450c80889be67500bd45833dade9be8b96 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 9a79361ef31ab0fcb9255b6618acf03844afa293..43ebee60f9c87c701ab2d76ae9ce16aca271415b 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 67b8aa3b8195eb48a0ea6b0c17d61ef8d52b1b2a..945d088942148af1e4780c128b8aa0015e97c0bd 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 6d1fc6f979ef7df172e015aa67a1a34c54cee388..3992db0a61d648d885bfa00d3921f954fc5db283 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 92480c38fee78ef442c91985e8b27c0777493418..e8f5f4d09a1f6374e26fb5f162e05ae516869813 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