Skip to content

Commit 18e4af7

Browse files
author
Chris Bellew
committed
Fixed some compiler warnings.
1 parent ae0f967 commit 18e4af7

File tree

10 files changed

+104
-68
lines changed

10 files changed

+104
-68
lines changed

‎mobile/src/main/java/com/atomjack/vcfp/CastPlayerManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
public class CastPlayerManager {
2727
private PlexMedia nowPlayingMedia;
28-
private List<PlexMedia> nowPlayingAlbum;
28+
private List<? extends PlexMedia> nowPlayingAlbum;
2929

3030
private static VideoCastManager castManager = null;
3131
private VCFPCastConsumer castConsumer;
@@ -209,7 +209,7 @@ public VideoCastManager getCastManager() {
209209
}
210210

211211
// This will send a message to the cast device to load the passed in media
212-
public void loadMedia(PlexMedia media, List<PlexMedia> album, final int offset) {
212+
public void loadMedia(PlexMedia media, List<? extends PlexMedia> album, final int offset) {
213213
Logger.d("Loading media");
214214
nowPlayingMedia = media;
215215
nowPlayingAlbum = album;
@@ -520,7 +520,7 @@ public PlexMedia getNowPlayingMedia() {
520520
return nowPlayingMedia;
521521
}
522522

523-
public List<PlexMedia> getNowPlayingAlbum() {
523+
public List<? extends PlexMedia> getNowPlayingAlbum() {
524524
return nowPlayingAlbum;
525525
}
526526

‎mobile/src/main/java/com/atomjack/vcfp/Feedback.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.atomjack.vcfp;
22

3+
import android.annotation.TargetApi;
34
import android.content.Context;
5+
import android.os.Build;
46
import android.speech.tts.TextToSpeech;
57
import android.speech.tts.UtteranceProgressListener;
68
import android.widget.Toast;
@@ -113,8 +115,11 @@ protected void feedback(String text, boolean errors, boolean forceToast) {
113115
feedbackTts.setOnUtteranceProgressListener(utteranceProgressListener);
114116
}
115117
} else {
116-
map.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, Integer.toString(utteranceId++));
117-
tts.speak(filterText(text), TextToSpeech.QUEUE_FLUSH, map);
118+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
119+
ttsGreater21(tts, text);
120+
} else {
121+
ttsUnder20(tts, text);
122+
}
118123
if (errors)
119124
errorsQueue = null;
120125
else
@@ -128,6 +133,18 @@ protected void feedback(String text, boolean errors, boolean forceToast) {
128133
}
129134
}
130135

136+
@SuppressWarnings("deprecation")
137+
private void ttsUnder20(TextToSpeech tts, String text) {
138+
map.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, Integer.toString(utteranceId++));
139+
tts.speak(text, TextToSpeech.QUEUE_FLUSH, map);
140+
}
141+
142+
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
143+
private void ttsGreater21(TextToSpeech tts, String text) {
144+
String utteranceId = this.hashCode() + "";
145+
tts.speak(text, TextToSpeech.QUEUE_FLUSH, null, utteranceId);
146+
}
147+
131148
// Filter out some extraneous patterns, like when a connection is refused, strip out the uri.
132149
private String filterText(String text) {
133150
text = text.replaceAll("to https?://([0-9]+\\.){3}[0-9]+:[0-9]+ refused", " refused");

‎mobile/src/main/java/com/atomjack/vcfp/Utils.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.atomjack.vcfp;
22

3-
import org.apache.http.conn.util.InetAddressUtils;
4-
53
import java.io.BufferedInputStream;
64
import java.io.ByteArrayOutputStream;
75
import java.io.FileInputStream;
86
import java.math.BigInteger;
7+
import java.net.Inet4Address;
98
import java.net.InetAddress;
109
import java.net.NetworkInterface;
1110
import java.security.SecureRandom;
@@ -111,7 +110,7 @@ public static String getIPAddress(boolean useIPv4) {
111110
for (InetAddress addr : addrs) {
112111
if (!addr.isLoopbackAddress()) {
113112
String sAddr = addr.getHostAddress().toUpperCase();
114-
boolean isIPv4 = InetAddressUtils.isIPv4Address(sAddr);
113+
boolean isIPv4 = addr instanceof Inet4Address;// InetAddressUtils.isIPv4Address(sAddr);
115114
if (useIPv4) {
116115
if (isIPv4)
117116
return sAddr;

‎mobile/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,6 @@ public static boolean isVersionLessThan(String v1, String v2) {
329329
return cmp.compare(v1, v2) < 0;
330330
}
331331

332-
public static boolean isWifiConnected(Context context) {
333-
ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
334-
NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
335-
return mWifi.isConnected();
336-
}
337-
338332
public static void showNoWifiDialog(Context context) {
339333
AlertDialog.Builder usageDialog = new AlertDialog.Builder(context);
340334
usageDialog.setTitle(R.string.no_wifi_connection);
@@ -412,9 +406,9 @@ public Bitmap getCachedBitmap(String key) {
412406
// notification again.
413407
private void fetchNotificationBitmap(final PlexMedia.IMAGE_KEY key, final PlexClient client, final PlexMedia media, final PlayerState currentState) {
414408
Logger.d("Thumb not found in cache. Downloading %s.", key);
415-
new AsyncTask() {
409+
new AsyncTask<Void, Void, Void>() {
416410
@Override
417-
protected Object doInBackground(Object[] objects) {
411+
protected Void doInBackground(Void... voids) {
418412
if (client != null && media != null) {
419413
InputStream inputStream = media.getNotificationThumb(media instanceof PlexTrack ? PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB_MUSIC : key);
420414
if(inputStream != null) {
@@ -438,9 +432,9 @@ protected Object doInBackground(Object[] objects) {
438432
}
439433

440434
public void fetchNotificationBitmap(final PlexMedia.IMAGE_KEY key, final PlexMedia media, final Runnable onFinish) {
441-
new AsyncTask() {
435+
new AsyncTask<Void, Void, Void>() {
442436
@Override
443-
protected Object doInBackground(Object[] params) {
437+
protected Void doInBackground(Void... voids) {
444438
InputStream inputStream = media.getNotificationThumb(key);
445439
if(inputStream != null) {
446440
try {

‎mobile/src/main/java/com/atomjack/vcfp/activities/CastActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class CastActivity extends PlayerActivity {
3030

3131
private PlayerState currentState = PlayerState.STOPPED;
3232

33-
private List<PlexMedia> nowPlayingAlbum = new ArrayList<>();
33+
private List<? extends PlexMedia> nowPlayingAlbum = new ArrayList<>();
3434

3535
private Dialog infoDialog;
3636

‎mobile/src/main/java/com/atomjack/vcfp/model/PlexMedia.java‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -320,45 +320,3 @@ public Part[] newArray(int size) {
320320
}
321321
};
322322
}
323-
324-
@Root(strict=false)
325-
class Stream implements Parcelable {
326-
@Attribute(required=false)
327-
public String id;
328-
@Attribute(required=false)
329-
public int streamType;
330-
@Attribute(required=false)
331-
public String language;
332-
333-
public Stream() {
334-
335-
}
336-
337-
public Stream(Parcel in) {
338-
id = in.readString();
339-
streamType = in.readInt();
340-
language = in.readString();
341-
}
342-
343-
@Override
344-
public int describeContents() {
345-
return 0;
346-
}
347-
348-
@Override
349-
public void writeToParcel(Parcel out, int flags) {
350-
out.writeString(id);
351-
out.writeInt(streamType);
352-
out.writeString(language);
353-
}
354-
355-
public static final Parcelable.Creator<Stream> CREATOR = new Parcelable.Creator<Stream>() {
356-
public Stream createFromParcel(Parcel in) {
357-
return new Stream(in);
358-
}
359-
360-
public Stream[] newArray(int size) {
361-
return new Stream[size];
362-
}
363-
};
364-
}

‎mobile/src/main/java/com/atomjack/vcfp/model/PlexServer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ public void onFinish(int statusCode, boolean available) {
196196
}
197197

198198
private void testServerConnection(final Connection connection, final ServerTestHandler handler) {
199-
Logger.d("testServerConnection: fetching %s with token %s", connection.uri, accessToken);
200199
PlexHttpClient.PlexHttpService service = PlexHttpClient.getService(connection, 2);
201200
Call<MediaContainer> call = service.getMediaContainer("", accessToken);
202201
call.enqueue(new Callback<MediaContainer>() {

‎mobile/src/main/java/com/atomjack/vcfp/model/Stream.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package com.atomjack.vcfp.model;
2+
3+
import android.os.Parcel;
4+
import android.os.Parcelable;
5+
6+
import org.simpleframework.xml.Attribute;
7+
import org.simpleframework.xml.Root;
8+
9+
@Root(strict=false)
10+
public class Stream implements Parcelable {
11+
@Attribute(required=false)
12+
public String id;
13+
@Attribute(required=false)
14+
public int streamType;
15+
@Attribute(required=false)
16+
public String language;
17+
@Attribute(required=false)
18+
public int index;
19+
@Attribute(required=false)
20+
public String title;
21+
22+
public boolean active;
23+
24+
@Override
25+
public String toString() {
26+
return title;
27+
}
28+
29+
public Stream() {
30+
31+
}
32+
33+
public Stream(String t) {
34+
title = t;
35+
}
36+
37+
public Stream(Parcel in) {
38+
id = in.readString();
39+
streamType = in.readInt();
40+
language = in.readString();
41+
active = in.readByte() != 0;
42+
title = in.readString();
43+
}
44+
45+
@Override
46+
public int describeContents() {
47+
return 0;
48+
}
49+
50+
@Override
51+
public void writeToParcel(Parcel out, int flags) {
52+
out.writeString(id);
53+
out.writeInt(streamType);
54+
out.writeString(language);
55+
out.writeByte((byte)(active ? 1 : 0));
56+
out.writeString(title);
57+
}
58+
59+
public static final Parcelable.Creator<Stream> CREATOR = new Parcelable.Creator<Stream>() {
60+
public Stream createFromParcel(Parcel in) {
61+
return new Stream(in);
62+
}
63+
64+
public Stream[] newArray(int size) {
65+
return new Stream[size];
66+
}
67+
};
68+
}

‎mobile/src/main/java/com/atomjack/vcfp/net/PlexHttpClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public void onFailure(Throwable t) {
346346
}
347347

348348
public static void createArtistPlayQueue(Connection connection, PlexDirectory artist, final PlexPlayQueueHandler responseHandler) {
349-
Map qs = new HashMap<>();
349+
HashMap<String, String> qs = new HashMap<String, String>();
350350
qs.put("type", "audio");
351351
qs.put("shuffle", "1");
352352
String uri = String.format("library://%s/item/%%2flibrary%%2fmetadata%%2f%s", artist.server.machineIdentifier, artist.ratingKey);
@@ -374,7 +374,7 @@ public void onFailure(Throwable t) {
374374
}
375375

376376
public static void createPlayQueue(Connection connection, final PlexMedia media, final String key, String transientToken, final PlexPlayQueueHandler responseHandler) {
377-
Map qs = new HashMap<>();
377+
Map<String, String> qs = new HashMap<>();
378378
qs.put("type", media.getType());
379379
qs.put("next", "0");
380380

‎mobile/src/main/java/com/atomjack/vcfp/services/PlexSearchService.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.Intent;
66
import android.os.Bundle;
77
import android.os.IBinder;
8+
import android.os.Parcelable;
89
import android.speech.RecognizerIntent;
910
import android.support.v7.media.MediaRouteSelector;
1011
import android.support.v7.media.MediaRouter;
@@ -165,7 +166,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
165166
for (PlexClient c : cs) {
166167
VoiceControlForPlexApplication.clients.put(c.name, c);
167168
}
168-
clients = (HashMap) VoiceControlForPlexApplication.clients;
169+
clients = VoiceControlForPlexApplication.clients;
169170
clients.putAll(VoiceControlForPlexApplication.castClients);
170171
}
171172
startup();
@@ -207,7 +208,7 @@ public void onApplicationDisconnected(int errorCode) {
207208
};
208209

209210
queries = new ArrayList<>();
210-
clients = (HashMap)VoiceControlForPlexApplication.clients;
211+
clients = VoiceControlForPlexApplication.clients;
211212
clients.putAll(VoiceControlForPlexApplication.castClients);
212213
resumePlayback = false;
213214

@@ -1211,14 +1212,14 @@ private void playMedia(final PlexMedia media, Connection connection, PlexDirecto
12111212
@Override
12121213
public void run() {
12131214
castPlayerManager.loadMedia(media instanceof PlexTrack ? mediaContainer.tracks.get(0) : mediaContainer.videos.get(0),
1214-
media instanceof PlexTrack ? (ArrayList) mediaContainer.tracks : (ArrayList) mediaContainer.videos,
1215+
media instanceof PlexTrack ? mediaContainer.tracks : mediaContainer.videos,
12151216
getOffset(media instanceof PlexTrack ? mediaContainer.tracks.get(0) : mediaContainer.videos.get(0)));
12161217

12171218
if(!fromMic || true) {
12181219
Intent sendIntent = new Intent(PlexSearchService.this, CastActivity.class);
12191220
sendIntent.setAction(com.atomjack.shared.Intent.CAST_MEDIA);
12201221
sendIntent.putExtra(com.atomjack.shared.Intent.EXTRA_MEDIA, media instanceof PlexTrack ? mediaContainer.tracks.get(0) : mediaContainer.videos.get(0));
1221-
sendIntent.putParcelableArrayListExtra(com.atomjack.shared.Intent.EXTRA_ALBUM, media instanceof PlexTrack ? (ArrayList) mediaContainer.tracks : (ArrayList) mediaContainer.videos);
1222+
sendIntent.putParcelableArrayListExtra(com.atomjack.shared.Intent.EXTRA_ALBUM, media instanceof PlexTrack ? (ArrayList<? extends Parcelable>) mediaContainer.tracks : (ArrayList<? extends Parcelable>) mediaContainer.videos);
12221223
sendIntent.putExtra(WearConstants.FROM_WEAR, fromWear);
12231224
sendIntent.putExtra(com.atomjack.shared.Intent.EXTRA_CLIENT, client);
12241225
sendIntent.putExtra(com.atomjack.shared.Intent.EXTRA_FROM_MIC, fromMic);

0 commit comments

Comments
 (0)