|
|
@ -114,11 +114,8 @@ public class ComposeActivity extends BaseActivity { |
|
|
|
private int currentFlags; |
|
|
|
private int currentFlags; |
|
|
|
private ProgressDialog finishingUploadDialog; |
|
|
|
private ProgressDialog finishingUploadDialog; |
|
|
|
private EditText contentWarningEditor; |
|
|
|
private EditText contentWarningEditor; |
|
|
|
private boolean mediaPickEnabled; |
|
|
|
|
|
|
|
private ImageButton pickBtn; |
|
|
|
private ImageButton pickBtn; |
|
|
|
private Button nsfwBtn; |
|
|
|
private Button nsfwBtn; |
|
|
|
private ImageButton visibilityBtn; |
|
|
|
|
|
|
|
private Button floatingBtn; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static class QueuedMedia { |
|
|
|
private static class QueuedMedia { |
|
|
|
enum Type { |
|
|
|
enum Type { |
|
|
@ -333,12 +330,10 @@ public class ComposeActivity extends BaseActivity { |
|
|
|
SharedPreferences preferences = getSharedPreferences( |
|
|
|
SharedPreferences preferences = getSharedPreferences( |
|
|
|
getString(R.string.preferences_file_key), Context.MODE_PRIVATE); |
|
|
|
getString(R.string.preferences_file_key), Context.MODE_PRIVATE); |
|
|
|
|
|
|
|
|
|
|
|
mediaPickEnabled = true; |
|
|
|
Button floatingBtn = (Button) findViewById(R.id.floating_btn); |
|
|
|
|
|
|
|
|
|
|
|
floatingBtn = (Button) findViewById(R.id.floating_btn); |
|
|
|
|
|
|
|
pickBtn = (ImageButton) findViewById(R.id.compose_photo_pick); |
|
|
|
pickBtn = (ImageButton) findViewById(R.id.compose_photo_pick); |
|
|
|
nsfwBtn = (Button) findViewById(R.id.action_toggle_nsfw); |
|
|
|
nsfwBtn = (Button) findViewById(R.id.action_toggle_nsfw); |
|
|
|
visibilityBtn = (ImageButton) findViewById(R.id.action_toggle_visibility); |
|
|
|
ImageButton visibilityBtn = (ImageButton) findViewById(R.id.action_toggle_visibility); |
|
|
|
|
|
|
|
|
|
|
|
floatingBtn.setOnClickListener(new View.OnClickListener() { |
|
|
|
floatingBtn.setOnClickListener(new View.OnClickListener() { |
|
|
|
@Override |
|
|
|
@Override |
|
|
@ -801,12 +796,10 @@ public class ComposeActivity extends BaseActivity { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void enableMediaPicking() { |
|
|
|
private void enableMediaPicking() { |
|
|
|
mediaPickEnabled = true; |
|
|
|
|
|
|
|
pickBtn.setEnabled(true); |
|
|
|
pickBtn.setEnabled(true); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void disableMediaPicking() { |
|
|
|
private void disableMediaPicking() { |
|
|
|
mediaPickEnabled = false; |
|
|
|
|
|
|
|
pickBtn.setEnabled(false); |
|
|
|
pickBtn.setEnabled(false); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -994,7 +987,7 @@ public class ComposeActivity extends BaseActivity { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void onUploadFailure(QueuedMedia item, boolean isCanceled) { |
|
|
|
private void onUploadFailure(QueuedMedia item, boolean isCanceled) { |
|
|
|
if (isCanceled) { |
|
|
|
if (!isCanceled) { |
|
|
|
/* if the upload was voluntarily cancelled, such as if the user clicked on it to remove |
|
|
|
/* if the upload was voluntarily cancelled, such as if the user clicked on it to remove |
|
|
|
* it from the queue, then don't display this error message. */ |
|
|
|
* it from the queue, then don't display this error message. */ |
|
|
|
displayTransientError(R.string.error_media_upload_sending); |
|
|
|
displayTransientError(R.string.error_media_upload_sending); |
|
|
|