Skip to content

Commit ddd79c4

Browse files
author
Chris Bellew
committed
Added custom Logger class. Added exception handling to PlexClient.getNumericVersion.
1 parent 6661140 commit ddd79c4

File tree

9 files changed

+200
-174
lines changed

9 files changed

+200
-174
lines changed

‎src/com/atomjack/vcfpht/GDMService.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.net.DhcpInfo;
1313
import android.net.wifi.WifiManager;
1414
import android.support.v4.content.LocalBroadcastManager;
15-
import android.util.Log;
1615

1716
public class GDMService extends IntentService {
1817
public static final String MSG_RECEIVED = ".GDMService.MESSAGE_RECEIVED";
@@ -32,7 +31,7 @@ protected void onHandleIntent(Intent intent) {
3231
String data = "M-SEARCH * HTTP/1.0";
3332
DatagramPacket packet = new DatagramPacket(data.getBytes(), data.length(), getBroadcastAddress(), 32414);
3433
socket.send(packet);
35-
Log.i("GDMService", "Search Packet Broadcasted");
34+
Logger.i("Search Packet Broadcasted");
3635

3736
byte[] buf = new byte[256];
3837
packet = new DatagramPacket(buf, buf.length);
@@ -46,7 +45,7 @@ protected void onHandleIntent(Intent intent) {
4645
String packetData = new String(packet.getData());
4746
if (packetData.contains("HTTP/1.0 200 OK"))
4847
{
49-
Log.i("GDMService", "PMS Packet Received");
48+
Logger.i("PMS Packet Received");
5049
//Broadcast Received Packet
5150
Intent packetBroadcast = new Intent(GDMService.MSG_RECEIVED);
5251
packetBroadcast.putExtra("data", packetData);
@@ -57,7 +56,7 @@ protected void onHandleIntent(Intent intent) {
5756
}
5857
catch (SocketTimeoutException e)
5958
{
60-
Log.w("GDMService", "Socket Timeout");
59+
Logger.w("Socket Timeout");
6160
socket.close();
6261
listening = false;
6362
Intent socketBroadcast = new Intent(GDMService.SOCKET_CLOSED);
@@ -72,7 +71,7 @@ protected void onHandleIntent(Intent intent) {
7271
}
7372
catch (IOException e)
7473
{
75-
Log.e("GDMService", e.toString());
74+
Logger.e(e.toString());
7675
e.printStackTrace();
7776
}
7877

‎src/com/atomjack/vcfpht/Logger.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.atomjack.vcfpht;
2+
3+
import android.util.Log;
4+
5+
/**
6+
* Created by chris on 1/28/14.
7+
*/
8+
public class Logger
9+
{
10+
public static void i(String format, Object ... args)
11+
{
12+
String msg = String.format(format, args);
13+
Log.i("VoiceControlForPlexHomeTheater", msg);
14+
}
15+
16+
public static void d(String format, Object ... args)
17+
{
18+
String msg = String.format(format, args);
19+
Log.d("VoiceControlForPlexHomeTheater", msg);
20+
}
21+
22+
public static void w(String format, Object ... args)
23+
{
24+
String msg = String.format(format, args);
25+
Log.w("VoiceControlForPlexHomeTheater", msg);
26+
}
27+
28+
public static void e(String format, Object ... args)
29+
{
30+
String msg = String.format(format, args);
31+
Log.e("VoiceControlForPlexHomeTheater", msg);
32+
}
33+
}

‎src/com/atomjack/vcfpht/MainActivity.java‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import android.net.Uri;
2222
import android.os.Bundle;
2323
import android.support.v4.content.LocalBroadcastManager;
24-
import android.util.Log;
2524
import android.view.Menu;
2625
import android.view.MenuItem;
2726
import android.view.View;
@@ -133,7 +132,7 @@ private void initMainWithServer() {
133132
public void onItemClick(AdapterView<?> adapter, View view, int position,
134133
long arg3) {
135134
SettingHolder holder = (SettingHolder)view.getTag();
136-
Log.v(TAG, "Clicked " + holder.tag);
135+
Logger.d("Clicked %s", holder.tag);
137136
if(holder.tag.equals("server")) {
138137
searchForPlexServers();
139138
} else if(holder.tag.equals("client")) {
@@ -145,7 +144,7 @@ public void onItemClick(AdapterView<?> adapter, View view, int position,
145144
});
146145

147146
CheckBox resumeCheckbox = (CheckBox)findViewById(R.id.resumeCheckbox);
148-
Log.v(TAG, "checkbox: " + resumeCheckbox);
147+
Logger.d("Checkbox: %s", resumeCheckbox);
149148
resumeCheckbox.setChecked(mPrefs.getBoolean("resume", false));
150149
}
151150

@@ -221,15 +220,15 @@ private void searchForPlexServers() {
221220

222221
@Override
223222
public void onNewIntent(Intent intent) {
224-
Log.v(TAG, "ON NEW INTENT IN MAINACTIVITY");
223+
Logger.d("ON NEW INTENT IN MAINACTIVITY");
225224
String from = intent.getStringExtra("FROM");
226-
Log.v(TAG, "From: " + from);
225+
Logger.d("From: %s", from);
227226
if(from == null) {
228227
} else if(from.equals("GDMReceiver")) {
229-
Log.v(TAG, "Origin: " + intent.getStringExtra("ORIGIN"));
228+
Logger.d("Origin: " + intent.getStringExtra("ORIGIN"));
230229
String origin = intent.getStringExtra("ORIGIN") == null ? "" : intent.getStringExtra("ORIGIN");
231230
if(origin.equals("MainActivity")) {
232-
Log.v(TAG, "Got " + VoiceControlForPlexApplication.getPlexMediaServers().size() + " servers");
231+
Logger.d("Got " + VoiceControlForPlexApplication.getPlexMediaServers().size() + " servers");
233232
if(VoiceControlForPlexApplication.getPlexMediaServers().size() > 0) {
234233
showPlexServers();
235234
} else {
@@ -254,17 +253,16 @@ public void onClick(DialogInterface dialog, int id) {
254253

255254
private void scanServersForClients() {
256255
ConcurrentHashMap<String, PlexServer> servers = VoiceControlForPlexApplication.getPlexMediaServers();
257-
Log.v(TAG, "ScanServersForClients, number of servers = " + servers.size());
256+
Logger.d("ScanServersForClients, number of servers = " + servers.size());
258257
serversScanned = 0;
259258
for(PlexServer thisServer : servers.values()) {
260-
Log.v(TAG, "ScanServersForClients server: " + thisServer);
259+
Logger.d("ScanServersForClients server: %s", thisServer.getName());
261260
try {
262261
AsyncHttpClient httpClient = new AsyncHttpClient();
263262
httpClient.get(thisServer.getClientsURL(), new AsyncHttpResponseHandler() {
264263
@Override
265264
public void onSuccess(String response) {
266265
serversScanned++;
267-
// Log.v(TAG, "HTTP REQUEST: " + response);
268266
MediaContainer clientMC = new MediaContainer();
269267

270268
try {
@@ -278,7 +276,7 @@ public void onSuccess(String response) {
278276
List<PlexClient> clients = new ArrayList<PlexClient>();
279277
for(int i=0;i<clientMC.clients.size();i++) {
280278
float version = clientMC.clients.get(i).getNumericVersion();
281-
Log.v(MainActivity.TAG, "Version: " + version);
279+
Logger.d("Version: %f", version);
282280
if(version >= 1.07 || !clientMC.clients.get(i).getProduct().equals("Plex Home Theater")) {
283281
clients.add(clientMC.clients.get(i));
284282
}
@@ -297,7 +295,7 @@ public void onClick(DialogInterface dialog, int id) {
297295
AlertDialog d = builder.create();
298296
d.show();
299297
} else {
300-
Log.v(TAG, "Clients: " + clients.size());
298+
Logger.d("Clients: " + clients.size());
301299
if(serversScanned == VoiceControlForPlexApplication.getPlexMediaServers().size()) {
302300
showPlexClients(clients);
303301
}
@@ -306,13 +304,13 @@ public void onClick(DialogInterface dialog, int id) {
306304
});
307305

308306
} catch (Exception e) {
309-
Log.e(TAG, "Exception getting clients: " + e.toString());
307+
Logger.e("Exception getting clients: " + e.toString());
310308
}
311309
}
312310
}
313311

314312
private void showPlexServers() {
315-
Log.v(TAG, "servers: " + VoiceControlForPlexApplication.getPlexMediaServers().size());
313+
Logger.d("servers: " + VoiceControlForPlexApplication.getPlexMediaServers().size());
316314
searchDialog.dismiss();
317315
if(serverSelectDialog == null) {
318316
serverSelectDialog = new Dialog(this);
@@ -332,7 +330,7 @@ private void showPlexServers() {
332330
@Override
333331
public void onItemClick(AdapterView<?> parentAdapter, View view, int position,
334332
long id) {
335-
Log.v(TAG, "Clicked position " + position);
333+
Logger.d("Clicked position %d", position);
336334
PlexServer s = (PlexServer)parentAdapter.getItemAtPosition(position);
337335
serverSelectDialog.dismiss();
338336
setServer(s);
@@ -342,7 +340,7 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position,
342340
}
343341

344342
private void setServer(PlexServer server) {
345-
Log.v(TAG, "Setting Server " + server.getName());
343+
Logger.d("Setting Server %s", server.getName());
346344
if(server.getAddress().equals("")) {
347345
this.server = null;
348346
saveSettings();
@@ -357,7 +355,7 @@ private void setServer(PlexServer server) {
357355
httpClient.get(server.getBaseURL(), new AsyncHttpResponseHandler() {
358356
@Override
359357
public void onSuccess(String response) {
360-
Log.v(TAG, "HTTP REQUEST: " + response);
358+
Logger.d("HTTP REQUEST: %s", response);
361359
MediaContainer mc = new MediaContainer();
362360
try {
363361
mc = serial.read(MediaContainer.class, response);
@@ -366,13 +364,13 @@ public void onSuccess(String response) {
366364
} catch (Exception e) {
367365
e.printStackTrace();
368366
}
369-
Log.v(TAG, "Machine id: " + mc.getMachineIdentifier());
367+
Logger.d("Machine id: " + mc.getMachineIdentifier());
370368
getClients(mc);
371369
}
372370
});
373371

374372
} catch (Exception e) {
375-
Log.e(TAG, "Exception getting clients: " + e.toString());
373+
Logger.e("Exception getting clients: " + e.toString());
376374
}
377375
} else {
378376
this.server = server;
@@ -422,7 +420,7 @@ private void getClients(MediaContainer mc) {
422420
httpClient.get(server.getClientsURL(), new AsyncHttpResponseHandler() {
423421
@Override
424422
public void onSuccess(String response) {
425-
// Log.v(TAG, "HTTP REQUEST: " + response);
423+
// Logger.d("HTTP REQUEST: %s", response);
426424
MediaContainer clientMC = new MediaContainer();
427425

428426
try {
@@ -436,7 +434,7 @@ public void onSuccess(String response) {
436434
List<PlexClient> clients = new ArrayList<PlexClient>();
437435
for(int i=0;i<clientMC.clients.size();i++) {
438436
float version = clientMC.clients.get(i).getNumericVersion();
439-
Log.v(MainActivity.TAG, "Version: " + version);
437+
Logger.d("Version: %f", version);
440438
if(version >= 1.07) {
441439
clients.add(clientMC.clients.get(i));
442440
}
@@ -455,15 +453,15 @@ public void onClick(DialogInterface dialog, int id) {
455453
AlertDialog d = builder.create();
456454
d.show();
457455
} else {
458-
Log.v(TAG, "Clients: " + clients.size());
456+
Logger.d("Clients: " + clients.size());
459457

460458
showPlexClients(clients);
461459
}
462460
}
463461
});
464462

465463
} catch (Exception e) {
466-
Log.e(TAG, "Exception getting clients: " + e.toString());
464+
Logger.e("Exception getting clients: " + e.toString());
467465
}
468466
}
469467

@@ -494,7 +492,7 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position,
494492

495493
private void setClient(PlexClient client) {
496494
this.client = client;
497-
Log.v(TAG, "Selected client: " + client.getName());
495+
Logger.d("Selected client: " + client.getName());
498496
saveSettings();
499497
initMainWithServer();
500498
}
@@ -509,11 +507,11 @@ private void saveSettings() {
509507

510508
public void onReceive(Context context, Intent intent) {
511509
String message = "Broadcast intent detected " + intent.getAction();
512-
Log.v(TAG, message);
510+
Logger.d(message);
513511
}
514512

515513
public void onFinishedSearch() {
516-
Log.v(TAG, "done with search");
514+
Logger.d("done with search");
517515
}
518516

519517
public Activity getCurrentActivity(){

‎src/com/atomjack/vcfpht/MainListAdapter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public MainListAdapter(Context context, int layoutResourceId,
2222
this.layoutResourceId = layoutResourceId;
2323
this.context = context;
2424
this.data = data;
25-
// Log.v(MainActivity.TAG, "context: " + context);
2625
}
2726

2827
@Override

0 commit comments

Comments
 (0)