Skip to content

Commit 001ec5d

Browse files
committed
Code format
1 parent 2d62411 commit 001ec5d

File tree

2 files changed

+39
-44
lines changed

2 files changed

+39
-44
lines changed

AndroidProject/app/src/main/java/com/kdg/toast/plugin/Bridge.java

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,17 @@
1010
import android.content.Intent;
1111
import android.content.SharedPreferences;
1212
import android.content.pm.PackageManager;
13-
import android.net.Uri;
1413
import android.os.Build;
15-
import android.os.PowerManager;
1614
import android.preference.PreferenceManager;
17-
import android.provider.Settings;
1815
import android.util.Log;
1916

2017
import java.util.Calendar;
2118
import java.util.Date;
22-
import java.util.Arrays;
2319

2420
import androidx.core.app.ActivityCompat;
2521
import androidx.core.content.ContextCompat;
2622

2723
import static android.Manifest.permission.ACTIVITY_RECOGNITION;
28-
import static androidx.core.app.ActivityCompat.requestPermissions;
2924

3025
public final class Bridge extends Application {
3126
static int summarySteps;
@@ -34,10 +29,10 @@ public final class Bridge extends Application {
3429
static Activity myActivity;
3530
static Context appContext;
3631
Date currentDate;
37-
static final String STEPS="steps";
38-
static final String SUMMARY_STEPS="summarySteps";
39-
static final String DATE="currentDate";
40-
static final String INIT_DATE="initialDate";
32+
static final String STEPS = "steps";
33+
static final String SUMMARY_STEPS = "summarySteps";
34+
static final String DATE = "currentDate";
35+
static final String INIT_DATE = "initialDate";
4136
public static final Intent[] POWERMANAGER_INTENTS = new Intent[]{
4237
new Intent().setComponent(new ComponentName("com.miui.securitycenter", "com.miui.permcenter.autostart.AutoStartManagementActivity")),
4338
new Intent().setComponent(new ComponentName("com.letv.android.letvsafe", "com.letv.android.letvsafe.AutobootManageActivity")),
@@ -57,8 +52,10 @@ public final class Bridge extends Application {
5752

5853
public static void ReceiveActivityInstance(Activity tempActivity) {
5954
myActivity = tempActivity;
60-
String[] perms= new String[1];
61-
perms[0]=Manifest.permission.ACTIVITY_RECOGNITION;
55+
String[] perms = new String[1];
56+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
57+
perms[0] = ACTIVITY_RECOGNITION;
58+
}
6259
if (ContextCompat.checkSelfPermission(myActivity, Manifest.permission.ACTIVITY_RECOGNITION)
6360
!= PackageManager.PERMISSION_GRANTED) {
6461
Log.i("PEDOMETER", "Permision isnt granted!");
@@ -90,57 +87,58 @@ public void onClick(DialogInterface dialog, int which) {
9087
}
9188
}
9289
start();
93-
}
94-
else{
90+
} else {
9591
start();
9692
}
9793
}
9894

99-
private static void start(){
95+
private static void start() {
10096
myActivity.startForegroundService(new Intent(myActivity, PedometerService.class));
10197

10298
}
103-
public static void StopService(){
99+
100+
public static void StopService() {
104101
Intent serviceIntent = new Intent(myActivity, PedometerService.class);
105102
myActivity.stopService(serviceIntent);
106-
107103
}
108-
public static int GetCurrentSteps(){
104+
105+
public static int GetCurrentSteps() {
109106
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
110107
SharedPreferences.Editor editor = sharedPreferences.edit();
111108
Date currentDate = Calendar.getInstance().getTime();
112109
editor.putString(DATE, currentDate.toString());
113110
int walkedSteps = sharedPreferences.getInt(STEPS, 0);
114-
int allSteps = sharedPreferences.getInt(SUMMARY_STEPS,0);
115-
summarySteps=walkedSteps+allSteps;
116-
Log.i("PEDOMETER", "FROM BRIDGE CLASS - GetCurrentSteps:"+summarySteps);
111+
int allSteps = sharedPreferences.getInt(SUMMARY_STEPS, 0);
112+
summarySteps = walkedSteps + allSteps;
113+
Log.i("PEDOMETER", "FROM BRIDGE CLASS - GetCurrentSteps:" + summarySteps);
117114
return summarySteps;
118115
}
119-
public static String SyncData(){
116+
117+
public static String SyncData() {
120118
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
121-
int stepsToSend=GetCurrentSteps();
122-
String firstDate = sharedPreferences.getString(INIT_DATE,"");
123-
String lastDate = sharedPreferences.getString(DATE,"");
124-
String data = firstDate+'#'+lastDate+'#'+stepsToSend;
119+
int stepsToSend = GetCurrentSteps();
120+
String firstDate = sharedPreferences.getString(INIT_DATE, "");
121+
String lastDate = sharedPreferences.getString(DATE, "");
122+
String data = firstDate + '#' + lastDate + '#' + stepsToSend;
125123
SharedPreferences.Editor editor = sharedPreferences.edit();
126-
editor.putInt(STEPS,0);
127-
editor.putInt(SUMMARY_STEPS,0);
128-
steps=0;
129-
summarySteps=0;
130-
initialSteps=0;
124+
editor.putInt(STEPS, 0);
125+
editor.putInt(SUMMARY_STEPS, 0);
126+
steps = 0;
127+
summarySteps = 0;
128+
initialSteps = 0;
131129
Date currentDate = Calendar.getInstance().getTime();
132-
editor.putString(INIT_DATE,currentDate.toString());
133-
editor.putString(DATE,currentDate.toString());
130+
editor.putString(INIT_DATE, currentDate.toString());
131+
editor.putString(DATE, currentDate.toString());
134132
editor.apply();
135-
Log.i("PEDOMETER", "SyncData: "+steps+' '+summarySteps+data);
133+
Log.i("PEDOMETER", "SyncData: " + steps + ' ' + summarySteps + data);
136134
return data;
137135
}
138136

139137

140138
@Override
141139
public void onCreate() {
142140
super.onCreate();
143-
Bridge.appContext=getApplicationContext();
141+
Bridge.appContext = getApplicationContext();
144142

145143
}
146144
}

AndroidProject/app/src/main/java/com/kdg/toast/plugin/PedometerService.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,13 @@ public IBinder onBind(Intent intent) {
4848
}
4949

5050
private void createNotificationChannel() {
51-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
52-
final NotificationChannel notificationChannel = new NotificationChannel(
53-
"PedometerLib",
54-
"Service Channel",
55-
NotificationManager.IMPORTANCE_DEFAULT
56-
);
57-
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
58-
notificationManager.createNotificationChannel(notificationChannel);
59-
}
51+
final NotificationChannel notificationChannel = new NotificationChannel(
52+
"PedometerLib",
53+
"Service Channel",
54+
NotificationManager.IMPORTANCE_DEFAULT
55+
);
56+
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
57+
notificationManager.createNotificationChannel(notificationChannel);
6058
}
6159

6260
private void startNotification(){
@@ -73,7 +71,6 @@ private void startNotification(){
7371
startForeground(112, notification);
7472
}
7573

76-
7774
@Override
7875
public void onCreate() {
7976
Log.i(TAG, "onCreate: CREATED"+Bridge.steps);

0 commit comments

Comments
 (0)