diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
index adbd744f..7baaa661 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
@@ -119,6 +119,8 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
protected void onDestroy() {
if (uploaderAsync != null && uploaderAsync.getStatus() == RUNNING)
uploaderAsync.cancel(true);
+ if (mLocation != null)
+ mLocation.removeUpdates(this);
super.onDestroy();
}
@@ -210,7 +212,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
String tweetStr = tweet.getText().toString();
if (tweetStr.trim().isEmpty() && mediaPath.isEmpty()) {
Toast.makeText(this, R.string.empty_tweet, LENGTH_SHORT).show();
- } else {
+ } else if (locationProg.getVisibility() == INVISIBLE) {
TweetHolder tweet = new TweetHolder(tweetStr, inReplyId);
if (!mediaPath.isEmpty())
tweet.addMedia(mediaPath.toArray(new String[0]));
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index b1cc7e97..df1bbd30 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -111,16 +111,6 @@
android:textSize="@dimen/textsize_tweet"
android:visibility="gone" />
-
-
+
+