Skip to content

Commit ec0407e

Browse files
author
Chris Bellew
committed
Fixed help text for Client. Don't play Cinema Trailers for movies that are resuming playback. Added Swedish Translations (Bjorn Komlanz).
1 parent 3e11761 commit ec0407e

File tree

5 files changed

+90
-87
lines changed

5 files changed

+90
-87
lines changed

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public void settingRowHelpButtonClicked(View v) {
362362

363363
if(helpButtonClicked.equals("server")) {
364364
helpDialog.setMessage(R.string.help_server);
365-
} else if(helpButtonClicked.equals("mClient")) {
365+
} else if(helpButtonClicked.equals("client")) {
366366
helpDialog.setMessage(R.string.help_client);
367367
} else if(helpButtonClicked.equals("feedback")) {
368368
helpDialog.setMessage(R.string.help_feedback);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ public void onFailure(int statusCode, org.apache.http.Header[] headers, byte[] r
182182
public static void createPlayQueue(Connection connection, PlexMedia media, String transientToken, final PlexPlayQueueHandler responseHandler) {
183183
QueryString qs = new QueryString("type", media.getType());
184184
qs.add("next", "0");
185-
if(media.isMovie()) {
185+
boolean hasOffset = media.viewOffset != null && Integer.parseInt(media.viewOffset) > 0;
186+
if(media.isMovie() && !hasOffset) {
186187
qs.add("extrasPrefixCount", Integer.toString(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.NUM_CINEMA_TRAILERS, 0)));
187188
}
188189
qs.add("uri", String.format("library://%s/item/%%2flibrary%%2fmetadata%%2f%s", media.server.machineIdentifier, media.key));

0 commit comments

Comments
 (0)