Skip to content

Commit 31a6cdb

Browse files
jonasorelandjonasoreland
committed
review
1 parent 258d9d1 commit 31a6cdb

3 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎wear/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<activity
3636
android:exported="true"
3737
android:name=".view.MainActivity"
38-
android:launchMode="singleTop"
38+
android:launchMode="singleTop"
3939
tools:ignore="WearRecents">
4040
<intent-filter>
4141
<action android:name="android.intent.action.MAIN" />

‎wear/src/main/java/org/runnerup/service/StateService.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void onConnectionFailed(@NonNull ConnectionResult result) {}
9090
mGoogleApiClient.connect();
9191
this.headers.registerChangeListener(this);
9292

93-
Log.i(TAG, "StateService.onCreate()");
93+
Log.d(TAG, "StateService.onCreate()");
9494
}
9595

9696
private String checkConnection() {
@@ -100,7 +100,7 @@ private String checkConnection() {
100100
return "mGoogleApiClient="
101101
+ mGoogleApiClient
102102
+ ", isConnected="
103-
+ mGoogleApiClient.isConnected()
103+
+ (mGoogleApiClient != null ? mGoogleApiClient.isConnected(): false)
104104
+ ", phoneNode="
105105
+ phoneNode;
106106
}
@@ -116,7 +116,7 @@ private void readData(boolean force) {
116116
dataItem -> {
117117
if (dataItem != null) {
118118
phoneNode = dataItem.getUri().getHost();
119-
Log.i(TAG, "getDataItem => phoneNode:" + phoneNode);
119+
Log.d(TAG, "getDataItem => phoneNode:" + phoneNode);
120120
}
121121
});
122122
}
@@ -157,7 +157,7 @@ private void clearData() {
157157

158158
@Override
159159
public void onDestroy() {
160-
Log.i(TAG, "StateService.onDestroy()");
160+
Log.d(TAG, "StateService.onDestroy()");
161161
trackerState.clearListeners();
162162
if (mGoogleApiClient != null) {
163163
if (mGoogleApiClient.isConnected()) {
@@ -217,7 +217,7 @@ public void onMessageReceived(MessageEvent messageEvent) {
217217
data = DataMap.fromByteArray(messageEvent.getData()).toBundle();
218218
data.putLong(UPDATE_TIME, System.currentTimeMillis());
219219
} else {
220-
Log.i(TAG, "onMessageReceived: " + messageEvent);
220+
Log.d(TAG, "onMessageReceived: " + messageEvent);
221221
}
222222
}
223223

@@ -232,7 +232,7 @@ public void onDataChanged(DataEventBuffer dataEvents) {
232232
} else if (Constants.Wear.Path.TRACKER_STATE.contentEquals(path)) {
233233
setTrackerState(ev);
234234
} else {
235-
Log.i(TAG, "onDataChanged: " + ev.getDataItem().getUri());
235+
Log.d(TAG, "onDataChanged: " + ev.getDataItem().getUri());
236236
readDataIfMissing();
237237
}
238238
}
@@ -241,10 +241,10 @@ public void onDataChanged(DataEventBuffer dataEvents) {
241241
private void setPhoneNode(DataEvent ev) {
242242
if (ev.getType() == DataEvent.TYPE_CHANGED && Objects.requireNonNull(ev.getDataItem().getData()).length > 0) {
243243
phoneNode = new String(ev.getDataItem().getData());
244-
Log.i(TAG, "onDataChanged: " + ev.getDataItem().getUri() + ", phoneNode=" + phoneNode);
244+
Log.d(TAG, "onDataChanged: " + ev.getDataItem().getUri() + ", phoneNode=" + phoneNode);
245245
readDataIfMissing();
246246
} else if (ev.getType() == DataEvent.TYPE_DELETED) {
247-
Log.i(TAG, "onDataChanged: " + ev.getDataItem().getUri() + ", phoneNode=null");
247+
Log.d(TAG, "onDataChanged: " + ev.getDataItem().getUri() + ", phoneNode=null");
248248
phoneNode = null;
249249
resetState();
250250
}
@@ -254,26 +254,26 @@ private void setHeaders(DataEvent ev) {
254254
if (ev.getType() == DataEvent.TYPE_CHANGED) {
255255
Bundle b = DataMapItem.fromDataItem(ev.getDataItem()).getDataMap().toBundle();
256256
b.putLong(UPDATE_TIME, System.currentTimeMillis());
257-
Log.i(TAG, "setHeaders(): b=" + b);
257+
Log.d(TAG, "setHeaders(): b=" + b);
258258
headers.set(b);
259259
readDataIfMissing();
260260
} else {
261-
Log.i(TAG, "onDataChanged: " + ev.getDataItem().getUri() + ", headers=null");
261+
Log.d(TAG, "onDataChanged: " + ev.getDataItem().getUri() + ", headers=null");
262262
headers.set(null);
263263
resetState();
264264
}
265265
}
266266

267267
public static TrackerState getTrackerStateFromDataItem(DataItem dataItem) {
268268
if (!dataItem.isDataValid()) {
269-
Log.i(TAG, "onDataChanged: " + dataItem.getUri() + ", dataItem.isDataValid() == false");
269+
Log.d(TAG, "onDataChanged: " + dataItem.getUri() + ", dataItem.isDataValid() == false");
270270
return null;
271271
}
272272

273273
Bundle b = DataMap.fromByteArray(dataItem.getData()).toBundle();
274274
if (b.containsKey(Constants.Wear.TrackerState.STATE)) {
275275
var state = TrackerState.valueOf(b.getInt(Constants.Wear.TrackerState.STATE));
276-
Log.i(TAG, "onDataChanged: " + dataItem.getUri() + ", tracketState=" + state);
276+
Log.d(TAG, "onDataChanged: " + dataItem.getUri() + ", trackerState=" + state);
277277
return state;
278278
}
279279
return null;
@@ -328,7 +328,7 @@ public void unregisterHeadersListener(MainActivity listener) {
328328
public void sendStart() {
329329
var msg = checkConnection();
330330
if (msg != null) {
331-
Log.i(TAG, "sendStart => not connected: " + msg);
331+
Log.d(TAG, "sendStart => not connected: " + msg);
332332
return;
333333
}
334334

@@ -339,7 +339,7 @@ public void sendStart() {
339339
public void sendPauseResume() {
340340
var msg = checkConnection();
341341
if (msg != null) {
342-
Log.i(TAG, "sendPauseResume => not connected: " + msg);
342+
Log.d(TAG, "sendPauseResume => not connected: " + msg);
343343
return;
344344
}
345345

@@ -355,7 +355,7 @@ public void sendPauseResume() {
355355
public void sendNewLap() {
356356
var msg = checkConnection();
357357
if (msg != null) {
358-
Log.i(TAG, "sendNewLap => not connected: " + msg);
358+
Log.d(TAG, "sendNewLap => not connected: " + msg);
359359
return;
360360
}
361361

‎wear/src/main/java/org/runnerup/view/MainActivity.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class MainActivity extends Activity
6969
@Override
7070
protected void onCreate(Bundle savedInstanceState) {
7171
super.onCreate(savedInstanceState);
72-
Log.i(TAG, "onCreate");
72+
Log.d(TAG, "onCreate");
7373
setContentView(R.layout.activity_main);
7474
pager = findViewById(R.id.pager);
7575
FragmentGridPagerAdapter pageAdapter = new PagerAdapter(getFragmentManager());
@@ -112,7 +112,7 @@ private void requestPostNotificationsPermission() {
112112
}
113113

114114
// Permission is needed and not yet granted
115-
Log.i(getClass().getSimpleName(),
115+
Log.d(getClass().getSimpleName(),
116116
"POST_NOTIFICATIONS permission is not granted. Launching RequestPermissionActivity.");
117117

118118
// Prepare and launch the activity responsible for handling the permission request
@@ -126,7 +126,7 @@ private void requestPostNotificationsPermission() {
126126
@Override
127127
protected void onResume() {
128128
super.onResume();
129-
Log.i(TAG, "onResume");
129+
Log.d(TAG, "onResume");
130130
mIsBound =
131131
getApplicationContext()
132132
.bindService(
@@ -151,14 +151,14 @@ void putDataItem(String path, boolean value) {
151151
@Override
152152
protected void onPause() {
153153
super.onPause();
154-
Log.i(TAG, "onPause");
154+
Log.d(TAG, "onPause");
155155
putDataItem(Constants.Wear.Path.WEAR_APP, false);
156156
}
157157

158158
@Override
159159
protected void onDestroy() {
160160
super.onDestroy();
161-
Log.i(TAG, "onDestroy");
161+
Log.d(TAG, "onDestroy");
162162
if (mStateService != null) {
163163
mStateService.unregisterTrackerStateListener(this);
164164
mStateService.unregisterHeadersListener(this);
@@ -269,12 +269,12 @@ private void update(TrackerState newValue) {
269269
private int getRowsForScreen(int col) {
270270
Bundle b = headers.get();
271271
if (b == null) {
272-
Log.i(TAG, "getRowsForScreen(): headers == null");
272+
Log.d(TAG, "getRowsForScreen(): headers == null");
273273
return 1;
274274
}
275275
ArrayList<Integer> screens = b.getIntegerArrayList(Wear.RunInfo.SCREENS);
276276
if (screens == null) {
277-
Log.i(TAG, "getRowsForScreen(): screens == null");
277+
Log.d(TAG, "getRowsForScreen(): screens == null");
278278
return 1;
279279
}
280280
if (col > screens.size()) return 1;
@@ -284,12 +284,12 @@ private int getRowsForScreen(int col) {
284284
private int getScreensCount() {
285285
Bundle b = headers.get();
286286
if (b == null) {
287-
Log.i(TAG, "getScreensCount(): headers == null");
287+
Log.d(TAG, "getScreensCount(): headers == null");
288288
return 1;
289289
}
290290
ArrayList<Integer> screens = b.getIntegerArrayList(Wear.RunInfo.SCREENS);
291291
if (screens == null) {
292-
Log.i(TAG, "getScreensCount(): screens == null");
292+
Log.d(TAG, "getScreensCount(): screens == null");
293293
return 1;
294294
}
295295
return screens.size();
@@ -330,7 +330,7 @@ private void scrollRight() {
330330
new ServiceConnection() {
331331
@Override
332332
public void onServiceConnected(ComponentName name, IBinder service) {
333-
Log.i(TAG, "onServiceConnected: mStateService==" + mStateService);
333+
Log.d(TAG, "onServiceConnected: mStateService==" + mStateService);
334334
if (mStateService == null) {
335335
mStateService = ((StateService.LocalBinder) service).getService();
336336
mStateService.registerTrackerStateListener(MainActivity.this);

0 commit comments

Comments
 (0)