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

Modify Uploader activity to be singleton in the activity stack, and assure finish when the upload scheme is file

Browse source
This commit is contained in:
Juan Carlos González Cabrero 2016-04-13 10:35:01 +02:00
parent 0f65e3a667
commit 9e36ae2238
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AndroidManifest.xml
View file

@ -71,7 +71,8 @@
</intent-filter>
</activity>
<activity android:name=".ui.activity.UploadFilesActivity" />
<activity android:name=".ui.activity.Uploader" >
<activity android:name=".ui.activity.Uploader"
android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.SEND" />

4
src/com/owncloud/android/ui/activity/Uploader.java
View file

@ -569,6 +569,10 @@ public class Uploader extends FileActivity
.getDefaultSharedPreferences(getApplicationContext()).edit();
appPrefs.putString("last_upload_path", mUploadPath);
appPrefs.apply();
if(contentUris.isEmpty()) {
finish();
}
}
/**