From c85cefbe46f050249e473b791d11b81d08d1b516 Mon Sep 17 00:00:00 2001 From: Bogdan Roatis Date: Tue, 8 Jan 2019 15:29:09 +0200 Subject: [PATCH] ANDROID-688 Disable my.alfresco.com notification until a proper shutdown date is picked --- .../application/activity/MainActivity.java | 24 +++++++++---------- .../signin/AccountOAuthFragment.java | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/activity/MainActivity.java b/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/activity/MainActivity.java index 7fe77d9d..1fa27568 100644 --- a/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/activity/MainActivity.java +++ b/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/activity/MainActivity.java @@ -304,18 +304,18 @@ public void onResume() checkSession(); //TODO remove in the future - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - int alertStatus = prefs.getInt(GeneralPreferences.HAS_SHOWN_SHUTTING_DOWN_ALERT, -1); - // if the alert status is 1 (needs to be shown) or -1 (has never been set) - if ((alertStatus == -1 && getCurrentSession() instanceof CloudSession) || alertStatus == 0) { - prefs.edit().putInt(GeneralPreferences.HAS_SHOWN_SHUTTING_DOWN_ALERT, 1).apply(); - new AlertDialog.Builder(this) - .setTitle(getResources().getString(R.string.alert_cloud_shutting_down_title)) - .setMessage(getResources().getString(R.string.alert_cloud_shutting_down_content)) - .setPositiveButton("OK", null) - .create() - .show(); - } +// SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); +// int alertStatus = prefs.getInt(GeneralPreferences.HAS_SHOWN_SHUTTING_DOWN_ALERT, -1); +// // if the alert status is 1 (needs to be shown) or -1 (has never been set) +// if ((alertStatus == -1 && getCurrentSession() instanceof CloudSession) || alertStatus == 0) { +// prefs.edit().putInt(GeneralPreferences.HAS_SHOWN_SHUTTING_DOWN_ALERT, 1).apply(); +// new AlertDialog.Builder(this) +// .setTitle(getResources().getString(R.string.alert_cloud_shutting_down_title)) +// .setMessage(getResources().getString(R.string.alert_cloud_shutting_down_content)) +// .setPositiveButton("OK", null) +// .create() +// .show(); +// } if (getFragment(MainMenuFragment.TAG) != null && requestSwapAccount) { diff --git a/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/fragments/signin/AccountOAuthFragment.java b/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/fragments/signin/AccountOAuthFragment.java index df8a440d..05a679c9 100644 --- a/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/fragments/signin/AccountOAuthFragment.java +++ b/alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/fragments/signin/AccountOAuthFragment.java @@ -287,8 +287,8 @@ public void onAccountCreated(CreateAccountEvent event) } SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - SharedPreferences.Editor editor = prefs.edit(); - editor.putInt(GeneralPreferences.HAS_SHOWN_SHUTTING_DOWN_ALERT, 0).apply(); +// SharedPreferences.Editor editor = prefs.edit(); +// editor.putInt(GeneralPreferences.HAS_SHOWN_SHUTTING_DOWN_ALERT, 0).apply(); if (getActivity() instanceof WelcomeActivity) {