diff --git a/commons/res/layout/activity_share.xml b/commons/res/layout/activity_share.xml
index a914c667a..6926893dd 100644
--- a/commons/res/layout/activity_share.xml
+++ b/commons/res/layout/activity_share.xml
@@ -89,7 +89,8 @@
android:id="@+id/uploadButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Upload" />
+ android:enabled="false"
+ android:text="@string/share_upload_button" />
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index ca52244ba..4f4eeeec1 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -45,6 +45,7 @@
Sorry, this user has been blocked on Commons
Login failed
+ Upload
- No uploads yet
diff --git a/commons/src/main/java/org/wikimedia/commons/ShareActivity.java b/commons/src/main/java/org/wikimedia/commons/ShareActivity.java
index cf9112f51..2d0484f67 100644
--- a/commons/src/main/java/org/wikimedia/commons/ShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/ShareActivity.java
@@ -6,6 +6,8 @@ import android.database.Cursor;
import android.os.AsyncTask;
import android.os.IBinder;
import android.provider.MediaStore;
+import android.text.Editable;
+import android.text.TextWatcher;
import android.util.Log;
import org.wikimedia.commons.auth.AuthenticatedActivity;
import org.wikimedia.commons.auth.WikiAccountAuthenticator;
@@ -180,6 +182,23 @@ public class ShareActivity extends AuthenticatedActivity {
titleEdit = (EditText)findViewById(R.id.titleEdit);
descEdit = (EditText)findViewById(R.id.descEdit);
uploadButton = (Button)findViewById(R.id.uploadButton);
+
+ TextWatcher uploadEnabler = new TextWatcher() {
+ public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) { }
+
+ public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {}
+
+ public void afterTextChanged(Editable editable) {
+ if(titleEdit.getText().length() != 0) {
+ uploadButton.setEnabled(true);
+ } else {
+ uploadButton.setEnabled(false);
+ }
+
+ }
+ };
+
+ titleEdit.addTextChangedListener(uploadEnabler);
requestAuthToken();