6.4.0 rel

go/chat/s3/multi.go

@@ -57,11 +57,14 @@ func (b *Bucket) ListMulti(ctx context.Context, prefix, delim string) (multis []
 		"prefix":      {prefix},
 		"delimiter":   {delim},
 	}
+	headers := map[string][]string{}
+	b.addTokenHeader(headers)
 	for attempt := b.S3.AttemptStrategy.Start(); attempt.Next(); {
 		req := &request{
-			method: "GET",
-			bucket: b.Name,
-			params: params,
+			method:  "GET",
+			bucket:  b.Name,
+			params:  params,
+			headers: headers,
 		}
 		var resp listMultiResp
 		err := b.S3.query(ctx, req, &resp)
@@ -121,6 +124,7 @@ func (b *Bucket) InitMulti(ctx context.Context, key string, contType string, per
 		"Content-Length": {"0"},
 		"x-amz-acl":      {string(perm)},
 	}
+	b.addTokenHeader(headers)
 	params := map[string][]string{
 		"uploads": {""},
 	}
@@ -164,6 +168,7 @@ func (m *Multi) putPart(ctx context.Context, n int, r io.ReadSeeker, partSize in
 		"Content-Length": {strconv.FormatInt(partSize, 10)},
 		"Content-MD5":    {md5b64},
 	}
+	m.Bucket.addTokenHeader(headers)
 	params := map[string][]string{
 		"uploadId":   {m.UploadID},
 		"partNumber": {strconv.FormatInt(int64(n), 10)},
@@ -247,13 +252,17 @@ func (m *Multi) ListParts(ctx context.Context) ([]Part, error) {
 		"uploadId":  {m.UploadID},
 		"max-parts": {strconv.FormatInt(int64(listPartsMax), 10)},
 	}
+	headers := map[string][]string{}
+	m.Bucket.addTokenHeader(headers)
+
 	var parts partSlice
 	for attempt := m.Bucket.S3.AttemptStrategy.Start(); attempt.Next(); {
 		req := &request{
-			method: "GET",
-			bucket: m.Bucket.Name,
-			path:   m.Key,
-			params: params,
+			method:  "GET",
+			bucket:  m.Bucket.Name,
+			path:    m.Key,
+			params:  params,
+			headers: headers,
 		}
 		var resp listPartsResp
 		err := m.Bucket.S3.query(ctx, req, &resp)
@@ -383,15 +392,17 @@ func (m *Multi) Complete(ctx context.Context, parts []Part) error {
 
 	// Setting Content-Length prevents breakage on DreamObjects
 	for attempt := m.Bucket.S3.AttemptStrategy.Start(); attempt.Next(); {
+		headers := map[string][]string{
+			"Content-Length": {strconv.Itoa(len(data))},
+		}
+		m.Bucket.addTokenHeader(headers)
 		req := &request{
 			method:  "POST",
 			bucket:  m.Bucket.Name,
 			path:    m.Key,
 			params:  params,
 			payload: bytes.NewReader(data),
-			headers: map[string][]string{
-				"Content-Length": {strconv.Itoa(len(data))},
-			},
+			headers: headers,
 		}
 
 		resp := &completeResponse{}
@@ -432,12 +443,16 @@ func (m *Multi) Abort(ctx context.Context) error {
 	params := map[string][]string{
 		"uploadId": {m.UploadID},
 	}
+	headers := map[string][]string{}
+	m.Bucket.addTokenHeader(headers)
+
 	for attempt := m.Bucket.S3.AttemptStrategy.Start(); attempt.Next(); {
 		req := &request{
-			method: "DELETE",
-			bucket: m.Bucket.Name,
-			path:   m.Key,
-			params: params,
+			method:  "DELETE",
+			bucket:  m.Bucket.Name,
+			path:    m.Key,
+			params:  params,
+			headers: headers,
 		}
 		err := m.Bucket.S3.query(ctx, req, nil)
 		if shouldRetry(err) && attempt.HasNext() {

go/chat/s3/s3.go

@@ -225,10 +225,14 @@ func (b *Bucket) PutBucket(ctx context.Context, perm ACL) error {
 //
 // See http://goo.gl/GoBrY for details.
 func (b *Bucket) DelBucket() (err error) {
+	headers := map[string][]string{}
+	b.addTokenHeader(headers)
+
 	req := &request{
-		method: "DELETE",
-		bucket: b.Name,
-		path:   "/",
+		method:  "DELETE",
+		bucket:  b.Name,
+		path:    "/",
+		headers: headers,
 	}
 	for attempt := b.S3.AttemptStrategy.Start(); attempt.Next(); {
 		err = b.S3.query(context.Background(), req, nil)
@@ -321,10 +325,14 @@ func (b *Bucket) GetResponseWithHeaders(ctx context.Context, path string, header
 
 // Exists checks whether or not an object exists on an S3 bucket using a HEAD request.
 func (b *Bucket) Exists(path string) (exists bool, err error) {
+	headers := map[string][]string{}
+	b.addTokenHeader(headers)
+
 	req := &request{
-		method: "HEAD",
-		bucket: b.Name,
-		path:   path,
+		method:  "HEAD",
+		bucket:  b.Name,
+		path:    path,
+		headers: headers,
 	}
 	err = b.S3.prepare(req)
 	if err != nil {
@@ -543,6 +551,7 @@ func (b *Bucket) PutBucketSubresource(subresource string, r io.Reader, length in
 	headers := map[string][]string{
 		"Content-Length": {strconv.FormatInt(length, 10)},
 	}
+	b.addTokenHeader(headers)
 	req := &request{
 		path:    "/",
 		method:  "PUT",
@@ -559,6 +568,9 @@ func (b *Bucket) PutBucketSubresource(subresource string, r io.Reader, length in
 //
 // See http://goo.gl/APeTt for details.
 func (b *Bucket) Del(ctx context.Context, path string) error {
+	headers := map[string][]string{}
+	b.addTokenHeader(headers)
+
 	req := &request{
 		method: "DELETE",
 		bucket: b.Name,
@@ -598,6 +610,8 @@ func (b *Bucket) DelMulti(objects Delete) error {
 		"Content-MD5":    {base64.StdEncoding.EncodeToString(digest.Sum(nil))},
 		"Content-Type":   {"text/xml"},
 	}
+	b.addTokenHeader(headers)
+
 	req := &request{
 		path:    "/",
 		method:  "POST",
@@ -705,9 +719,13 @@ func (b *Bucket) List(prefix, delim, marker string, max int) (result *ListResp,
 	if max != 0 {
 		params["max-keys"] = []string{strconv.FormatInt(int64(max), 10)}
 	}
+	headers := map[string][]string{}
+	b.addTokenHeader(headers)
+
 	req := &request{
-		bucket: b.Name,
-		params: params,
+		bucket:  b.Name,
+		params:  params,
+		headers: headers,
 	}
 	result = &ListResp{}
 	for attempt := b.S3.AttemptStrategy.Start(); attempt.Next(); {

go/libkb/version.go

@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "6.3.2"
+const Version = "6.4.0"

shared/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: "com.facebook.react"
 apply plugin: 'com.github.triplet.play'
 
 // KB: app version
-def VERSION_NAME = "6.3.2"
+def VERSION_NAME = "6.4.0"
 
 // KB: Number of commits, like ios
 Integer getVersionCode() {

shared/common-adapters/image2.d.ts

@@ -8,7 +8,6 @@ export type Props = {
   showLoadingStateUntilLoaded?: boolean
   onLoad?: (e: {target?: unknown; source?: {width: number; height: number}}) => void
   onError?: () => void
-  allowDownscaling?: boolean
 }
 
 declare const Image2: (p: Props) => React.ReactNode

shared/common-adapters/image2.native.tsx

@@ -4,15 +4,7 @@ import type {Props} from './image2'
 import {Image, type ImageLoadEventData} from 'expo-image'
 
 const Image2 = (p: Props) => {
-  const {
-    showLoadingStateUntilLoaded,
-    src,
-    onLoad,
-    onError,
-    style,
-    contentFit = 'contain',
-    allowDownscaling,
-  } = p
+  const {showLoadingStateUntilLoaded, src, onLoad, onError, style, contentFit = 'contain'} = p
   // if we don't have showLoadingStateUntilLoaded then just mark as loaded and ignore this state
   const [loading, setLoading] = React.useState(!showLoadingStateUntilLoaded)
   const [lastSrc, setLastSrc] = React.useState(src)
@@ -40,14 +32,7 @@ const Image2 = (p: Props) => {
 
   return (
     <>
-      <Image
-        source={src}
-        style={style}
-        onLoad={_onLoad}
-        contentFit={contentFit}
-        onError={_onError}
-        allowDownscaling={allowDownscaling}
-      />
+      <Image source={src} style={style} onLoad={_onLoad} contentFit={contentFit} onError={_onError} />
       {showLoadingStateUntilLoaded && loading ? <LoadingStateView loading={loading} /> : null}
     </>
   )