nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib & contrib: update users of json::serialization
[nit.git]
/
lib
/
android
/
shared_preferences
/
shared_preferences_api10.nit
diff --git
a/lib/android/shared_preferences/shared_preferences_api10.nit
b/lib/android/shared_preferences/shared_preferences_api10.nit
index
81ababc
..
84d213d
100644
(file)
--- a/
lib/android/shared_preferences/shared_preferences_api10.nit
+++ b/
lib/android/shared_preferences/shared_preferences_api10.nit
@@
-17,13
+17,13
@@
# Services to save/load data using `android.content.SharedPreferences` for the android platform
module shared_preferences_api10
# Services to save/load data using `android.content.SharedPreferences` for the android platform
module shared_preferences_api10
-import native_app_glue
+import dalvik
import serialization
import serialization
-private import json_serialization
+private import json::serialization
in "Java" `{
import android.content.SharedPreferences;
in "Java" `{
import android.content.SharedPreferences;
- import android.content.Context;
+ import android.content.Context;
import android.app.Activity;
import java.util.Map;
import java.util.Iterator;
import android.app.Activity;
import java.util.Map;
import java.util.Iterator;
@@
-33,7
+33,6
@@
in "Java" `{
extern class NativeSharedPreferences in "Java" `{ android.content.SharedPreferences `}
super JavaObject
extern class NativeSharedPreferences in "Java" `{ android.content.SharedPreferences `}
super JavaObject
- redef type SELF: NativeSharedPreferences
fun contains(key: JavaString): Bool in "Java" `{ return recv.contains(key); `}
fun get_all: HashMap[JavaString, JavaObject] import HashMap[JavaString, JavaObject],
fun contains(key: JavaString): Bool in "Java" `{ return recv.contains(key); `}
fun get_all: HashMap[JavaString, JavaObject] import HashMap[JavaString, JavaObject],
@@
-102,11
+101,17
@@
extern class NativeSharedPreferences in "Java" `{ android.content.SharedPreferen
return return_value;
`}
return return_value;
`}
+
+ # HACK for bug #845
+ redef fun new_global_ref import sys, Sys.jni_env `{
+ Sys sys = NativeSharedPreferences_sys(recv);
+ JNIEnv *env = Sys_jni_env(sys);
+ return (*env)->NewGlobalRef(env, recv);
+ `}
end
extern class NativeSharedPreferencesEditor in "Java" `{ android.content.SharedPreferences$Editor `}
super JavaObject
end
extern class NativeSharedPreferencesEditor in "Java" `{ android.content.SharedPreferences$Editor `}
super JavaObject
- redef type SELF: NativeSharedPreferencesEditor
fun clear: NativeSharedPreferencesEditor in "Java" `{ return recv.clear(); `}
fun commit: Bool in "Java" `{ return recv.commit(); `}
fun clear: NativeSharedPreferencesEditor in "Java" `{ return recv.clear(); `}
fun commit: Bool in "Java" `{ return recv.commit(); `}
@@
-128,6
+133,13
@@
extern class NativeSharedPreferencesEditor in "Java" `{ android.content.SharedPr
fun remove(key: JavaString): NativeSharedPreferencesEditor in "Java" `{
return recv.remove(key);
`}
fun remove(key: JavaString): NativeSharedPreferencesEditor in "Java" `{
return recv.remove(key);
`}
+
+ # HACK for bug #845
+ redef fun new_global_ref import sys, Sys.jni_env `{
+ Sys sys = NativeSharedPreferencesEditor_sys(recv);
+ JNIEnv *env = Sys_jni_env(sys);
+ return (*env)->NewGlobalRef(env, recv);
+ `}
end
# Provides services to save and load data for the android platform
end
# Provides services to save and load data for the android platform
@@
-193,15
+205,14
@@
class SharedPreferences
#
# User has to manage local stack deallocation himself
#
#
# User has to manage local stack deallocation himself
#
- # Example :
- # ~~~
+ # ~~~nitish
# var foo = new HashMap[JavaString, JavaObject]
# # ...
# for key, value in foo do
# key.delete_local_ref
# value.delete_local_ref
# end
# var foo = new HashMap[JavaString, JavaObject]
# # ...
# for key, value in foo do
# key.delete_local_ref
# value.delete_local_ref
# end
- # ~~~
+ # ~~~
# *You should use Nit getters instead and get each value one by one*
fun all: nullable HashMap[JavaString, JavaObject]
do
# *You should use Nit getters instead and get each value one by one*
fun all: nullable HashMap[JavaString, JavaObject]
do
@@
-368,7
+379,7
@@
class SharedPreferences
# Store `value` as a serialized Json string
fun []=(key: String, value: nullable Serializable)
do
# Store `value` as a serialized Json string
fun []=(key: String, value: nullable Serializable)
do
- var serialized_string = new StringOStream
+ var serialized_string = new StringWriter
var serializer = new JsonSerializer(serialized_string)
serializer.serialize(value)
var serializer = new JsonSerializer(serialized_string)
serializer.serialize(value)
@@
-393,7
+404,7
@@
class SharedPreferences
end
redef class App
end
redef class App
- fun shared_preferences: SharedPreferences is cached do
+ var shared_preferences: SharedPreferences is lazy do
return new SharedPreferences.privately(self, "")
end
end
return new SharedPreferences.privately(self, "")
end
end