diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/src/org/rockbox/RockboxKeyboardInput.java | 14 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxYesno.java | 35 |
2 files changed, 10 insertions, 39 deletions
diff --git a/android/src/org/rockbox/RockboxKeyboardInput.java b/android/src/org/rockbox/RockboxKeyboardInput.java index 3024b6b685..210cbbd258 100644 --- a/android/src/org/rockbox/RockboxKeyboardInput.java +++ b/android/src/org/rockbox/RockboxKeyboardInput.java | |||
@@ -43,21 +43,13 @@ public class RockboxKeyboardInput | |||
43 | { | 43 | { |
44 | public void onComplete(int resultCode, Intent data) | 44 | public void onComplete(int resultCode, Intent data) |
45 | { | 45 | { |
46 | if (resultCode == Activity.RESULT_OK) | 46 | put_result(resultCode == Activity.RESULT_OK, |
47 | { | 47 | data.getStringExtra("value")); |
48 | result = data.getStringExtra("value"); | ||
49 | } | ||
50 | else { | ||
51 | result = ""; | ||
52 | } | ||
53 | } | 48 | } |
54 | }); | 49 | }); |
55 | } | 50 | } |
56 | public String get_result() | ||
57 | { | ||
58 | return result; | ||
59 | } | ||
60 | 51 | ||
52 | private native void put_result(boolean accepted, String new_string); | ||
61 | public boolean is_usable() | 53 | public boolean is_usable() |
62 | { | 54 | { |
63 | return RockboxService.get_instance().get_activity() != null; | 55 | return RockboxService.get_instance().get_activity() != null; |
diff --git a/android/src/org/rockbox/RockboxYesno.java b/android/src/org/rockbox/RockboxYesno.java index f6554715be..aa5e83d749 100644 --- a/android/src/org/rockbox/RockboxYesno.java +++ b/android/src/org/rockbox/RockboxYesno.java | |||
@@ -26,15 +26,8 @@ import android.content.Intent; | |||
26 | 26 | ||
27 | public class RockboxYesno | 27 | public class RockboxYesno |
28 | { | 28 | { |
29 | private boolean result; | 29 | @SuppressWarnings("unused") |
30 | private boolean have_result; | 30 | private void yesno_display(String text) |
31 | |||
32 | public RockboxYesno() | ||
33 | { | ||
34 | have_result = false; | ||
35 | } | ||
36 | |||
37 | public void yesno_display(String text) | ||
38 | { | 31 | { |
39 | RockboxActivity a = (RockboxActivity) RockboxService.get_instance().get_activity(); | 32 | RockboxActivity a = (RockboxActivity) RockboxService.get_instance().get_activity(); |
40 | Intent kbd = new Intent(a, YesnoActivity.class); | 33 | Intent kbd = new Intent(a, YesnoActivity.class); |
@@ -43,30 +36,16 @@ public class RockboxYesno | |||
43 | { | 36 | { |
44 | public void onComplete(int resultCode, Intent data) | 37 | public void onComplete(int resultCode, Intent data) |
45 | { | 38 | { |
46 | if (resultCode == Activity.RESULT_OK) | 39 | put_result(resultCode == Activity.RESULT_OK); |
47 | { | ||
48 | result = true; | ||
49 | have_result = true; | ||
50 | } | ||
51 | else { | ||
52 | result = false; | ||
53 | have_result = true; | ||
54 | } | ||
55 | } | 40 | } |
56 | }); | 41 | }); |
57 | } | 42 | } |
58 | 43 | ||
59 | public boolean result_ready() | 44 | @SuppressWarnings("unused") |
60 | { | 45 | private boolean is_usable() |
61 | return have_result; | ||
62 | } | ||
63 | public boolean get_result() | ||
64 | { | ||
65 | return result; | ||
66 | } | ||
67 | |||
68 | public boolean is_usable() | ||
69 | { | 46 | { |
70 | return RockboxService.get_instance().get_activity() != null; | 47 | return RockboxService.get_instance().get_activity() != null; |
71 | } | 48 | } |
49 | |||
50 | private native void put_result(boolean result); | ||
72 | } | 51 | } |