diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java index 1ec98bd66..95115fac7 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/adapters/items/BrowserFileItem.java @@ -28,6 +28,7 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.content.res.AppCompatResources; import autodagger.AutoInjector; import butterknife.BindView; import butterknife.ButterKnife; @@ -140,7 +141,14 @@ public class BrowserFileItem extends AbstractFlexibleItem= Build.VERSION_CODES.O) { - if (vibrator.hasAmplitudeControl()) { - vibrationEffect = VibrationEffect.createWaveform(vibratePattern, amplitudes, -1); - //vibrator.vibrate(vibrationEffect); - } else { - vibrationEffect = VibrationEffect.createWaveform(vibratePattern, -1); - //vibrator.vibrate(vibrationEffect); - } - } else { - //vibrator.vibrate(vibratePattern, -1); - } - } - - handler.postDelayed(() -> { - if (vibrator != null) { - vibrator.cancel(); - } - }, 10000); - } } \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index a0035bdce..1f369c0d7 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -170,8 +170,6 @@ public class SettingsController extends BaseController { MaterialPreferenceCategory messageView; @BindView(R.id.settings_client_cert) MaterialStandardPreference certificateSetup; - @BindView(R.id.settings_always_vibrate) - MaterialSwitchPreference shouldVibrateSwitchPreference; @BindView(R.id.settings_incognito_keyboard) MaterialSwitchPreference incognitoKeyboardSwitchPreference; @BindView(R.id.settings_screen_security) @@ -263,10 +261,6 @@ public class SettingsController extends BaseController { licenceButton.setVisibility(View.GONE); } - if (!DoNotDisturbUtils.INSTANCE.hasVibrator()) { - shouldVibrateSwitchPreference.setVisibility(View.GONE); - } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { incognitoKeyboardSwitchPreference.setVisibility(View.GONE); } @@ -280,7 +274,6 @@ public class SettingsController extends BaseController { getResources().getString(R.string.nc_app_product_name))); } - if (!TextUtils.isEmpty(getResources().getString(R.string.nc_privacy_url))) { privacyButton.addPreferenceClickListener(view12 -> { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources(). @@ -353,7 +346,6 @@ public class SettingsController extends BaseController { alias = ""; } - userUtils.createOrUpdateUser(null, null, null, null, null, null, null, currentUser.getId(), null, alias, null); }, new String[]{"RSA", "EC"}, null, finalHost, finalPort, currentUser.getClientCertificate @@ -445,10 +437,6 @@ public class SettingsController extends BaseController { certificateSetup.setTitle(R.string.nc_client_cert_setup); } - if (shouldVibrateSwitchPreference.getVisibility() == View.VISIBLE) { - ((Checkable) shouldVibrateSwitchPreference.findViewById(R.id.mp_checkable)).setChecked(appPreferences.getShouldVibrateSetting()); - } - ((Checkable) screenSecuritySwitchPreference.findViewById(R.id.mp_checkable)).setChecked(appPreferences.getIsScreenSecured()); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { ((Checkable) incognitoKeyboardSwitchPreference.findViewById(R.id.mp_checkable)).setChecked(appPreferences.getIsKeyboardIncognito()); diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index 587b82ae0..d11134a45 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -32,7 +32,6 @@ import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Vibrator; import android.service.notification.StatusBarNotification; import android.text.TextUtils; import android.util.Base64; @@ -536,19 +535,6 @@ public class NotificationWorker extends Worker { Log.e(TAG, "Failed to set data source"); } } - - - if (DoNotDisturbUtils.INSTANCE.shouldVibrate(appPreferences.getShouldVibrateSetting()) || importantConversation) { - Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); - - if (vibrator != null) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - //vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE)); - } else { - //vibrator.vibrate(500); - } - } - } } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java index cb7398309..30d725f91 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java @@ -187,17 +187,6 @@ public interface AppPreferences { @RemoveMethod void removeNotificationChannelUpgradeToV3(); - @KeyByString("notifications_vibrate") - @DefaultValue(R.bool.value_true) - boolean getShouldVibrateSetting(); - - @KeyByString("notifications_vibrate") - void setVibrateSetting(boolean value); - - @KeyByString("notifications_vibrate") - @RemoveMethod - void removeVibrateSetting(); - @KeyByString("screen_security") @DefaultValue(R.bool.value_false) boolean getIsScreenSecured(); diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml index c06f3ec7a..199407ed1 100644 --- a/app/src/main/res/layout/controller_settings.xml +++ b/app/src/main/res/layout/controller_settings.xml @@ -182,15 +182,6 @@ apc:mp_key="@string/nc_settings_message_ringtone_key" apc:mp_title="@string/nc_settings_other_notifications_ringtone" /> - -