aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java3
-rw-r--r--src/main/java/de/pixart/messenger/ui/ShareWithActivity.java1
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index a8f07848b..31f3121ac 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -134,9 +134,6 @@ public class ConversationActivity extends XmppActivity
private AtomicBoolean mRedirected = new AtomicBoolean(false);
private Pair<Integer, Intent> mPostponedActivityResult;
- FileUtils mFileUtils;
- FileBackend mFileBackend;
-
long FirstStartTime = -1;
public Conversation getSelectedConversation() {
diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
index 34cf0b1ca..161711b81 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
@@ -1,7 +1,6 @@
package de.pixart.messenger.ui;
import android.app.PendingIntent;
-import android.app.ProgressDialog;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 3c8a561c1..ed1199dff 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -20,6 +20,7 @@ import android.content.Intent;
import android.content.IntentSender.SendIntentException;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
@@ -129,6 +130,7 @@ public abstract class XmppActivity extends Activity {
protected Toast mToast;
protected ProgressDialog mProgress;
+ Integer oldOrientation = getRequestedOrientation();
protected void hideToast() {
if (mToast != null) {
@@ -147,7 +149,7 @@ public abstract class XmppActivity extends Activity {
}
protected void showProgress() {
- mProgress = new ProgressDialog(this);
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
mProgress.setMessage(getString(R.string.compressing_video));
mProgress.setCancelable(false);
mProgress.show();
@@ -156,6 +158,7 @@ public abstract class XmppActivity extends Activity {
protected void closeProgress() {
if (mProgress.isShowing()) {
mProgress.dismiss();
+ setRequestedOrientation(oldOrientation);
}
}
@@ -434,6 +437,7 @@ public abstract class XmppActivity extends Activity {
if (ab!=null) {
ab.setDisplayHomeAsUpEnabled(true);
}
+ mProgress = new ProgressDialog(this);
}
protected boolean isOptimizingBattery() {