mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

add title and message in dialog

Browse source
This commit is contained in:
matsuo 2016-10-16 15:17:47 +09:00 committed by AndyScherzinger
parent 678170024e
commit 6900c73642
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file

@ -47,6 +47,7 @@ import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.WindowManager.LayoutParams;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemClickListener;
import android.widget.Button; import android.widget.Button;
@ -357,26 +358,26 @@ public class ReceiveExternalFilesActivity extends FileActivity
LayoutInflater layout = LayoutInflater.from(getBaseContext()); LayoutInflater layout = LayoutInflater.from(getBaseContext());
View view = layout.inflate(R.layout.edit_box_dialog, null); View view = layout.inflate(R.layout.edit_box_dialog, null);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
this);
alertDialogBuilder.setView(view);
final EditText userInput = (EditText) view.findViewById(R.id.user_input); final EditText userInput = (EditText) view.findViewById(R.id.user_input);
userInput.setText(mServerFilename); userInput.setText(mServerFilename);
userInput.requestFocus();
alertDialogBuilder.setCancelable(false) AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
alertDialogBuilder.setView(view)
.setTitle("Input upload filename")
.setMessage("file type is " +
(mTmpFileSuffix.equals(TEXT_FILE_SUFFIX) ? "Snipet text file" :
mTmpFileSuffix.equals(URL_FILE_SUFFIX) ? "Internet shortcut file" : "?") + "(" + mTmpFileSuffix + ")")
.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,int id) { public void onClick(DialogInterface dialog,int id) {
FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
// verify if file name has suffix // verify if file name has suffix
String filename = userInput.getText().toString(); String filename = userInput.getText().toString();
if (!filename.endsWith(mTmpFileSuffix)){ if (!filename.endsWith(mTmpFileSuffix)){
filename += mTmpFileSuffix; filename += mTmpFileSuffix;
} }
FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
requester.uploadNewFile( requester.uploadNewFile(
getBaseContext(), getBaseContext(),
getAccount(), getAccount(),
@ -390,13 +391,16 @@ public class ReceiveExternalFilesActivity extends FileActivity
finish(); finish();
} }
}) })
.setCancelable(false)
.setNegativeButton(R.string.common_cancel, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.common_cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,int id) { public void onClick(DialogInterface dialog,int id) {
dialog.cancel(); dialog.cancel();
} }
}); });
alertDialogBuilder.create().show(); Dialog d = alertDialogBuilder.create();
d.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
d.show();
} else { } else {
Log_OC.d(TAG, "Uploading file to dir " + mUploadPath); Log_OC.d(TAG, "Uploading file to dir " + mUploadPath);
uploadFiles(); uploadFiles();
@ -480,10 +484,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder); Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);
btnChooseFolder.setOnClickListener(this); btnChooseFolder.setOnClickListener(this);
if (mUploadFromTmpFile) {
btnChooseFolder.setText(R.string.uploader_btn_uploadTextSnippet_text);
}
Button btnNewFolder = (Button) findViewById(R.id.uploader_cancel); Button btnNewFolder = (Button) findViewById(R.id.uploader_cancel);
btnNewFolder.setOnClickListener(this); btnNewFolder.setOnClickListener(this);