Author: kairusds

app/src/main/java/github/kairusds/libvlcandroidtest/MainActivity.java

@@ -146,6 +146,7 @@ protected void onResume() {
 	protected void onDestroy(){
 		super.onDestroy();
 		destroyVLC();
+		shutdownExecutor();
 	}
 
 	private void pause(){
@@ -182,6 +183,7 @@ private void setVLCMedia(String path){
 					time = event.getTimeChanged();
 					break;
 				case Event.EndReached:
+					mediaPlayer.stop();
 					destroyVLC();
 					break;
 			}
@@ -217,8 +219,7 @@ private void showFilePickerDialog(File dir){
 				handler.post(() -> {
 					if(files == null){
 						toast("Unable to access directory");
-						executor.shutdown();
-						executor = null;
+						shutdownExecutor();
 						return;
 					}
 
@@ -244,8 +245,7 @@ private void showFilePickerDialog(File dir){
 							}else{
 								setVLCMedia(filepath);
 								dialog.dismiss();
-								executor.shutdown();
-								executor = null;
+								shutdownExecutor();
 							}
 						}
 					});
@@ -258,6 +258,13 @@ private void showFilePickerDialog(File dir){
 		}
 	}
 
+	private void shutdownExecutor(){
+		if(executor != null){
+			executor.shutdown();
+			executor = null;
+		}
+	}
+
 	@Override  
 	protected void onActivityResult(int requestCode, int resultCode, Intent data){  
 		super.onActivityResult(requestCode, resultCode, data);  
@@ -280,7 +287,7 @@ protected void onStop(){ // activity is in the background or minimized
 		pause();
 		// mediaPlayer.pause();
 		// mediaPlayer.stop();
-		/// mediaPlayer.detachViews();
+		mediaPlayer.detachViews();
 	}
 
 }