nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 22:31:16 +00:00
Code Releases Activity

Added toast regarding external storage usage on Kitkat and higher (ref #225).

Browse source
This commit is contained in:
Felix Ableitner 2015-03-10 22:04:59 +01:00
parent 527d40e670
commit beb9dc54a4
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/SyncthingServiceTest.java
View file

@ -69,7 +69,7 @@ public class SyncthingServiceTest extends ServiceTestCase<SyncthingService> {
latch.countDown(); latch.countDown();
} }
}); });
latch.await(5, TimeUnit.SECONDS); latch.await(1, TimeUnit.SECONDS);
assertNotNull(getService().getApi()); assertNotNull(getService().getApi());
assertNotNull(getService().getWebGuiUrl()); assertNotNull(getService().getWebGuiUrl());
} }

7
src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
View file

@ -74,7 +74,7 @@ public class FolderPickerActivity extends SyncthingActivity
// Populate roots. // Populate roots.
ArrayList<File> roots = new ArrayList<>(); ArrayList<File> roots = new ArrayList<>();
if (android.os.Build.VERSION.SDK_INT >= 19) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
roots.addAll(Arrays.asList(getExternalFilesDirs(null))); roots.addAll(Arrays.asList(getExternalFilesDirs(null)));
} }
roots.add(Environment.getExternalStorageDirectory()); roots.add(Environment.getExternalStorageDirectory());
@ -96,6 +96,11 @@ public class FolderPickerActivity extends SyncthingActivity
} else { } else {
displayRoot(); displayRoot();
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Toast.makeText(this, R.string.kitkat_external_storage_warning, Toast.LENGTH_LONG)
.show();
}
} }
@Override @Override

3
src/main/res/values/strings.xml
View file

@ -287,6 +287,9 @@ Please report any problems you encounter via Github.</string>
<!-- Activity title --> <!-- Activity title -->
<string name="folder_picker_title">Folder Picker</string> <string name="folder_picker_title">Folder Picker</string>
<!-- Toast shown on devices with kitkat or higher -->
<string name="kitkat_external_storage_warning">Warning: Your Android version does not allow syncing to external storage devices</string>
<!-- ListView empty text --> <!-- ListView empty text -->
<string name="directory_empty">Directory is Empty</string> <string name="directory_empty">Directory is Empty</string>