Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9a41f834 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #217 from nextcloud/addMissingAsset 

Replace image/video due to license
parents 52b7765d 925ec294

sample_client/src/main/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <string name="upload_folder_path">to_upload</string>

    <string name="download_folder_path">downloaded</string>

    <string name="error_copying_sample_file">Sample file could not be saved in temporal folder; upload will not work</string>

    <string name="sample_file_name">oc_sample.png</string>    

    <string name="sample_file_name">nc_logo.png</string>

    <string name="sample_file_mimetype">image/png</string>

    <string name="error_deleting_local_file">Downloaded file could not be deleted</string>   

</resources>

test_client/assets/imageFile.png

−3.01 KiB (17.5 KiB)
Loading image diff...

test_client/assets/videoFile.MP4

deleted100644 → 0
−7.36 MiB

File deleted.

View file

test_client/assets/videoFile.mp4

0 → 100644
+576 KiB

File added.

No diff preview for this file type.

View file

test_client/src/main/java/com/owncloud/android/lib/testclient/TestActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class TestActivity extends Activity { 
	

	public static final String ASSETS__TEXT_FILE_NAME = "textFile.txt";

	public static final String ASSETS__IMAGE_FILE_NAME = "imageFile.png";

	public static final String ASSETS__VIDEO_FILE_NAME = "videoFile.MP4";

	public static final String ASSETS__VIDEO_FILE_NAME = "videoFile.mp4";

	

	//private Account mAccount = null;

	private OwnCloudClient mClient;