diff --git a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java b/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java index dea3a0546a49..aeb39d0f4641 100644 --- a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java +++ b/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java @@ -43,14 +43,12 @@ import org.junit.Rule; import org.junit.Test; -import androidx.test.espresso.Espresso; import androidx.test.espresso.contrib.DrawerActions; import androidx.test.espresso.contrib.NavigationViewActions; import androidx.test.espresso.intent.rule.IntentsTestRule; import androidx.test.rule.GrantPermissionRule; import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; @@ -175,4 +173,15 @@ public void openAccountSwitcher() { Espresso.onView(withId(R.id.switch_account_button)).perform(click()); } + + @Test + public void audioPlayerRemoveFile() { + FileDisplayActivity sut = activityRule.launchActivity(null); + + sut.tryStopPlaying(new OCFile("/test.mp3")); + + longSleep(); + + Assert.assertTrue(true); // if we reach this, everything is ok + } } diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 55a21e16a306..a924cfeb361a 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -131,6 +131,7 @@ import javax.inject.Inject; import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SearchView; import androidx.coordinatorlayout.widget.CoordinatorLayout; @@ -1782,9 +1783,10 @@ private void onRestoreFileVersionOperationFinish(RemoteOperationResult result) { } } - private void tryStopPlaying(OCFile file) { + @VisibleForTesting + public void tryStopPlaying(OCFile file) { // placeholder for stop-on-delete future code - if(mPlayerConnection != null) { + if (mPlayerConnection != null) { mPlayerConnection.stop(file); } }