[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdeconnect-android/filetransfer] KdeConnect/src/main/java/org/kde/kdeconnect: Renamed
From:       Albert Vaca <albertvaka () gmail ! com>
Date:       2013-10-01 1:29:39
Message-ID: E1VQomR-0000u3-BT () scm ! kde ! org
[Download RAW message or body]

Git commit 87174cfb28f6251ae5249d0e9d65edd596374b85 by Albert Vaca.
Committed on 01/10/2013 at 01:25.
Pushed by albertvaka into branch 'filetransfer'.

Renamed kdeconnect.filetransfer to kdeconnect.share

M  +1    -1    KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
M  +2    -4    KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java


http://commits.kde.org/kdeconnect-android/87174cfb28f6251ae5249d0e9d65edd596374b85

diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java \
b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java index \
                a2240ce..3549fb5 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/NetworkPackage.java
@@ -35,7 +35,7 @@ public class NetworkPackage {
     public final static String PACKAGE_TYPE_NOTIFICATION = \
                "kdeconnect.notification";
     public final static String PACKAGE_TYPE_CLIPBOARD = "kdeconnect.clipboard";
     public final static String PACKAGE_TYPE_MPRIS = "kdeconnect.mpris";
-    public final static String PACKAGE_TYPE_FILETRANSFER = \
"kdeconnect.filetransfer"; +    public final static String PACKAGE_TYPE_SHARE = \
"kdeconnect.share";  
     private long mId;
     private String mType;
diff --git a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java \
b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java \
                index 64be6f7..a9f113c 100644
--- a/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
+++ b/KdeConnect/src/main/java/org/kde/kdeconnect/UserInterface/ShareToReceiver.java
@@ -1,6 +1,5 @@
 package org.kde.kdeconnect.UserInterface;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
@@ -17,7 +16,6 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import org.apache.http.client.utils.URIUtils;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
@@ -149,7 +147,7 @@ public class ShareToReceiver extends ActionBarActivity {
                                     } catch(Exception e) {
                                         isUrl = false;
                                     }
-                                    NetworkPackage np = new \
NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER); +                           \
NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_SHARE);  if \
(isUrl) {  np.set("url", text);
                                     } else {
@@ -176,7 +174,7 @@ public class ShareToReceiver extends ActionBarActivity {
             ContentResolver cr = getContentResolver();
             InputStream inputStream = cr.openInputStream(uri);
 
-            NetworkPackage np = new \
NetworkPackage(NetworkPackage.PACKAGE_TYPE_FILETRANSFER); +            NetworkPackage \
np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_SHARE);  
             String[] proj = { MediaStore.MediaColumns.DATA, \
MediaStore.MediaColumns.SIZE, MediaStore.MediaColumns.DISPLAY_NAME };  Cursor cursor \
= managedQuery(uri, proj, null, null, null);


[prev in list] [next in list] [prev in thread] [next in thread]