gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unused code

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-11-14 15:40:57 +01:00 committed by Tim Krüger
parent e121d32984
commit d33857e603
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
3 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
View File

@ -243,7 +243,6 @@ class CallNotificationActivity : CallBaseActivity() {
var isNotificationOpen = true var isNotificationOpen = true
while (isNotificationOpen) { while (isNotificationOpen) {
Thread.sleep(1000) Thread.sleep(1000)
Log.d(TAG, ".")
if (!NotificationUtils.isNotificationVisible(context, notificationTimestamp!!.toInt())) { if (!NotificationUtils.isNotificationVisible(context, notificationTimestamp!!.toInt())) {
isNotificationOpen = false isNotificationOpen = false
finish() finish()

25
app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt
View File

@ -25,7 +25,6 @@ import android.app.NotificationManager
import android.content.Context import android.content.Context
import android.media.AudioManager import android.media.AudioManager
import android.os.Build import android.os.Build
import android.os.Vibrator
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
@ -60,28 +59,4 @@ object DoNotDisturbUtils {
return shouldPlaySound return shouldPlaySound
} }
private fun hasVibrator(context: Context?): Boolean {
val vibrator = context?.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
return vibrator.hasVibrator()
}
@JvmOverloads
fun shouldVibrate(
context: Context? = NextcloudTalkApplication.sharedApplication?.applicationContext,
vibrate: Boolean
): Boolean {
if (hasVibrator(context)) {
val audioManager = context?.getSystemService(Context.AUDIO_SERVICE) as AudioManager
return if (vibrate) {
audioManager.ringerMode != AudioManager.RINGER_MODE_SILENT
} else {
audioManager.ringerMode == AudioManager.RINGER_MODE_VIBRATE
}
}
return false
}
} }

34
app/src/test/java/com/nextcloud/talk/utils/DoNotDisturbUtilsTest.java
View File

@ -24,7 +24,6 @@ import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build; import android.os.Build;
import android.os.Vibrator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -32,7 +31,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
public class DoNotDisturbUtilsTest { public class DoNotDisturbUtilsTest {
@ -46,18 +44,14 @@ public class DoNotDisturbUtilsTest {
@Mock @Mock
private AudioManager audioManager; private AudioManager audioManager;
@Mock
private Vibrator vibrator;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.openMocks(this); MockitoAnnotations.openMocks(this);
when(context.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(notificationManager); when(context.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(notificationManager);
when(context.getSystemService(Context.AUDIO_SERVICE)).thenReturn(audioManager); when(context.getSystemService(Context.AUDIO_SERVICE)).thenReturn(audioManager);
when(context.getSystemService(Context.VIBRATOR_SERVICE)).thenReturn(vibrator);
} }
@Test @Test
public void shouldPlaySound_givenAndroidMAndInterruptionFilterNone_assertReturnsFalse() { public void shouldPlaySound_givenAndroidMAndInterruptionFilterNone_assertReturnsFalse() {
DoNotDisturbUtils.INSTANCE.setTestingBuildVersion(Build.VERSION_CODES.M); DoNotDisturbUtils.INSTANCE.setTestingBuildVersion(Build.VERSION_CODES.M);
@ -77,32 +71,4 @@ public class DoNotDisturbUtilsTest {
assertFalse("shouldPlaySound incorrectly returned true", assertFalse("shouldPlaySound incorrectly returned true",
DoNotDisturbUtils.INSTANCE.shouldPlaySound(context)); DoNotDisturbUtils.INSTANCE.shouldPlaySound(context));
} }
@Test
public void shouldVibrate_givenNoVibrator_assertReturnsFalse() {
when(vibrator.hasVibrator()).thenReturn(false);
assertFalse("shouldVibrate returned true despite no vibrator",
DoNotDisturbUtils.INSTANCE.shouldVibrate(context, true));
}
@Test
public void shouldVibrate_givenVibratorAndRingerModeNormal_assertReturnsTrue() {
when(vibrator.hasVibrator()).thenReturn(true);
when(audioManager.getRingerMode()).thenReturn(AudioManager.RINGER_MODE_NORMAL);
assertTrue("shouldVibrate incorrectly returned false",
DoNotDisturbUtils.INSTANCE.shouldVibrate(context, true));
}
@Test
public void shouldVibrate_givenVibratorAndRingerModeSilent_assertReturnsFalse() {
when(vibrator.hasVibrator()).thenReturn(true);
when(audioManager.getRingerMode()).thenReturn(AudioManager.RINGER_MODE_SILENT);
assertFalse("shouldVibrate returned true despite ringer mode set to silent",
DoNotDisturbUtils.INSTANCE.shouldVibrate(context, true));
}
} }