Suppress most deprecation warnings due to old camera API; remove call to old cookie manager

This commit is contained in:
Sean Owen 2017-02-20 12:35:00 -08:00
parent 0ec5b9a260
commit 484ff7edcf
12 changed files with 11 additions and 8 deletions

View file

@ -16,7 +16,6 @@
package com.google.zxing.client.android.camera; package com.google.zxing.client.android.camera;
import android.annotation.TargetApi;
import android.graphics.Point; import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
import android.hardware.Camera; import android.hardware.Camera;
@ -37,7 +36,7 @@ import java.util.regex.Pattern;
* *
* @author Sean Owen * @author Sean Owen
*/ */
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) @SuppressWarnings("deprecation") // camera APIs
public final class CameraConfigurationUtils { public final class CameraConfigurationUtils {
private static final String TAG = "CameraConfiguration"; private static final String TAG = "CameraConfiguration";

View file

@ -24,8 +24,6 @@ import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
@ -92,10 +90,6 @@ public final class SearchBookContentsActivity extends Activity {
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
// Make sure that expired cookies are removed on launch.
CookieSyncManager.createInstance(this);
CookieManager.getInstance().removeExpiredCookie();
Intent intent = getIntent(); Intent intent = getIntent();
if (intent == null || !Intents.SearchBookContents.ACTION.equals(intent.getAction())) { if (intent == null || !Intents.SearchBookContents.ACTION.equals(intent.getAction())) {
finish(); finish();

View file

@ -29,6 +29,7 @@ import java.util.concurrent.RejectedExecutionException;
import com.google.zxing.client.android.PreferencesActivity; import com.google.zxing.client.android.PreferencesActivity;
@SuppressWarnings("deprecation") // camera APIs
final class AutoFocusManager implements Camera.AutoFocusCallback { final class AutoFocusManager implements Camera.AutoFocusCallback {
private static final String TAG = AutoFocusManager.class.getSimpleName(); private static final String TAG = AutoFocusManager.class.getSimpleName();

View file

@ -34,6 +34,7 @@ import com.google.zxing.client.android.camera.open.OpenCamera;
* A class which deals with reading, parsing, and setting the camera parameters which are used to * A class which deals with reading, parsing, and setting the camera parameters which are used to
* configure the camera hardware. * configure the camera hardware.
*/ */
@SuppressWarnings("deprecation") // camera APIs
final class CameraConfigurationManager { final class CameraConfigurationManager {
private static final String TAG = "CameraConfiguration"; private static final String TAG = "CameraConfiguration";

View file

@ -36,6 +36,7 @@ import java.io.IOException;
* *
* @author dswitkin@google.com (Daniel Switkin) * @author dswitkin@google.com (Daniel Switkin)
*/ */
@SuppressWarnings("deprecation") // camera APIs
public final class CameraManager { public final class CameraManager {
private static final String TAG = CameraManager.class.getSimpleName(); private static final String TAG = CameraManager.class.getSimpleName();

View file

@ -22,6 +22,7 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.util.Log; import android.util.Log;
@SuppressWarnings("deprecation") // camera APIs
final class PreviewCallback implements Camera.PreviewCallback { final class PreviewCallback implements Camera.PreviewCallback {
private static final String TAG = PreviewCallback.class.getSimpleName(); private static final String TAG = PreviewCallback.class.getSimpleName();

View file

@ -21,6 +21,7 @@ import android.hardware.Camera;
/** /**
* Represents an open {@link Camera} and its metadata, like facing direction and orientation. * Represents an open {@link Camera} and its metadata, like facing direction and orientation.
*/ */
@SuppressWarnings("deprecation") // camera APIs
public final class OpenCamera { public final class OpenCamera {
private final int index; private final int index;

View file

@ -22,6 +22,7 @@ import android.util.Log;
/** /**
* Abstraction over the {@link Camera} API that helps open them and return their metadata. * Abstraction over the {@link Camera} API that helps open them and return their metadata.
*/ */
@SuppressWarnings("deprecation") // camera APIs
public final class OpenCameraInterface { public final class OpenCameraInterface {
private static final String TAG = OpenCameraInterface.class.getName(); private static final String TAG = OpenCameraInterface.class.getName();

View file

@ -45,6 +45,7 @@ import java.nio.charset.Charset;
/** /**
* Main test app activity. * Main test app activity.
*/ */
@SuppressWarnings("deprecation") // camera APIs
public final class ZXingTestActivity extends Activity { public final class ZXingTestActivity extends Activity {
private static final String TAG = ZXingTestActivity.class.getSimpleName(); private static final String TAG = ZXingTestActivity.class.getSimpleName();

View file

@ -24,6 +24,7 @@ import com.google.zxing.client.android.camera.CameraConfigurationUtils;
/** /**
* @author Sean Owen * @author Sean Owen
*/ */
@SuppressWarnings("deprecation") // camera APIs
final class CameraConfigurationManager { final class CameraConfigurationManager {
private static final String TAG = "CameraConfiguration"; private static final String TAG = "CameraConfiguration";

View file

@ -42,6 +42,7 @@ import java.io.IOException;
/** /**
* @author Sean Owen * @author Sean Owen
*/ */
@SuppressWarnings("deprecation") // camera APIs
public final class CaptureActivity extends Activity implements SurfaceHolder.Callback { public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
private static final String TAG = CaptureActivity.class.getSimpleName(); private static final String TAG = CaptureActivity.class.getSimpleName();

View file

@ -39,6 +39,7 @@ import java.util.concurrent.CountDownLatch;
/** /**
* @author Sean Owen * @author Sean Owen
*/ */
@SuppressWarnings("deprecation") // camera APIs
final class DecodeRunnable implements Runnable, Camera.PreviewCallback { final class DecodeRunnable implements Runnable, Camera.PreviewCallback {
private static final String TAG = DecodeRunnable.class.getSimpleName(); private static final String TAG = DecodeRunnable.class.getSimpleName();