From 3b2dc6061713815b9c604ad65c20dbb411f0dad0 Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 16:59:31 +0100 Subject: [PATCH 1/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- src/android/Sharedpreferences.java | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/android/Sharedpreferences.java b/src/android/Sharedpreferences.java index a646ec9..a5704b3 100644 --- a/src/android/Sharedpreferences.java +++ b/src/android/Sharedpreferences.java @@ -10,6 +10,7 @@ import android.content.SharedPreferences; public class Sharedpreferences extends CordovaPlugin { + public static final String GET_DEFAULT_SHARED_PREFERENCES = "getDefaultSharedPreferences"; public static final String GET_SHARED_PREFERENCES = "getSharedPreferences"; public static final String PUT_STRING = "putString"; public static final String GET_STRING = "getString"; @@ -62,6 +63,31 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo } //Put a Sting into the Shared Preferences File //params key and value String type + }else if(getDefaultSharedPreferences.equals(action)){ + String modeType = args.getString(0); + Context context = cordova.getActivity(); + if(in_array(MODE_ARRAY, modeType)){ + if(modeType.equals("MODE_APPEND")){ + try{ + SharedPref = context.getDefaultSharedPreferences(Context.MODE_APPEND); + }catch(Exception e){ + callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); + return false; + } + }else if(modeType.equals("MODE_PRIVATE")){ + try{ + SharedPref = context.getDefaultSharedPreferences(Context.MODE_APPEND); + }catch(Exception e){ + callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); + return false; + } + } + callbackContext.success("Default Shared Preferences Created"); + return true; + }else{ + callbackContext.error("Invalid Mode provided"); + return false; + } }else if(PUT_STRING.equals(action)){ editor = SharedPref.edit(); try{ From 0535f8a912ab24d84920c453d6a7537c2bbc4f21 Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:01:04 +0100 Subject: [PATCH 2/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- www/sharedpreferences.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/sharedpreferences.js b/www/sharedpreferences.js index 8972a0e..dd9049e 100644 --- a/www/sharedpreferences.js +++ b/www/sharedpreferences.js @@ -5,6 +5,9 @@ var sharedpreferences = { getSharedPreferences : function(file, mode, successCallback, errorCallback){ cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'getSharedPreferences', [file, mode]) }, + getDefaultSharedPreferences: function( mode, successCallback, errorCallback ) { + cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'getDefaultSharedPreferences', [mode]) + } putString: function(key, string, successCallback, errorCallback){ cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'putString', [key, string]) }, From 0a6ad54cec0ead8d7ef3e97099ba35109db5db06 Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:05:56 +0100 Subject: [PATCH 3/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- src/android/Sharedpreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/Sharedpreferences.java b/src/android/Sharedpreferences.java index a5704b3..dd822c1 100644 --- a/src/android/Sharedpreferences.java +++ b/src/android/Sharedpreferences.java @@ -63,7 +63,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo } //Put a Sting into the Shared Preferences File //params key and value String type - }else if(getDefaultSharedPreferences.equals(action)){ + }else if(GET_DEFAULT_SHARED_PREFERENCES.equals(action)){ String modeType = args.getString(0); Context context = cordova.getActivity(); if(in_array(MODE_ARRAY, modeType)){ From ab976777dcbd4053adfda2c4c8888636cca70c9b Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:12:48 +0100 Subject: [PATCH 4/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- src/android/Sharedpreferences.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/android/Sharedpreferences.java b/src/android/Sharedpreferences.java index dd822c1..f9410ff 100644 --- a/src/android/Sharedpreferences.java +++ b/src/android/Sharedpreferences.java @@ -9,6 +9,8 @@ import android.content.Context; import android.content.SharedPreferences; +import android.preference.PreferenceManager; + public class Sharedpreferences extends CordovaPlugin { public static final String GET_DEFAULT_SHARED_PREFERENCES = "getDefaultSharedPreferences"; public static final String GET_SHARED_PREFERENCES = "getSharedPreferences"; @@ -69,14 +71,14 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo if(in_array(MODE_ARRAY, modeType)){ if(modeType.equals("MODE_APPEND")){ try{ - SharedPref = context.getDefaultSharedPreferences(Context.MODE_APPEND); + SharedPref = PreferenceManager.getDefaultSharedPreferences(Context.MODE_APPEND); }catch(Exception e){ callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); return false; } }else if(modeType.equals("MODE_PRIVATE")){ try{ - SharedPref = context.getDefaultSharedPreferences(Context.MODE_APPEND); + SharedPref = PreferenceManager.getDefaultSharedPreferences(Context.MODE_APPEND); }catch(Exception e){ callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); return false; From 591b3ac7d1c229cae04d8e492bbcf8e3129c3267 Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:15:18 +0100 Subject: [PATCH 5/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- src/android/Sharedpreferences.java | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/android/Sharedpreferences.java b/src/android/Sharedpreferences.java index f9410ff..d11aaa7 100644 --- a/src/android/Sharedpreferences.java +++ b/src/android/Sharedpreferences.java @@ -66,30 +66,15 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo //Put a Sting into the Shared Preferences File //params key and value String type }else if(GET_DEFAULT_SHARED_PREFERENCES.equals(action)){ - String modeType = args.getString(0); Context context = cordova.getActivity(); - if(in_array(MODE_ARRAY, modeType)){ - if(modeType.equals("MODE_APPEND")){ - try{ - SharedPref = PreferenceManager.getDefaultSharedPreferences(Context.MODE_APPEND); - }catch(Exception e){ - callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); - return false; - } - }else if(modeType.equals("MODE_PRIVATE")){ - try{ - SharedPref = PreferenceManager.getDefaultSharedPreferences(Context.MODE_APPEND); - }catch(Exception e){ - callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); - return false; - } - } - callbackContext.success("Default Shared Preferences Created"); - return true; - }else{ - callbackContext.error("Invalid Mode provided"); + try{ + SharedPref = PreferenceManager.getDefaultSharedPreferences(Context.getBaseContext()); + }catch(Exception e){ + callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); return false; } + callbackContext.success("Default Shared Preferences Created"); + return true; }else if(PUT_STRING.equals(action)){ editor = SharedPref.edit(); try{ From f88e87075a86a66eb209e8fb4d3aed874ffa975a Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:15:46 +0100 Subject: [PATCH 6/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- www/sharedpreferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/sharedpreferences.js b/www/sharedpreferences.js index dd9049e..fd86133 100644 --- a/www/sharedpreferences.js +++ b/www/sharedpreferences.js @@ -5,8 +5,8 @@ var sharedpreferences = { getSharedPreferences : function(file, mode, successCallback, errorCallback){ cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'getSharedPreferences', [file, mode]) }, - getDefaultSharedPreferences: function( mode, successCallback, errorCallback ) { - cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'getDefaultSharedPreferences', [mode]) + getDefaultSharedPreferences: function( successCallback, errorCallback ) { + cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'getDefaultSharedPreferences', []) } putString: function(key, string, successCallback, errorCallback){ cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'putString', [key, string]) From 5f3e2041c1f148825b6c8fae071aca59cf635b32 Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:19:14 +0100 Subject: [PATCH 7/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- src/android/Sharedpreferences.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/android/Sharedpreferences.java b/src/android/Sharedpreferences.java index d11aaa7..1eed238 100644 --- a/src/android/Sharedpreferences.java +++ b/src/android/Sharedpreferences.java @@ -66,9 +66,8 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo //Put a Sting into the Shared Preferences File //params key and value String type }else if(GET_DEFAULT_SHARED_PREFERENCES.equals(action)){ - Context context = cordova.getActivity(); try{ - SharedPref = PreferenceManager.getDefaultSharedPreferences(Context.getBaseContext()); + SharedPref = PreferenceManager.getDefaultSharedPreferences(getActivity().getBaseContext()); }catch(Exception e){ callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); return false; From 329f31e21e9f719e93d9118f133e2e4dfbb9a56c Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:20:54 +0100 Subject: [PATCH 8/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- src/android/Sharedpreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/Sharedpreferences.java b/src/android/Sharedpreferences.java index 1eed238..35d11d0 100644 --- a/src/android/Sharedpreferences.java +++ b/src/android/Sharedpreferences.java @@ -67,7 +67,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo //params key and value String type }else if(GET_DEFAULT_SHARED_PREFERENCES.equals(action)){ try{ - SharedPref = PreferenceManager.getDefaultSharedPreferences(getActivity().getBaseContext()); + SharedPref = PreferenceManager.getDefaultSharedPreferences(cordova.getActivity().getBaseContext()); }catch(Exception e){ callbackContext.error("Error creating Default Shared Preferences" + e.getMessage()); return false; From fc7f487832376d13d63553d0342f81b1d5686288 Mon Sep 17 00:00:00 2001 From: iwantwin Date: Fri, 30 Dec 2016 17:22:49 +0100 Subject: [PATCH 9/9] Updating to support getDefaultSharedPreferences Needed for rewrite from native app to hybrid app --- www/sharedpreferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/sharedpreferences.js b/www/sharedpreferences.js index fd86133..d64d646 100644 --- a/www/sharedpreferences.js +++ b/www/sharedpreferences.js @@ -7,7 +7,7 @@ var sharedpreferences = { }, getDefaultSharedPreferences: function( successCallback, errorCallback ) { cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'getDefaultSharedPreferences', []) - } + }, putString: function(key, string, successCallback, errorCallback){ cordova.exec(successCallback, errorCallback, 'Sharedpreferences', 'putString', [key, string]) },