Skip to content

Commit 3883053

Browse files
KazuCocoadpgraham
KazuCocoa
authored and
dpgraham
committed
Make compatible with SDK 29 (#34)
1 parent e92e653 commit 3883053

20 files changed

+278
-216
lines changed

‎app/build.gradle

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 19
5-
buildToolsVersion "27.0.3"
4+
compileSdkVersion 28
5+
buildToolsVersion "28.0.3"
66

77
defaultConfig {
88
applicationId "io.appium.android.apis"
9-
minSdkVersion 4
10-
targetSdkVersion 19
9+
minSdkVersion 17
10+
targetSdkVersion 28
1111

12-
versionCode 2
13-
versionName '3.0.0'
12+
versionCode 17
13+
versionName '4.0.0'
1414

1515
testApplicationId "io.appium.android.apis.test"
1616
testInstrumentationRunner ".app.LocalSampleInstrumentation"
1717
}
1818

19+
dependencies {
20+
implementation 'androidx.appcompat:appcompat:1.0.2'
21+
}
22+
1923
buildTypes {
2024
release {
2125
minifyEnabled false

‎app/src/main/AndroidManifest.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
own application, the package name must be changed from "com.example.*"
2121
to come from a domain that you own or have control over. -->
2222
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23+
xmlns:tools="http://schemas.android.com/tools"
2324
package="io.appium.android.apis">
2425

2526
<uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -36,19 +37,20 @@
3637
<!-- For android.media.audiofx.Visualizer -->
3738
<uses-permission android:name="android.permission.RECORD_AUDIO" />
3839

39-
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19" />
40-
4140
<!-- We will request access to the camera, saying we require a camera
4241
of some sort but not one with autofocus capability. -->
4342
<uses-permission android:name="android.permission.CAMERA" />
4443
<uses-feature android:name="android.hardware.camera" />
4544
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
4645

47-
<application android:name="ApiDemosApplication"
48-
android:label="@string/activity_sample_code"
49-
android:icon="@drawable/app_sample_code"
50-
android:hardwareAccelerated="true"
51-
android:supportsRtl="true">
46+
<application
47+
android:name="ApiDemosApplication"
48+
android:label="@string/activity_sample_code"
49+
android:icon="@drawable/app_sample_code"
50+
android:hardwareAccelerated="true"
51+
android:supportsRtl="true"
52+
tools:ignore="GoogleAppIndexingWarning"
53+
android:allowBackup="false">
5254

5355
<!-- This is how we can request a library but still allow the app
5456
to be installed if it doesn't exist. -->

‎app/src/main/java/io/appium/android/apis/app/AlarmService_Service.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818

1919
// Need the following import to get access to the app resources, since this
2020
// class is in a sub-package.
21+
import androidx.core.app.NotificationCompat;
2122
import io.appium.android.apis.R;
2223

2324
import android.app.Notification;
2425
import android.app.NotificationManager;
2526
import android.app.PendingIntent;
2627
import android.app.Service;
28+
import android.content.Context;
2729
import android.content.Intent;
2830
import android.os.Binder;
2931
import android.os.IBinder;
@@ -98,19 +100,18 @@ public IBinder onBind(Intent intent) {
98100
private void showNotification() {
99101
// In this sample, we'll use the same text for the ticker and the expanded notification
100102
CharSequence text = getText(R.string.alarm_service_started);
101-
102-
// Set the icon, scrolling text and timestamp
103-
Notification notification = new Notification(R.drawable.stat_sample, text,
104-
System.currentTimeMillis());
105-
106103
// The PendingIntent to launch our activity if the user selects this notification
107104
PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
108105
new Intent(this, AlarmService.class), 0);
109-
110106
// Set the info for the views that show in the notification panel.
111-
notification.setLatestEventInfo(this, getText(R.string.alarm_service_label),
112-
text, contentIntent);
113-
107+
Notification notification = new Notification.Builder(this)
108+
.setSmallIcon(R.drawable.stat_sample) // the status icon
109+
.setTicker(text) // the status text
110+
.setWhen(System.currentTimeMillis()) // the time stamp
111+
.setContentTitle(getText(R.string.alarm_service_label)) // the label of the entry
112+
.setContentText(text) // the contents of the entry
113+
.setContentIntent(contentIntent) // The intent to send when the entry is clicked
114+
.build();
114115
// Send the notification.
115116
// We use a layout id because it is a unique number. We use it later to cancel.
116117
mNM.notify(R.string.alarm_service_started, notification);

‎app/src/main/java/io/appium/android/apis/app/ForegroundService.java

+62-40
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616

1717
package io.appium.android.apis.app;
1818

19+
import android.annotation.SuppressLint;
1920
import android.app.Activity;
2021
import android.app.Notification;
2122
import android.app.NotificationManager;
2223
import android.app.PendingIntent;
2324
import android.app.Service;
2425
import android.content.Intent;
26+
import android.os.Build;
2527
import android.os.Bundle;
28+
import android.os.Handler;
2629
import android.os.IBinder;
30+
import android.os.PowerManager;
2731
import android.util.Log;
2832
import android.view.View;
2933
import android.view.View.OnClickListener;
@@ -46,24 +50,34 @@
4650
*/
4751
public class ForegroundService extends Service {
4852
static final String ACTION_FOREGROUND = "io.appium.android.apis.FOREGROUND";
53+
static final String ACTION_FOREGROUND_WAKELOCK = "io.appium.android.apis.FOREGROUND_WAKELOCK";
4954
static final String ACTION_BACKGROUND = "io.appium.android.apis.BACKGROUND";
50-
55+
static final String ACTION_BACKGROUND_WAKELOCK = "io.appium.android.apis.BACKGROUND_WAKELOCK";
56+
57+
private PowerManager.WakeLock mWakeLock;
58+
private Handler mHandler = new Handler();
59+
private Runnable mPulser = new Runnable() {
60+
@Override public void run() {
61+
Log.i("ForegroundService", "PULSE!");
62+
mHandler.postDelayed(this, 5*1000);
63+
}
64+
};
5165

5266
private static final Class<?>[] mSetForegroundSignature = new Class[] {
5367
boolean.class};
5468
private static final Class<?>[] mStartForegroundSignature = new Class[] {
5569
int.class, Notification.class};
5670
private static final Class<?>[] mStopForegroundSignature = new Class[] {
5771
boolean.class};
58-
72+
5973
private NotificationManager mNM;
6074
private Method mSetForeground;
6175
private Method mStartForeground;
6276
private Method mStopForeground;
6377
private Object[] mSetForegroundArgs = new Object[1];
6478
private Object[] mStartForegroundArgs = new Object[2];
6579
private Object[] mStopForegroundArgs = new Object[1];
66-
80+
6781
void invokeMethod(Method method, Object[] args) {
6882
try {
6983
method.invoke(this, args);
@@ -75,7 +89,7 @@ void invokeMethod(Method method, Object[] args) {
7589
Log.w("ApiDemos", "Unable to invoke method", e);
7690
}
7791
}
78-
92+
7993
/**
8094
* This is a wrapper around the new startForeground method, using the older
8195
* APIs if it is not available.
@@ -88,13 +102,13 @@ void startForegroundCompat(int id, Notification notification) {
88102
invokeMethod(mStartForeground, mStartForegroundArgs);
89103
return;
90104
}
91-
105+
92106
// Fall back on the old API.
93107
mSetForegroundArgs[0] = Boolean.TRUE;
94108
invokeMethod(mSetForeground, mSetForegroundArgs);
95109
mNM.notify(id, notification);
96110
}
97-
111+
98112
/**
99113
* This is a wrapper around the new stopForeground method, using the older
100114
* APIs if it is not available.
@@ -106,14 +120,14 @@ void stopForegroundCompat(int id) {
106120
invokeMethod(mStopForeground, mStopForegroundArgs);
107121
return;
108122
}
109-
123+
110124
// Fall back on the old API. Note to cancel BEFORE changing the
111125
// foreground state, since we could be killed at that point.
112126
mNM.cancel(id);
113127
mSetForegroundArgs[0] = Boolean.FALSE;
114128
invokeMethod(mSetForeground, mSetForegroundArgs);
115129
}
116-
130+
117131
@Override
118132
public void onCreate() {
119133
mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
@@ -144,57 +158,65 @@ public void onDestroy() {
144158

145159

146160

147-
// This is the old onStart method that will be called on the pre-2.0
148-
// platform. On 2.0 or later we override onStartCommand() so this
149-
// method will not be called.
150-
@Override
151-
public void onStart(Intent intent, int startId) {
152-
handleCommand(intent);
153-
}
154-
161+
@SuppressLint("InvalidWakeLockTag")
155162
@Override
156163
public int onStartCommand(Intent intent, int flags, int startId) {
157-
handleCommand(intent);
158-
// We want this service to continue running until it is explicitly
159-
// stopped, so return sticky.
160-
return START_STICKY;
161-
}
162-
163-
164-
void handleCommand(Intent intent) {
165-
if (ACTION_FOREGROUND.equals(intent.getAction())) {
164+
if (ACTION_FOREGROUND.equals(intent.getAction())
165+
|| ACTION_FOREGROUND_WAKELOCK.equals(intent.getAction())) {
166166
// In this sample, we'll use the same text for the ticker and the expanded notification
167167
CharSequence text = getText(R.string.foreground_service_started);
168-
169-
// Set the icon, scrolling text and timestamp
170-
Notification notification = new Notification(R.drawable.stat_sample, text,
171-
System.currentTimeMillis());
172-
173-
// The PendingIntent to launch our activity if the user selects this notification
174168
PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
175169
new Intent(this, Controller.class), 0);
176-
177170
// Set the info for the views that show in the notification panel.
178-
notification.setLatestEventInfo(this, getText(R.string.local_service_label),
179-
text, contentIntent);
180-
171+
Notification notification = new Notification.Builder(this)
172+
.setSmallIcon(R.drawable.stat_sample) // the status icon
173+
.setTicker(text) // the status text
174+
.setWhen(System.currentTimeMillis()) // the time stamp
175+
.setContentTitle(getText(R.string.alarm_service_label)) // the label
176+
.setContentText(text) // the contents of the entry
177+
.setContentIntent(contentIntent) // The intent to send when clicked
178+
.build();
181179
startForegroundCompat(R.string.foreground_service_started, notification);
182-
183-
} else if (ACTION_BACKGROUND.equals(intent.getAction())) {
180+
} else if (ACTION_BACKGROUND.equals(intent.getAction())
181+
|| ACTION_BACKGROUND_WAKELOCK.equals(intent.getAction())) {
184182
stopForegroundCompat(R.string.foreground_service_started);
185183
}
184+
if (ACTION_FOREGROUND_WAKELOCK.equals(intent.getAction())
185+
|| ACTION_BACKGROUND_WAKELOCK.equals(intent.getAction())) {
186+
if (mWakeLock == null) {
187+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
188+
mWakeLock = getSystemService(PowerManager.class).newWakeLock(
189+
PowerManager.PARTIAL_WAKE_LOCK, "wake-service");
190+
mWakeLock.acquire();
191+
}
192+
} else {
193+
releaseWakeLock();
194+
}
195+
}
196+
mHandler.removeCallbacks(mPulser);
197+
mPulser.run();
198+
// We want this service to continue running until it is explicitly
199+
// stopped, so return sticky.
200+
return START_STICKY;
186201
}
187-
202+
203+
void releaseWakeLock() {
204+
if (mWakeLock != null) {
205+
mWakeLock.release();
206+
mWakeLock = null;
207+
}
208+
}
209+
188210
@Override
189211
public IBinder onBind(Intent intent) {
190212
return null;
191213
}
192-
214+
193215
// ----------------------------------------------------------------------
194216

195217
/**
196218
* <p>Example of explicitly starting and stopping the {@link ForegroundService}.
197-
*
219+
*
198220
* <p>Note that this is implemented as an inner class only keep the sample
199221
* all together; typically this code would appear in some separate class.
200222
*/

0 commit comments

Comments
 (0)