Skip to content

Commit 708d4b0

Browse files
author
Chris Bellew
committed
Whoops, somehow had Fargo hardcoded in strings.xml; Fixed bug that required both AutoVoice and utter! to be installed in order to show import tasker project action in menu.
1 parent 7e3edb6 commit 708d4b0

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

Voice Control For Plex/src/main/java/com/atomjack/vcfp/MainActivity.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,6 @@ private boolean hasValidUtter() {
188188
return false;
189189
}
190190

191-
192-
193-
194-
195-
196191
public void resumeChecked(View v) {
197192
mPrefsEditor.putBoolean("resume", ((CheckBox)v).isChecked());
198193
mPrefsEditor.commit();
@@ -530,7 +525,7 @@ private void saveSettings() {
530525
public boolean onCreateOptionsMenu(Menu _menu) {
531526
// Inflate the menu; this adds items to the action bar if it is present.
532527
getMenuInflater().inflate(R.menu.menu_main, _menu);
533-
if (!hasValidAutoVoice() || !hasValidUtter()) {
528+
if (!hasValidAutoVoice() && !hasValidUtter()) {
534529
_menu.findItem(R.id.menu_tasker_import).setVisible(false);
535530
if (!hasValidTasker()) {
536531
_menu.findItem(R.id.menu_install_tasker).setVisible(true);

Voice Control For Plex/src/main/java/com/atomjack/vcfp/PlexSearch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ public void onFailure(Throwable error) {
707707

708708
private void onFinishedNextEpisodeSearch(String queryTerm) {
709709
if(videos.size() == 0) {
710-
feedback.e(getResources().getString(R.string.couldnt_find_next), queryTerm);
710+
feedback.e(getResources().getString(R.string.couldnt_find_next), queryTerm, queryTerm);
711711
return;
712712
} else {
713713
if(videos.size() == 1)

Voice Control For Plex/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<string name="couldnt_find_episode">Sorry, I couldn\'t find the episode you specified.</string>
5353
<string name="found_more_than_one_show">Sorry, I found more than one matching show. Please be more specific.</string>
5454
<string name="couldnt_find">Sorry, I couldn\'t find %s.</string>
55-
<string name="couldnt_find_next">Sorry, I couldn\'t find %s, or else no episodes for Fargo are on deck.</string>
55+
<string name="couldnt_find_next">Sorry, I couldn\'t find %1$s, or else no episodes for %2$s are on deck.</string>
5656
<string name="couldnt_find_season">Sorry, I couldn\'t find that season.</string>
5757
<string name="found_more_than_one_movie">I found more than one matching movie. Please be more specific.</string>
5858
<string name="now_watching_video">Now watching %1$s on %2$s.</string>

0 commit comments

Comments
 (0)