From 168d09c3ad4fdc93ab018f68b7f583be7acd2851 Mon Sep 17 00:00:00 2001 From: linyuh Date: Thu, 26 Oct 2017 17:04:30 -0700 Subject: Move the functionality of DialerUtils#getDefaultSharedPreferenceForDeviceProtectedStorageContext(Context) to StorageComponent. Bug: 30224215 Test: none PiperOrigin-RevId: 173612463 Change-Id: Ia89d5d85c31ea2114b196393ae43b803023fc9bf --- java/com/android/dialer/postcall/PostCall.java | 31 +++++++++++++++++--------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'java/com/android/dialer/postcall/PostCall.java') diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java index 011fbc985..341db3b09 100644 --- a/java/com/android/dialer/postcall/PostCall.java +++ b/java/com/android/dialer/postcall/PostCall.java @@ -36,6 +36,7 @@ import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.performancereport.PerformanceReport; +import com.android.dialer.storage.StorageComponent; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil; @@ -103,7 +104,8 @@ public class PostCall { activity.getResources().getColor(R.color.dialer_snackbar_action_text_color)); activeSnackbar.show(); Logger.get(activity).logImpression(DialerImpression.Type.POST_CALL_PROMPT_USER_TO_SEND_MESSAGE); - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(activity) + StorageComponent.get(activity) + .unencryptedSharedPrefs() .edit() .remove(KEY_POST_CALL_CALL_DISCONNECT_TIME) .apply(); @@ -141,21 +143,24 @@ public class PostCall { activeSnackbar.show(); Logger.get(activity) .logImpression(DialerImpression.Type.POST_CALL_PROMPT_USER_TO_VIEW_SENT_MESSAGE); - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(activity) + StorageComponent.get(activity) + .unencryptedSharedPrefs() .edit() .remove(KEY_POST_CALL_MESSAGE_SENT) .apply(); } public static void onDisconnectPressed(Context context) { - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + StorageComponent.get(context) + .unencryptedSharedPrefs() .edit() .putBoolean(KEY_POST_CALL_DISCONNECT_PRESSED, true) .apply(); } public static void onCallDisconnected(Context context, String number, long callConnectedMillis) { - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + StorageComponent.get(context) + .unencryptedSharedPrefs() .edit() .putLong(KEY_POST_CALL_CALL_CONNECT_TIME, callConnectedMillis) .putLong(KEY_POST_CALL_CALL_DISCONNECT_TIME, System.currentTimeMillis()) @@ -164,7 +169,8 @@ public class PostCall { } public static void onMessageSent(Context context, String number) { - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + StorageComponent.get(context) + .unencryptedSharedPrefs() .edit() .putString(KEY_POST_CALL_CALL_NUMBER, number) .putBoolean(KEY_POST_CALL_MESSAGE_SENT, true) @@ -177,7 +183,8 @@ public class PostCall { */ public static void restartPerformanceRecordingIfARecentCallExist(Context context) { long disconnectTimeMillis = - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + StorageComponent.get(context) + .unencryptedSharedPrefs() .getLong(PostCall.KEY_POST_CALL_CALL_DISCONNECT_TIME, -1); if (disconnectTimeMillis != -1 && PerformanceReport.isRecording()) { PerformanceReport.startRecording(); @@ -187,7 +194,8 @@ public class PostCall { private static void clear(Context context) { activeSnackbar = null; - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + StorageComponent.get(context) + .unencryptedSharedPrefs() .edit() .remove(KEY_POST_CALL_CALL_DISCONNECT_TIME) .remove(KEY_POST_CALL_CALL_NUMBER) @@ -198,8 +206,7 @@ public class PostCall { } private static boolean shouldPromptUserToSendMessage(Context context) { - SharedPreferences manager = - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context); + SharedPreferences manager = StorageComponent.get(context).unencryptedSharedPrefs(); long disconnectTimeMillis = manager.getLong(KEY_POST_CALL_CALL_DISCONNECT_TIME, -1); long connectTimeMillis = manager.getLong(KEY_POST_CALL_CALL_CONNECT_TIME, -1); @@ -220,13 +227,15 @@ public class PostCall { } private static boolean shouldPromptUserToViewSentMessage(Context context) { - return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + return StorageComponent.get(context) + .unencryptedSharedPrefs() .getBoolean(KEY_POST_CALL_MESSAGE_SENT, false); } @Nullable private static String getPhoneNumber(Context context) { - return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + return StorageComponent.get(context) + .unencryptedSharedPrefs() .getString(KEY_POST_CALL_CALL_NUMBER, null); } -- cgit v1.2.3