Enhancements

kairusds-testing · Oct 17, 2024 · 0611433 · 0611433
1 parent 7377c68
commit 0611433
Showing 1 changed file with 37 additions and 38 deletions.
diff --git a/app/src/main/java/github/kairusds/libvlcandroidtest/MainActivity.java b/app/src/main/java/github/kairusds/libvlcandroidtest/MainActivity.java
@@ -44,6 +44,8 @@ public class MainActivity extends AppCompatActivity  {
 	private final Handler handler = new Handler(Looper.getMainLooper());
 	private ExecutorService executor = null;
 
+	private final Tika tika = new Tika();
+
 	private VLCVideoLayout videoLayout = null;
 	private LibVLC libVLC = null;
 	private MediaPlayer mediaPlayer = null;
@@ -73,7 +75,7 @@ protected void onCreate(Bundle savedInstanceState){
 
 		videoLayout = findViewById(R.id.video_layout);
 		videoLayout.setOnClickListener(v -> {
-			if(libVLCAvailable()){
+			if(libvlcAvailable()){
 				if(mediaPlayer.isPlaying()){
 					pause();
 				}else{
@@ -87,7 +89,7 @@ protected void onCreate(Bundle savedInstanceState){
 			}
 		});
 		videoLayout.setOnLongClickListener(v -> {
-			if(libVLCAvailable()){
+			if(libvlcAvailable()){
 				destroyVLC();
 				toast("Stopped video.");
 				return true;
@@ -113,13 +115,13 @@ private void toast(String str){
 	}
 
 	private void initVLC(){
-		if(libVLCAvailable()) return;
+		if(libvlcAvailable()) return;
 		libVLC = new LibVLC(this, options);
 		mediaPlayer = new MediaPlayer(libVLC);
 	}
 
 	private void destroyVLC(){
-		if(!libVLCAvailable()) return;
+		if(!libvlcAvailable()) return;
 		time = 0L;
 		mediaPlayer.stop();
 		mediaPlayer.detachViews();
@@ -129,7 +131,7 @@ private void destroyVLC(){
 		libVLC = null;
 	}
 
-	private boolean libVLCAvailable(){
+	private boolean libvlcAvailable(){
 		return libVLC != null && mediaPlayer != null;
 	}
 
@@ -157,29 +159,29 @@ protected void onResume() {
 	@Override
 	protected void onDestroy(){
 		super.onDestroy();
-		destroyVLC();
 		shutdownExecutor();
+		destroyVLC();
 	}
 
 	private void pause(){
-		if(!libVLCAvailable()) return;
+		if(!libvlcAvailable()) return;
 		time = mediaPlayer.getTime();
 		mediaPlayer.pause();
 	}
 
 	private void play(){
-		if(!libVLCAvailable()) return;
+		if(!libvlcAvailable()) return;
 		mediaPlayer.setTime(time);
 		mediaPlayer.play();
 	}
 
 	private void attachViews(){
-		if(!libVLCAvailable()) return;
+		if(!libvlcAvailable()) return;
 		mediaPlayer.attachViews(videoLayout, null, ENABLE_SUBTITLES, USE_TEXTURE_VIEW);
 	}
 
 	private void setVLCMedia(String path){
-		if(libVLCAvailable()) return;
+		if(libvlcAvailable()) return;
 		initVLC();
 		attachViews();
 
@@ -208,7 +210,21 @@ private void setVLCMedia(String path){
 	private void showFilePickerDialog(File dir){
 		try{
 			executor.execute(() -> {
-				File[] files = dir.listFiles();
+				File[] files = dir.listFiles(file -> {
+					if(file.isDirectory() && file.canRead()){
+						return true;
+					}
+
+					String mimetype = tika.detect(file.getName());
+					return mimetype.startsWith("video/");
+				});
+
+				if(files == null){
+					toast("Unable to access directory");
+					shutdownExecutor();
+					return;
+				}
+
 				Arrays.sort(files, new Comparator<File>(){
 					@Override
 					public int compare(File f1, File f2){
@@ -237,57 +253,40 @@ public int compare(File f1, File f2){
 				HashMap<String, String> paths = new HashMap<>();			
 				fileList.add("..");
 
-				if(files != null){
-					Tika tika = new Tika();
-					for(File file : files){
-						if(file.isDirectory()){
-							fileList.add(file.getName());
-							paths.put(file.getName(), file.getAbsolutePath());
-						}else{
-							String mimetype = tika.detect(file.getName());
-							if(mimetype.startsWith("video/")){
-								fileList.add(file.getName());
-								paths.put(file.getName(), file.getAbsolutePath());
-							}
-						}
-					}
+				for(File file : files){
+					fileList.add(file.getName());
+					paths.put(file.getName(), file.getAbsolutePath());
 				}
-	
+
 				handler.post(() -> {
-					if(files == null){
-						toast("Unable to access directory");
-						shutdownExecutor();
-						return;
-					}
-
 					ArrayAdapter<String> adapter = new ArrayAdapter<>(MainActivity.this, android.R.layout.select_dialog_item, fileList);
 					AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-					builder.setCancelable(false); // prevent dismiss on click outside of dialog or app minimize
+					builder.setCancelable(false); // prevent dismiss on click outside of dialog
 					builder.setTitle("Choose a video file");
 					builder.setAdapter(adapter, (dialog, which) -> {
 						if(which == 0){
 							File parentDir = dir.getParentFile();
 							if(parentDir != null && parentDir.canRead()){
-								dialog.dismiss();
 								showFilePickerDialog(parentDir);
 							}else{
 								toast("No parent directory");
+								showFilePickerDialog(dir);
 							}
 						}else{
 							String filename = fileList.get(which);
 							String filepath = paths.get(filename);
 							File selectedFile = new File(filepath);
 							if(selectedFile.isDirectory()){
-								dialog.dismiss();
 								showFilePickerDialog(selectedFile);
 							}else{
 								setVLCMedia(filepath);
-								dialog.dismiss();
 								shutdownExecutor();
 							}
 						}
 					});
-					builder.setNegativeButton("Cancel", null);
+					builder.setNegativeButton("Cancel", (dialog, which) -> {
+						shutdownExecutor();
+					});
 					builder.show();
 				});
 			});
@@ -322,7 +321,7 @@ protected void onStart(){ // activity is in view again or the real resumed state
 	@Override
 	protected void onStop(){ // activity is in the background or minimized
 		super.onStop();
-		time = mediaPlayer.getTime();
+		if(libvlcAvailable()) time = mediaPlayer.getTime();
 		pause();
 		// mediaPlayer.pause();
 		// mediaPlayer.stop();