little notification improvements for video compression

3 files changed, 3 insertions, 17 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index ffff13c5c..baf962392 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -1852,18 +1852,15 @@ public class ConversationActivity extends XmppActivity
         }
         final Toast prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_video), Toast.LENGTH_LONG);
         prepareFileToast.show();
-        showProgress();
         xmppConnectionService.attachVideoToConversation(conversation, uri, new UiCallback<Message>() {
             @Override
             public void success(Message message) {
-                closeProgress();
                 hidePrepareFileToast(prepareFileToast);
                 xmppConnectionService.sendMessage(message);
             }
 
             @Override
             public void error(final int errorCode, Message message) {
-                closeProgress();
                 hidePrepareFileToast(prepareFileToast);
                 runOnUiThread(new Runnable() {
                     @Override
@@ -1876,7 +1873,6 @@ public class ConversationActivity extends XmppActivity
 
             @Override
             public void userInputRequried(PendingIntent pi, Message message) {
-                closeProgress();
                 hidePrepareFileToast(prepareFileToast);
             }
         });
diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
index 8dfea2179..e2280bdf2 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
@@ -83,7 +83,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 						} else if (share.image) {
 							resId = R.string.shared_image_with_x;
                         } else if (share.video) {
-                            closeProgress();
                             resId = R.string.shared_video_with_x;
 						} else {
 							resId = R.string.shared_file_with_x;
@@ -313,7 +312,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
                         }
                     } else if (share.video) {
                         replaceToast(getString(R.string.preparing_video));
-                        showProgress();
                         ShareWithActivity.this.xmppConnectionService
                                 .attachVideoToConversation(conversation, share.uris.get(0),
                                         attachFileCallback);
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index b32438871..051b660bd 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -107,8 +107,6 @@ public abstract class XmppActivity extends Activity {
 	protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102;
 	protected static final int REQUEST_CHOOSE_PGP_ID = 0x0103;
 	protected static final int REQUEST_BATTERY_OP = 0x13849ff;
-    private static final int NOTIFICATION_ID = 1230;
-    private NotificationManager mNotifyManager;
 
 	public static final String EXTRA_ACCOUNT = "account";
 
@@ -150,18 +148,12 @@ public abstract class XmppActivity extends Activity {
 		mToast.show();
 	}
 
-    protected void showProgress() {
-        mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getBaseContext());
-        mBuilder.setContentTitle(getString(R.string.app_name))
-                .setContentText(getString(R.string.compressing_video))
-                .setSmallIcon(R.drawable.ic_play_box_outline_white_24dp)
-                .setProgress(0, 0, true);
-        mNotifyManager.notify(NOTIFICATION_ID, mBuilder.build());
+    public void showProgress() {
+
     }
 
     public void closeProgress() {
-        mNotifyManager.cancel(NOTIFICATION_ID);
+
     }
 
 	protected Runnable onOpenPGPKeyPublished = new Runnable() {