Эх сурвалжийг харах

Media player stops when its current file is deleted

masensio 9 жил өмнө
parent
commit
b5c1cf9fe9

+ 17 - 1
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -38,6 +38,9 @@ import android.content.SharedPreferences;
 import android.content.SyncRequest;
 import android.content.SyncRequest;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager;
 import android.content.res.Resources.NotFoundException;
 import android.content.res.Resources.NotFoundException;
+import android.database.Cursor;
+import android.media.MediaPlayer;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.IBinder;
@@ -167,6 +170,8 @@ public class FileDisplayActivity extends HookActivity
     private OCFile mWaitingToSend;
     private OCFile mWaitingToSend;
 
 
     private Collection<MenuItem> mDrawerMenuItemstoShowHideList;
     private Collection<MenuItem> mDrawerMenuItemstoShowHideList;
+    private MediaServiceBinder mMediaServiceBinder =  null;
+    private MediaServiceConnection mMediaServiceConnection = null;
 
 
     private MediaServiceBinder mMediaServiceBinder =  null;
     private MediaServiceBinder mMediaServiceBinder =  null;
     private MediaServiceConnection mMediaServiceConnection = null;
     private MediaServiceConnection mMediaServiceConnection = null;
@@ -1637,6 +1642,14 @@ public class FileDisplayActivity extends HookActivity
         }
         }
     };
     };
 
 
+
+
+
+    @Override
+    public void onSavedCertificate() {
+        startSyncFolderOperation(getCurrentDir(), false);
+    }
+
     /**
     /**
      * Updates the view associated to the activity after the finish of some operation over files
      * Updates the view associated to the activity after the finish of some operation over files
      * in the current account.
      * in the current account.
@@ -1727,7 +1740,10 @@ public class FileDisplayActivity extends HookActivity
 
 
     public void setMediaServiceConnection() {
     public void setMediaServiceConnection() {
         mMediaServiceConnection = newMediaConnection();// mediaServiceConnection;
         mMediaServiceConnection = newMediaConnection();// mediaServiceConnection;
-        bindService(new Intent(this, MediaService.class), mMediaServiceConnection, Context.BIND_AUTO_CREATE);
+        if (mMediaServiceConnection != null) {
+            bindService(new Intent(this, MediaService.class), mMediaServiceConnection,
+                    Context.BIND_AUTO_CREATE);
+        }
     }
     }
 
 
     private void tryStopPlaying(OCFile file) {
     private void tryStopPlaying(OCFile file) {