nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-10 03:55:53 +00:00
Code Releases Activity

Create folder dialog - trim folder label (fixes #367) (#368)

Browse source 
* FolderActivity: Trim folder label (fixes #367)

* Only trim if EXTRA_FOLDER_LABEL extra was set
This commit is contained in:
Catfriend1 2019-03-11 18:30:44 +01:00 committed by GitHub
parent 7a12674a88
commit b28394bc8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
View file

@ -130,7 +130,7 @@ public class FolderActivity extends SyncthingActivity {
private final TextWatcher mTextWatcher = new TextWatcherAdapter() { private final TextWatcher mTextWatcher = new TextWatcherAdapter() {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
mFolder.label = mLabelView.getText().toString(); mFolder.label = mLabelView.getText().toString().trim();
mFolder.id = mIdView.getText().toString(); mFolder.id = mIdView.getText().toString();
// mPathView must not be handled here as it's handled by {@link onActivityResult} // mPathView must not be handled here as it's handled by {@link onActivityResult}
// mEditIgnoreListContent must not be handled here as it's written back when the dialog ends. // mEditIgnoreListContent must not be handled here as it's written back when the dialog ends.
@ -680,6 +680,9 @@ public class FolderActivity extends SyncthingActivity {
? getIntent().getStringExtra(EXTRA_FOLDER_ID) ? getIntent().getStringExtra(EXTRA_FOLDER_ID)
: generateRandomFolderId(); : generateRandomFolderId();
mFolder.label = getIntent().getStringExtra(EXTRA_FOLDER_LABEL); mFolder.label = getIntent().getStringExtra(EXTRA_FOLDER_LABEL);
if (!TextUtils.isEmpty(mFolder.label)) {
mFolder.label = mFolder.label.trim();
}
mFolder.paused = false; mFolder.paused = false;
mFolder.type = Constants.FOLDER_TYPE_SEND_RECEIVE; // Default for {@link #checkWriteAndUpdateUI}. mFolder.type = Constants.FOLDER_TYPE_SEND_RECEIVE; // Default for {@link #checkWriteAndUpdateUI}.
mFolder.minDiskFree = new Folder.MinDiskFree(); mFolder.minDiskFree = new Folder.MinDiskFree();