Explorar o código

fix everything @AndyScherzinger proposed

David Luhmer %!s(int64=6) %!d(string=hai) anos
pai
achega
cdf3ec2680

+ 16 - 11
src/main/java/com/nextcloud/android/sso/InputStreamBinder.java

@@ -58,16 +58,21 @@ import java.util.Map;
  *
  */
 
+
 public class InputStreamBinder extends IInputStreamService.Stub {
-    private final static String TAG = "InputStreamBinder";
 
-    private ArrayList<String> validPackages = new ArrayList<>(Arrays.asList("de.luhmer.owncloudnewsreader"));
-    
+    private final static String TAG = "InputStreamBinder";
     private Context context;
-    public InputStreamBinder(Context ctxt) {
-        this.context = ctxt;
-    }
+    private static final String CONTENT_TYPE_APPLICATION_JSON = "application/json";
+    private static final String CHARSET_UTF8 = "UTF-8";
 
+    private ArrayList<String> validPackages = new ArrayList<>(Arrays.asList(
+            "de.luhmer.owncloudnewsreader"
+    ));
+
+    public InputStreamBinder(Context context) {
+        this.context = context;
+    }
 
     private NameValuePair[] convertMapToNVP(Map<String, String> map) {
         NameValuePair[] nvp = new NameValuePair[map.size()];
@@ -79,7 +84,6 @@ public class InputStreamBinder extends IInputStreamService.Stub {
         return nvp;
     }
 
-
     public ParcelFileDescriptor performNextcloudRequest(ParcelFileDescriptor input) {
         // read the input
         final InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(input);
@@ -128,6 +132,7 @@ public class InputStreamBinder extends IInputStreamService.Stub {
         return result;
     }
 
+
     private InputStream processRequest(final NextcloudRequest request) throws Exception {
         Account account = AccountUtils.getOwnCloudAccountByName(context, request.accountName); // TODO handle case that account is not found!
         if(account == null) {
@@ -159,8 +164,8 @@ public class InputStreamBinder extends IInputStreamService.Stub {
                 if (request.requestBody != null) {
                     StringRequestEntity requestEntity = new StringRequestEntity(
                             request.requestBody,
-                            "application/json",
-                            "UTF-8");
+                            CONTENT_TYPE_APPLICATION_JSON,
+                            CHARSET_UTF8);
                     ((PostMethod) method).setRequestEntity(requestEntity);
                 }
                 break;
@@ -170,8 +175,8 @@ public class InputStreamBinder extends IInputStreamService.Stub {
                 if (request.requestBody != null) {
                     StringRequestEntity requestEntity = new StringRequestEntity(
                             request.requestBody,
-                            "application/json",
-                            "UTF-8");
+                            CONTENT_TYPE_APPLICATION_JSON,
+                            CHARSET_UTF8);
                     ((PutMethod) method).setRequestEntity(requestEntity);
                 }
                 break;

+ 4 - 3
src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java

@@ -28,6 +28,7 @@ import java.io.OutputStream;
 
 public final class ParcelFileDescriptorUtil {
 
+    private ParcelFileDescriptorUtil() { }
 
     public static ParcelFileDescriptor pipeFrom(InputStream inputStream, IThreadListener listener)
             throws IOException {
@@ -58,6 +59,7 @@ public final class ParcelFileDescriptorUtil {
     }
 
     public static class TransferThread extends Thread {
+        private static final String TAG = TransferThread.class.getCanonicalName();
         private final InputStream mIn;
         private final OutputStream mOut;
         private final IThreadListener mListener;
@@ -82,17 +84,16 @@ public final class ParcelFileDescriptorUtil {
                 mOut.flush(); // just to be safe
             } catch (IOException e) {
                 Log.e("TransferThread", "writing failed");
-                e.printStackTrace();
             } finally {
                 try {
                     mIn.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    Log.e(TAG, e.getMessage());
                 }
                 try {
                     mOut.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    Log.e(TAG, e.getMessage());
                 }
             }
             if (mListener != null)

+ 1 - 1
src/main/java/com/owncloud/android/services/AccountManagerService.java

@@ -42,4 +42,4 @@ public class AccountManagerService extends Service {
         return super.onUnbind(intent);
     }
 
-}
+}

+ 0 - 5
src/main/java/com/owncloud/android/ui/asynctasks/AsyncTaskHelper.java

@@ -1,9 +1,5 @@
 package com.owncloud.android.ui.asynctasks;
 
-/**
- * Created by david on 27.06.17.
- */
-
 import android.os.AsyncTask;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
@@ -63,5 +59,4 @@ public class AsyncTaskHelper {
             }
         }
     }
-
 }