Change okhttp log level to HEADERS for uploads.

Author: Sam1301

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -105,6 +105,7 @@ public class ZulipApp extends Application {
     private int max_message_id;
     private DatabaseHelper databaseHelper;
     private ZulipServices zulipServices;
+    private ZulipServices uploadServices;
     private ReferenceObjectCache objectCache;
     private ZulipActivity zulipActivity;
     /**
@@ -212,6 +213,22 @@ public ZulipServices getZulipServices() {
         return zulipServices;
     }
 
+    public ZulipServices getUploadServices() {
+        if (uploadServices == null) {
+            HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.HEADERS);
+            uploadServices = new Retrofit.Builder()
+                    .client(new OkHttpClient.Builder().readTimeout(60, TimeUnit.SECONDS)
+                            .addInterceptor(new ZulipInterceptor())
+                            .addInterceptor(logging)
+                            .build())
+                    .addConverterFactory(GsonConverterFactory.create(getGson()))
+                    .baseUrl(getServerURI())
+                    .build()
+                    .create(ZulipServices.class);
+        }
+        return uploadServices;
+    }
+
     public void setZulipServices(ZulipServices zulipServices) {
         this.zulipServices = zulipServices;
     }

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -1226,7 +1226,7 @@ public void onProgressUpdate(int percentage, String progress, int notificationId
 
         // finally, execute the request
         // create upload service client
-        Call<UploadResponse> call = ((ZulipApp) getApplicationContext()).getZulipServices().upload(body);
+        Call<UploadResponse> call = ((ZulipApp) getApplicationContext()).getUploadServices().upload(body);
         call.enqueue(new DefaultCallback<UploadResponse>() {
             @Override
             public void onSuccess(Call<UploadResponse> call, Response<UploadResponse> response) {
@@ -2476,8 +2476,8 @@ protected void onDestroy() {
         }
         if (mNotificationManager == null) {
             mNotificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
-            mNotificationManager.cancelAll();
         }
+        mNotificationManager.cancelAll();
     }
 
     /**

app/src/main/java/com/zulip/android/networking/UploadProgressRequest.java

@@ -20,7 +20,6 @@ public class UploadProgressRequest extends RequestBody {
     private File mFile;
     private UploadCallbacks mListener;
     private int mNotificationId;
-    int counter = 0;
 
     private static final int DEFAULT_BUFFER_SIZE = 2048;
 
@@ -46,21 +45,15 @@ public void writeTo(BufferedSink sink) throws IOException {
         FileInputStream in = new FileInputStream(mFile);
         long uploaded = 0;
 
-        // workaround logging interceptor disturbing progress update
-        counter++;
-
         try {
             int read;
             Handler handler = new Handler(Looper.getMainLooper());
             while ((read = in.read(buffer)) != -1) {
                 uploaded += read;
                 sink.write(buffer, 0, read);
 
-                // update progress on UI thread only when httpLoggingInterceptor
-                // is not calling writeTo()
-                if (counter % 2 == 0) {
-                    handler.post(new ProgressUpdater(uploaded, fileLength));
-                }
+                // update progress on UI thread only
+                handler.post(new ProgressUpdater(uploaded, fileLength));
             }
         } finally {
             in.close();