mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-31 14:15:14 +00:00
Code Issues Releases Wiki Activity

Moved the code around to split it in big blocks and add some comments

Browse Source
This commit is contained in:
Albert Vaca
2016-11-30 16:47:51 +01:00
parent 29a8db9c45
commit 9d6476a27e
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
View File

@@ -306,34 +306,17 @@ public class SharePlugin extends Plugin {
static void queuedSendUriList(final Context context, final Device device, final ArrayList<Uri> uriList) {
try {
Uri uri = uriList.remove(0);
Uri uri = uriList.remove(0); // Take file URIs one at a time
//Create the network package from the URI
ContentResolver cr = context.getContentResolver();
InputStream inputStream = cr.openInputStream(uri);
NetworkPackage np = new NetworkPackage(PACKAGE_TYPE_SHARE_REQUEST);
long size = -1;
final NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
final int notificationId = (int)System.currentTimeMillis();
final NotificationCompat.Builder builder ;
Resources res = context.getResources();
builder = new NotificationCompat.Builder(context)
.setContentTitle(res.getString(R.string.outgoing_file_title, device.getName()))
.setTicker(res.getString(R.string.outgoing_file_title, device.getName()))
.setSmallIcon(android.R.drawable.stat_sys_upload)
.setAutoCancel(true)
.setOngoing(true)
.setProgress(100,0,true);
try {
notificationManager.notify(notificationId,builder.build());
} catch(Exception e) {
//4.1 will throw an exception about not having the VIBRATE permission, ignore it.
//https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/
}
final Handler progressBarHandler = new Handler(Looper.getMainLooper());
if (uri.getScheme().equals("file")) {
// file:// is a non media uri, so we cannot query the ContentProvider
@@ -389,6 +372,19 @@ public class SharePlugin extends Plugin {
np.setPayload(inputStream, size);
// Post a notification
final NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
final int notificationId = (int)System.currentTimeMillis();
Resources res = context.getResources();
final NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
.setContentTitle(res.getString(R.string.outgoing_file_title, device.getName()))
.setTicker(res.getString(R.string.outgoing_file_title, device.getName()))
.setSmallIcon(android.R.drawable.stat_sys_upload)
.setAutoCancel(true)
.setOngoing(true)
.setProgress(100,0,true);
final String filename = np.getString("filename");
builder.setContentText(res.getString(R.string.outgoing_file_text,filename));
@@ -399,6 +395,11 @@ public class SharePlugin extends Plugin {
//https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/
}
// Create a handler on the main thread to be able to update the notification
final Handler progressBarHandler = new Handler(Looper.getMainLooper());
//Actually send the file
device.sendPackage(np, new Device.SendPackageStatusCallback() {
int prevProgress = 0;