diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java index aa62c74a4..9dcf639c2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java @@ -25,7 +25,6 @@ import android.media.MediaPlayer; import android.media.RingtoneManager; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.RemoteInput; import android.support.v4.content.LocalBroadcastManager; import android.view.View; import android.widget.Button; @@ -36,8 +35,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.model.DeviceService; -import nodomain.freeyourgadget.gadgetbridge.util.GB; public class FindPhoneActivity extends AbstractGBActivity { @@ -100,9 +97,13 @@ public class FindPhoneActivity extends AbstractGBActivity { mp.prepare(); mp.start(); } catch (IOException ignore) { + LOG.warn("problem playing ringtone"); } - mAudioManager.setStreamVolume(AudioManager.STREAM_ALARM, mAudioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM), AudioManager.FLAG_PLAY_SOUND); + if (mAudioManager != null) { + userVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_ALARM); + mAudioManager.setStreamVolume(AudioManager.STREAM_ALARM, mAudioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM), AudioManager.FLAG_PLAY_SOUND); + } } public void stopSound() { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java index fffa5fbf8..b22f8b740 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java @@ -74,7 +74,7 @@ public class WeekSleepChartFragment extends AbstractWeekChartFragment { @Override protected String getBalanceMessage(long balance, int targetValue) { if (balance > 0) { - final long totalBalance = balance - (targetValue * TOTAL_DAYS); + final long totalBalance = balance - ((long)targetValue * TOTAL_DAYS); if (totalBalance > 0) return getString(R.string.overslept, getHM(totalBalance)); else diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java index e70490a0a..3968d1145 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java @@ -105,7 +105,7 @@ public class WeekStepsChartFragment extends AbstractWeekChartFragment { @Override protected String getBalanceMessage(long balance, int targetValue) { if (balance > 0) { - final long totalBalance = balance - (targetValue * TOTAL_DAYS); + final long totalBalance = balance - ((long)targetValue * TOTAL_DAYS); if (totalBalance > 0) return getString(R.string.overstep, Math.abs(totalBalance)); else diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java index ad2004d1a..aa7ab1bb0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java @@ -239,7 +239,7 @@ public class NotificationListener extends NotificationListenerService { } // Ignore too frequent notifications, according to user preference - long min_timeout = prefs.getInt("notifications_timeout", 0) * 1000; + long min_timeout = (long)prefs.getInt("notifications_timeout", 0) * 1000L; long cur_time = System.currentTimeMillis(); if (notificationBurstPrevention.containsKey(source)) { long last_time = notificationBurstPrevention.get(source);