Skip to content

Commit ee4b181

Browse files
authored
Merge pull request #506 from anipp100/lambda-runnable
Use lambda for standalone Runnables
2 parents a4f7515 + 75b4aa5 commit ee4b181

File tree

6 files changed

+19
-70
lines changed

6 files changed

+19
-70
lines changed

zxing-android-embedded/src/com/google/zxing/client/android/AmbientLightManager.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,7 @@ public void stop() {
7171
}
7272

7373
private void setTorch(final boolean on) {
74-
handler.post(new Runnable() {
75-
@Override
76-
public void run() {
77-
cameraManager.setTorch(on);
78-
}
79-
});
74+
handler.post(() -> cameraManager.setTorch(on));
8075
}
8176

8277
@Override

zxing-android-embedded/src/com/google/zxing/client/android/InactivityTimer.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,7 @@ public void onReceive(Context context, Intent intent) {
108108
// 0 indicates that we're on battery
109109
final boolean onBatteryNow = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) <= 0;
110110
// post on handler to run in main thread
111-
handler.post(new Runnable() {
112-
@Override
113-
public void run() {
114-
onBattery(onBatteryNow);
115-
}
116-
});
111+
handler.post(() -> onBattery(onBatteryNow));
117112
}
118113
}
119114
}

zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,7 @@ public boolean handleMessage(Message message) {
220220
@Override
221221
public void onRotationChanged(int rotation) {
222222
// Make sure this is run on the main thread.
223-
stateHandler.postDelayed(new Runnable() {
224-
@Override
225-
public void run() {
226-
rotationChanged();
227-
}
228-
}, ROTATION_LISTENER_DELAY_MS);
223+
stateHandler.postDelayed(() -> rotationChanged(), ROTATION_LISTENER_DELAY_MS);
229224
}
230225
};
231226

zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureManager.java

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,7 @@ public void barcodeResult(final BarcodeResult result) {
7676
barcodeView.pause();
7777
beepManager.playBeepSoundAndVibrate();
7878

79-
handler.post(new Runnable() {
80-
@Override
81-
public void run() {
82-
returnResult(result);
83-
}
84-
});
85-
79+
handler.post(() -> returnResult(result));
8680
}
8781

8882
@Override
@@ -128,12 +122,9 @@ public CaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
128122

129123
handler = new Handler();
130124

131-
inactivityTimer = new InactivityTimer(activity, new Runnable() {
132-
@Override
133-
public void run() {
134-
Log.d(TAG, "Finishing due to inactivity");
135-
finish();
136-
}
125+
inactivityTimer = new InactivityTimer(activity, () -> {
126+
Log.d(TAG, "Finishing due to inactivity");
127+
finish();
137128
});
138129

139130
beepManager = new BeepManager(activity);
@@ -172,13 +163,7 @@ public void initializeFromIntent(Intent intent, Bundle savedInstanceState) {
172163
}
173164

174165
if (intent.hasExtra(Intents.Scan.TIMEOUT)) {
175-
Runnable runnable = new Runnable() {
176-
@Override
177-
public void run() {
178-
returnResultTimeout();
179-
}
180-
};
181-
handler.postDelayed(runnable, intent.getLongExtra(Intents.Scan.TIMEOUT, 0L));
166+
handler.postDelayed(this::returnResultTimeout, intent.getLongExtra(Intents.Scan.TIMEOUT, 0L));
182167
}
183168

184169
if (intent.getBooleanExtra(Intents.Scan.BARCODE_IMAGE_ENABLED, false)) {

zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/AutoFocusManager.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ public boolean handleMessage(Message msg) {
6464
private final Camera.AutoFocusCallback autoFocusCallback = new Camera.AutoFocusCallback() {
6565
@Override
6666
public void onAutoFocus(boolean success, Camera theCamera) {
67-
handler.post(new Runnable() {
68-
@Override
69-
public void run() {
70-
focusing = false;
71-
autoFocusAgainLater();
72-
}
67+
handler.post(() -> {
68+
focusing = false;
69+
autoFocusAgainLater();
7370
});
7471
}
7572
};

zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraInstance.java

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,7 @@ public void setTorch(final boolean on) {
138138
Util.validateMainThread();
139139

140140
if (open) {
141-
cameraThread.enqueue(new Runnable() {
142-
@Override
143-
public void run() {
144-
cameraManager.setTorch(on);
145-
}
146-
});
141+
cameraThread.enqueue(() -> cameraManager.setTorch(on));
147142
}
148143
}
149144

@@ -156,12 +151,7 @@ public void changeCameraParameters(final CameraParametersCallback callback) {
156151
Util.validateMainThread();
157152

158153
if (open) {
159-
cameraThread.enqueue(new Runnable() {
160-
@Override
161-
public void run() {
162-
cameraManager.changeCameraParameters(callback);
163-
}
164-
});
154+
cameraThread.enqueue(() -> cameraManager.changeCameraParameters(callback));
165155
}
166156
}
167157

@@ -186,21 +176,13 @@ public boolean isCameraClosed() {
186176
}
187177

188178
public void requestPreview(final PreviewCallback callback) {
189-
mainHandler.post(new Runnable() {
190-
@Override
191-
public void run() {
192-
if(!open) {
193-
Log.d(TAG, "Camera is closed, not requesting preview");
194-
return;
195-
}
196-
197-
cameraThread.enqueue(new Runnable() {
198-
@Override
199-
public void run() {
200-
cameraManager.requestPreviewFrame(callback);
201-
}
202-
});
179+
mainHandler.post(() -> {
180+
if(!open) {
181+
Log.d(TAG, "Camera is closed, not requesting preview");
182+
return;
203183
}
184+
185+
cameraThread.enqueue(() -> cameraManager.requestPreviewFrame(callback));
204186
});
205187
}
206188

0 commit comments

Comments
 (0)