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

Set random folder id when creating new folder (fixes #895)

Browse source
This commit is contained in:
Felix Ableitner 2017-05-29 12:47:41 +09:00
parent 23deb9a0ea
commit 770ec6050d
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import com.nutomic.syncthingandroid.service.SyncthingService;
import com.nutomic.syncthingandroid.util.TextWatcherAdapter; import com.nutomic.syncthingandroid.util.TextWatcherAdapter;
import java.util.List; import java.util.List;
import java.util.Random;
import static android.support.v4.view.MarginLayoutParamsCompat.setMarginEnd; import static android.support.v4.view.MarginLayoutParamsCompat.setMarginEnd;
import static android.support.v4.view.MarginLayoutParamsCompat.setMarginStart; import static android.support.v4.view.MarginLayoutParamsCompat.setMarginStart;
@ -371,9 +372,24 @@ public class FolderActivity extends SyncthingActivity
} }
} }
private String generateRandomFolderId() {
char[] chars = "abcdefghijklmnopqrstuvwxyz0123456789".toCharArray();
StringBuilder sb = new StringBuilder();
Random random = new Random();
for (int i = 0; i < 10; i++) {
if (i == 5) {
sb.append("-");
}
char c = chars[random.nextInt(chars.length)];
sb.append(c);
}
return sb.toString();
}
private void initFolder() { private void initFolder() {
mFolder = new Folder(); mFolder = new Folder();
mFolder.id = getIntent().getStringExtra(EXTRA_FOLDER_ID); mFolder.id = (getIntent().hasExtra(EXTRA_FOLDER_ID))
? getIntent().getStringExtra(EXTRA_FOLDER_ID)
: generateRandomFolderId();
mFolder.label = getIntent().getStringExtra(EXTRA_FOLDER_LABEL); mFolder.label = getIntent().getStringExtra(EXTRA_FOLDER_LABEL);
if (Build.VERSION.SDK_INT != Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT != Build.VERSION_CODES.M) {
// Scan every 3 days (in case inotify dropped some changes) // Scan every 3 days (in case inotify dropped some changes)