Change: Don't advise url-http-create-request

Use cl-letf to override it where needed.

matrix-api-r0.3.0.el

@@ -973,12 +973,13 @@ TYPING should be t or nil."
                                 (insert-file-contents path)
                                 (buffer-string)))
                (endpoint (url-encode-url (format$ "https://$server/_matrix/media/r0/upload?filename=$filename"))))
-    (matrix-post session endpoint
-      :success (apply-partially #'matrix-upload-callback room
-                                :cbargs (list :filename filename
-                                              :mime-type mime-type))
-      :content-type mime-type
-      :raw-data file-contents)))
+    (cl-letf (((symbol-function 'url-http-create-request) (symbol-function 'matrix--url-http-create-request)))
+      (matrix-post session endpoint
+        :success (apply-partially #'matrix-upload-callback room
+                                  :cbargs (list :filename filename
+                                                :mime-type mime-type))
+        :content-type mime-type
+        :raw-data file-contents))))
 
 (matrix-defcallback upload matrix-room
   "Callback for `matrix-upload'.

matrix-helpers.el

@@ -311,7 +311,5 @@ modified to allows binary uploads, which are prevented by the
     (url-http-debug "Request is: \n%s" request)
     request))
 
-(advice-add #'url-http-create-request :override #'matrix--url-http-create-request)
-
 (provide 'matrix-helpers)
 ;;; matrix-helpers.el ends here