Skip to content

Commit dfadc97

Browse files
lfkellogglfkellogg
committed
Format java
1 parent 37a11ea commit dfadc97

File tree

11 files changed

+183
-158
lines changed

11 files changed

+183
-158
lines changed

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414

1515
package com.google.firebase.appdistribution.impl;
1616

17-
import android.content.ContentResolver;
1817
import android.graphics.Bitmap;
1918
import android.net.Uri;
2019
import android.os.Bundle;
2120
import android.text.method.LinkMovementMethod;
22-
import android.util.Log;
2321
import android.view.View;
2422
import android.widget.Button;
2523
import android.widget.EditText;
@@ -28,12 +26,9 @@
2826
import android.widget.Toast;
2927
import androidx.annotation.Nullable;
3028
import androidx.appcompat.app.AppCompatActivity;
31-
3229
import com.google.firebase.appdistribution.FirebaseAppDistributionException;
3330
import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
34-
3531
import java.io.FileNotFoundException;
36-
import java.io.IOException;
3732
import java.io.InputStream;
3833

3934
/** Activity for tester to compose and submit feedback. */
@@ -48,7 +43,7 @@ public class FeedbackActivity extends AppCompatActivity {
4843
public static final String INFO_TEXT_EXTRA_KEY =
4944
"com.google.firebase.appdistribution.FeedbackActivity.INFO_TEXT";
5045
public static final String SCREENSHOT_URI_EXTRA_KEY =
51-
"com.google.firebase.appdistribution.FeedbackActivity.SCREENSHOT_URI";
46+
"com.google.firebase.appdistribution.FeedbackActivity.SCREENSHOT_URI";
5247

5348
private FeedbackSender feedbackSender;
5449
private String releaseName;
@@ -92,7 +87,8 @@ private Bitmap readThumbnail() throws FirebaseAppDistributionException {
9287
if (screenshotUri == null) {
9388
throw new FirebaseAppDistributionException("No screenshot provided.", Status.UNKNOWN);
9489
}
95-
return ImageUtils.readScaledImage(getContentResolver(), screenshotUri, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT);
90+
return ImageUtils.readScaledImage(
91+
getContentResolver(), screenshotUri, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT);
9692
}
9793

9894
public void submitFeedback(View view) {
@@ -123,7 +119,8 @@ public void submitFeedback(View view) {
123119
try {
124120
return this.getContentResolver().openInputStream(screenshotUri);
125121
} catch (FileNotFoundException e) {
126-
LogWrapper.getInstance().e(TAG, String.format("Could not read screenshot from URI %s", screenshotUri), e);
122+
LogWrapper.getInstance()
123+
.e(TAG, String.format("Could not read screenshot from URI %s", screenshotUri), e);
127124
return null;
128125
}
129126
}

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackSender.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,16 @@ static FeedbackSender getInstance() {
3535
}
3636

3737
/** Send feedback text and optionally a screenshot to the Tester API for the given release. */
38-
Task<Void> sendFeedback(String releaseName, String feedbackText, @Nullable InputStream screenshotInputStream) {
38+
Task<Void> sendFeedback(
39+
String releaseName, String feedbackText, @Nullable InputStream screenshotInputStream) {
3940
return testerApiClient
4041
.createFeedback(releaseName, feedbackText)
4142
.onSuccessTask(feedbackName -> attachScreenshot(feedbackName, screenshotInputStream))
4243
.onSuccessTask(testerApiClient::commitFeedback);
4344
}
4445

45-
private Task<String> attachScreenshot(String feedbackName, @Nullable InputStream screenshotInputStream) {
46+
private Task<String> attachScreenshot(
47+
String feedbackName, @Nullable InputStream screenshotInputStream) {
4648
if (screenshotInputStream == null) {
4749
return Tasks.forResult(feedbackName);
4850
}

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionImpl.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import android.content.Context;
3030
import android.content.Intent;
3131
import android.net.Uri;
32-
3332
import androidx.annotation.GuardedBy;
3433
import androidx.annotation.NonNull;
3534
import androidx.annotation.Nullable;
@@ -326,27 +325,24 @@ public void startFeedback(@NonNull CharSequence infoText) {
326325
.addOnFailureListener(
327326
taskExecutor, e -> LogWrapper.getInstance().e("Failed to take screenshot", e))
328327
.addOnSuccessListener(
329-
taskExecutor,
330-
screenshotUri ->
331-
startFeedback(infoText, screenshotUri));
328+
taskExecutor, screenshotUri -> startFeedback(infoText, screenshotUri));
332329
}
333330

334331
@Override
335332
public void startFeedback(@NonNull CharSequence infoText, @NonNull Uri screenshotUri) {
336333
testerSignInManager
337334
.signInTester()
338335
.addOnFailureListener(
339-
taskExecutor,
340-
e ->
341-
LogWrapper.getInstance()
342-
.e("Failed to sign in tester. Could not collect feedback.", e))
336+
taskExecutor,
337+
e ->
338+
LogWrapper.getInstance()
339+
.e("Failed to sign in tester. Could not collect feedback.", e))
343340
.onSuccessTask(taskExecutor, unused -> releaseIdentifier.identifyRelease())
344341
.onSuccessTask(
345-
taskExecutor,
346-
releaseName ->
347-
launchFeedbackActivity(releaseName, infoText, screenshotUri))
342+
taskExecutor,
343+
releaseName -> launchFeedbackActivity(releaseName, infoText, screenshotUri))
348344
.addOnFailureListener(
349-
taskExecutor, e -> LogWrapper.getInstance().e("Failed to launch feedback flow", e));
345+
taskExecutor, e -> LogWrapper.getInstance().e("Failed to launch feedback flow", e));
350346
}
351347

352348
private Task<Void> launchFeedbackActivity(

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.firebase.inject.Provider;
2727
import com.google.firebase.installations.FirebaseInstallationsApi;
2828
import com.google.firebase.installations.InstallationTokenResult;
29-
import java.io.File;
3029
import java.io.InputStream;
3130
import java.util.concurrent.Executor;
3231
import java.util.concurrent.Executors;
@@ -157,7 +156,8 @@ Task<String> attachScreenshot(String feedbackName, InputStream screenshotInputSt
157156
LogWrapper.getInstance().i("Uploading screenshot for feedback: " + feedbackName);
158157
String path =
159158
String.format("upload/v1alpha/%s:uploadArtifact?type=SCREENSHOT", feedbackName);
160-
testerApiHttpClient.makeUploadRequest(UPLOAD_SCREENSHOT_TAG, path, token, screenshotInputStream);
159+
testerApiHttpClient.makeUploadRequest(
160+
UPLOAD_SCREENSHOT_TAG, path, token, screenshotInputStream);
161161
return feedbackName;
162162
});
163163
}

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ImageUtils.java

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
import android.graphics.BitmapFactory;
2020
import android.net.Uri;
2121
import android.util.Log;
22-
2322
import com.google.auto.value.AutoValue;
2423
import com.google.firebase.appdistribution.FirebaseAppDistributionException;
2524
import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
26-
2725
import java.io.FileNotFoundException;
2826
import java.io.InputStream;
2927

@@ -58,7 +56,9 @@ static ImageSize read(InputStream inputStream) {
5856
* @return the image
5957
* @throws FirebaseAppDistributionException if the image could not be read
6058
*/
61-
public static Bitmap readScaledImage(ContentResolver contentResolver, Uri uri, int targetWidth, int targetHeight) throws FirebaseAppDistributionException {
59+
public static Bitmap readScaledImage(
60+
ContentResolver contentResolver, Uri uri, int targetWidth, int targetHeight)
61+
throws FirebaseAppDistributionException {
6262
if (targetWidth <= 0 || targetHeight <= 0) {
6363
throw new FirebaseAppDistributionException(
6464
String.format(
@@ -72,10 +72,12 @@ public static Bitmap readScaledImage(ContentResolver contentResolver, Uri uri, i
7272
options.inSampleSize =
7373
calculateInSampleSize(imageSize.width(), imageSize.height(), targetWidth, targetHeight);
7474
// Get a fresh input stream because we've exhausted the last one
75-
return BitmapFactory.decodeStream(waitForInputStream(contentResolver, uri), /* outPadding= */ null, options);
75+
return BitmapFactory.decodeStream(
76+
waitForInputStream(contentResolver, uri), /* outPadding= */ null, options);
7677
}
7778

78-
private static InputStream waitForInputStream(ContentResolver contentResolver, Uri uri) throws FirebaseAppDistributionException {
79+
private static InputStream waitForInputStream(ContentResolver contentResolver, Uri uri)
80+
throws FirebaseAppDistributionException {
7981
LogWrapper.getInstance().d(TAG, "Trying to read screenshot from URI: " + uri);
8082
for (int i = 0; i < MAX_IMAGE_READ_RETRIES; i++) {
8183
try {
@@ -85,18 +87,22 @@ private static InputStream waitForInputStream(ContentResolver contentResolver, U
8587
try {
8688
Thread.sleep(IMAGE_READ_RETRY_SLEEP_MS);
8789
} catch (InterruptedException ex) {
88-
throw new FirebaseAppDistributionException("Interrupted while waiting for screenshot to become available", Status.UNKNOWN);
90+
throw new FirebaseAppDistributionException(
91+
"Interrupted while waiting for screenshot to become available", Status.UNKNOWN);
8992
}
9093
}
9194
}
92-
throw new FirebaseAppDistributionException("Timed out waiting for screenshot to be readable.", Status.UNKNOWN);
95+
throw new FirebaseAppDistributionException(
96+
"Timed out waiting for screenshot to be readable.", Status.UNKNOWN);
9397
}
9498

95-
private static InputStream getInputStream(ContentResolver contentResolver, Uri uri) throws FirebaseAppDistributionException {
99+
private static InputStream getInputStream(ContentResolver contentResolver, Uri uri)
100+
throws FirebaseAppDistributionException {
96101
try {
97102
return contentResolver.openInputStream(uri);
98103
} catch (FileNotFoundException e) {
99-
throw new FirebaseAppDistributionException(String.format("Could not read screenshot from URI %s", uri), Status.UNKNOWN, e);
104+
throw new FirebaseAppDistributionException(
105+
String.format("Could not read screenshot from URI %s", uri), Status.UNKNOWN, e);
100106
}
101107
}
102108

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ScreenshotTaker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ private Task<Uri> writeToFile(Bitmap bitmap) {
109109
throw new FirebaseAppDistributionException(
110110
"Failed to write screenshot to storage", Status.UNKNOWN, e);
111111
}
112-
return Uri.fromFile(firebaseApp.getApplicationContext()
113-
.getFileStreamPath(SCREENSHOT_FILE_NAME));
112+
return Uri.fromFile(
113+
firebaseApp.getApplicationContext().getFileStreamPath(SCREENSHOT_FILE_NAME));
114114
});
115115
}
116116

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiHttpClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
import android.content.Context;
1818
import android.content.pm.PackageManager;
19-
import android.net.Uri;
20-
2119
import androidx.annotation.NonNull;
2220
import androidx.annotation.VisibleForTesting;
2321
import com.google.android.gms.common.util.AndroidUtilsLight;
@@ -26,8 +24,6 @@
2624
import com.google.firebase.appdistribution.FirebaseAppDistributionException;
2725
import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
2826
import java.io.ByteArrayOutputStream;
29-
import java.io.File;
30-
import java.io.FileInputStream;
3127
import java.io.IOException;
3228
import java.io.InputStream;
3329
import java.io.OutputStream;

‎firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionServiceImplTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public void setup() throws FirebaseAppDistributionException {
192192

193193
activity = spy(Robolectric.buildActivity(TestActivity.class).create().get());
194194
TestUtils.mockForegroundActivity(mockLifecycleNotifier, activity);
195-
when(mockScreenshotTaker.takeScreenshot())
196-
.thenReturn(Tasks.forResult(TEST_SCREENSHOT_URI));
195+
when(mockScreenshotTaker.takeScreenshot()).thenReturn(Tasks.forResult(TEST_SCREENSHOT_URI));
197196
}
198197

199198
@Test

‎firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClientTest.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@
3434
import com.google.firebase.inject.Provider;
3535
import com.google.firebase.installations.FirebaseInstallationsApi;
3636
import com.google.firebase.installations.InstallationTokenResult;
37-
import java.io.File;
3837
import java.io.FileInputStream;
3938
import java.io.FileNotFoundException;
4039
import java.io.InputStream;
41-
4240
import org.json.JSONException;
4341
import org.json.JSONObject;
4442
import org.junit.Before;
@@ -395,25 +393,24 @@ public void attachScreenshot_whenResponseSuccessful_makesPostRequestAndReturnsFe
395393
throws Exception {
396394
InputStream inputStream =
397395
new FileInputStream(
398-
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
396+
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
399397

400398
Task<String> task =
401399
firebaseAppDistributionTesterApiClient.attachScreenshot(FEEDBACK_NAME, inputStream);
402400
String result = awaitTask(task);
403401

404402
assertThat(result).isEqualTo(FEEDBACK_NAME);
405403
verify(mockTesterApiHttpClient)
406-
.makeUploadRequest(
407-
any(), eq(ATTACH_SCREENSHOT_PATH), eq(TEST_AUTH_TOKEN), eq(inputStream));
404+
.makeUploadRequest(any(), eq(ATTACH_SCREENSHOT_PATH), eq(TEST_AUTH_TOKEN), eq(inputStream));
408405
}
409406

410407
@Test
411408
public void attachScreenshot_getFidError_throwsError() throws FileNotFoundException {
412409
Exception expectedException = new Exception("test ex");
413410
when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
414411
InputStream inputStream =
415-
new FileInputStream(
416-
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
412+
new FileInputStream(
413+
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
417414

418415
Task<String> task =
419416
firebaseAppDistributionTesterApiClient.attachScreenshot(FEEDBACK_NAME, inputStream);
@@ -427,8 +424,8 @@ public void attachScreenshot_getFisAuthTokenError_throwsError() throws FileNotFo
427424
when(mockFirebaseInstallations.getToken(false))
428425
.thenReturn(Tasks.forException(expectedException));
429426
InputStream inputStream =
430-
new FileInputStream(
431-
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
427+
new FileInputStream(
428+
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
432429

433430
Task<String> task =
434431
firebaseAppDistributionTesterApiClient.attachScreenshot(FEEDBACK_NAME, inputStream);
@@ -442,8 +439,8 @@ public void attachScreenshot_whenClientThrowsException_failsTask() throws Except
442439
any(), eq(ATTACH_SCREENSHOT_PATH), eq(TEST_AUTH_TOKEN), any()))
443440
.thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
444441
InputStream inputStream =
445-
new FileInputStream(
446-
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
442+
new FileInputStream(
443+
ApplicationProvider.getApplicationContext().getFileStreamPath("test.png"));
447444

448445
Task<String> task =
449446
firebaseAppDistributionTesterApiClient.attachScreenshot(FEEDBACK_NAME, inputStream);

0 commit comments

Comments
 (0)