Remove condition and notNecessary flags from the Permissions util.

src/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -215,7 +215,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
 
     this.avatar.setOnClickListener(view -> Permissions.with(this)
                                                       .request(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                                                      .ifNecessary()
                                                       .onAnyResult(this::startAvatarSelection)
                                                       .execute());
 

src/org/thoughtcrime/securesms/DeviceActivity.java

@@ -98,7 +98,6 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
   public void onClick(View v) {
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .ifNecessary()
                .withPermanentDenialDialog(getString(R.string.DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code))
                .onAllGranted(() -> {
                  getSupportFragmentManager().beginTransaction()

src/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -330,7 +330,6 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
       SaveAttachmentTask.showWarningDialog(context, (dialogInterface, which) -> {
         Permissions.with(this)
                    .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                   .ifNecessary()
                    .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
                    .onAnyDenied(() -> Toast.makeText(getContext(), R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
                    .onAllGranted(() -> {

src/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -346,7 +346,6 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
       SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
         Permissions.with(this)
                    .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                   .ifNecessary()
                    .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
                    .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
                    .onAllGranted(() -> {

src/org/thoughtcrime/securesms/VerifyIdentityActivity.java

@@ -172,7 +172,6 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
   public void onClick(View v) {
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .ifNecessary()
                .withPermanentDenialDialog(getString(R.string.VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied))
                .onAllGranted(() -> {
                  FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

src/org/thoughtcrime/securesms/WebRtcCallActivity.java

@@ -164,7 +164,6 @@ public class WebRtcCallActivity extends Activity {
     if (event != null) {
       Permissions.with(this)
                  .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
-                 .ifNecessary()
                  .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().toShortString()),
                                       R.drawable.ic_mic_white_48dp, R.drawable.ic_videocam_white_48dp)
                  .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -2551,7 +2551,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public void onRecorderPermissionRequired() {
     Permissions.with(this)
                .request(Manifest.permission.RECORD_AUDIO)
-               .ifNecessary()
                .withRationaleDialog(getString(R.string.ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone), R.drawable.ic_baseline_mic_48)
                .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages))
                .execute();
@@ -2752,7 +2751,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     public void onClick(View v) {
       Permissions.with(ConversationActivity.this)
                  .request(Manifest.permission.CAMERA)
-                 .ifNecessary()
                  .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_baseline_photo_camera_48)
                  .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video))
                  .onAllGranted(() -> {

src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt

@@ -256,7 +256,6 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         // Ask for an optional camera permission.
         Permissions.with(this)
                 .request(Manifest.permission.CAMERA)
-                .ifNecessary()
                 .onAnyResult {
                     tempFile = AvatarSelection.startAvatarSelection(this, false, true)
                 }

src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java

@@ -375,7 +375,6 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   private void navigateToCamera() {
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .ifNecessary()
                .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_baseline_photo_camera_48)
                .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video))
                .onAllGranted(() -> {

src/org/thoughtcrime/securesms/mms/AttachmentManager.java

@@ -373,7 +373,6 @@ public class AttachmentManager {
   public static void selectDocument(Activity activity, int requestCode) {
     Permissions.with(activity)
                .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
                .onAllGranted(() -> selectMediaType(activity, "*/*", null, requestCode))
                .execute();
@@ -382,7 +381,6 @@ public class AttachmentManager {
   public static void selectGallery(Activity activity, int requestCode, @NonNull Recipient recipient, @NonNull String body, @NonNull TransportOption transport) {
     Permissions.with(activity)
                .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
                .onAllGranted(() -> selectMediaType(activity, "image/*", new String[] {"image/*", "video/*"}, requestCode))
                .onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.buildGalleryIntent(activity, recipient, body, transport), requestCode))
@@ -392,7 +390,6 @@ public class AttachmentManager {
   public static void selectAudio(Activity activity, int requestCode) {
     Permissions.with(activity)
                .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
                .onAllGranted(() -> selectMediaType(activity, "audio/*", null, requestCode))
                .execute();
@@ -401,7 +398,6 @@ public class AttachmentManager {
   public static void selectContactInfo(Activity activity, int requestCode) {
     Permissions.with(activity)
                .request(Manifest.permission.WRITE_CONTACTS)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information))
                .onAllGranted(() -> {
                  Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
@@ -414,7 +410,6 @@ public class AttachmentManager {
     /* Loki - Enable again once we have location sharing
     Permissions.with(activity)
                .request(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location))
                .onAllGranted(() -> {
                  try {
@@ -444,7 +439,6 @@ public class AttachmentManager {
   public void capturePhoto(Activity activity, int requestCode) {
     Permissions.with(activity)
             .request(Manifest.permission.CAMERA)
-            .ifNecessary()
             .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied))
             .onAllGranted(() -> {
               try {

src/org/thoughtcrime/securesms/permissions/Permissions.java

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.permissions;
 
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -63,10 +62,6 @@ public class Permissions {
     private @DrawableRes int[]  rationalDialogHeader;
     private              String rationaleDialogMessage;
 
-    private boolean ifNecesary;
-
-    private boolean condition = true;
-
     PermissionsBuilder(PermissionObject permissionObject) {
       this.permissionObject = permissionObject;
     }
@@ -76,17 +71,6 @@ public class Permissions {
       return this;
     }
 
-    public PermissionsBuilder ifNecessary() {
-      this.ifNecesary = true;
-      return this;
-    }
-
-    public PermissionsBuilder ifNecessary(boolean condition) {
-      this.ifNecesary = true;
-      this.condition  = condition;
-      return this;
-    }
-
     public PermissionsBuilder withRationaleDialog(@NonNull String message, @NonNull @DrawableRes int... headers) {
       this.rationalDialogHeader   = headers;
       this.rationaleDialogMessage = message;
@@ -137,7 +121,7 @@ public class Permissions {
       PermissionsRequest request = new PermissionsRequest(allGrantedListener, anyDeniedListener, anyPermanentlyDeniedListener, anyResultListener,
                                                           someGrantedListener, someDeniedListener, somePermanentlyDeniedListener);
 
-      if (ifNecesary && (permissionObject.hasAll(requestedPermissions) || !condition)) {
+      if (permissionObject.hasAll(requestedPermissions)) {
         executePreGrantedPermissionsRequest(request);
       } else if (rationaleDialogMessage != null && rationalDialogHeader != null) {
         executePermissionsRequestWithRationale(request);

src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java

@@ -139,7 +139,6 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     public boolean onPreferenceClick(Preference preference) {
       Permissions.with(ChatsPreferenceFragment.this)
                  .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                 .ifNecessary()
                  .onAllGranted(() -> {
                    if (!((SwitchPreferenceCompat)preference).isChecked()) {
                      BackupDialog.showEnableBackupDialog(getActivity(), (SwitchPreferenceCompat)preference);
@@ -160,7 +159,6 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     public boolean onPreferenceClick(Preference preference) {
       Permissions.with(ChatsPreferenceFragment.this)
                  .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                 .ifNecessary()
                  .onAllGranted(() -> {
                    Log.i(TAG, "Queing backup...");
                    ApplicationContext.getInstance(getContext())

src/org/thoughtcrime/securesms/registration/WelcomeActivity.java

@@ -55,7 +55,6 @@ public class WelcomeActivity extends BaseActionBarActivity {
   private void onContinueClicked() {
     Permissions.with(this)
         .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-        .ifNecessary()
         .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_baseline_folder_48)
         .onAnyResult(() -> {
           Intent nextIntent = getIntent().getParcelableExtra("next_intent");

src/org/thoughtcrime/securesms/util/CommunicationActions.java

@@ -35,8 +35,7 @@ public class CommunicationActions {
 
     Permissions.with(activity)
         .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
-        .ifNecessary()
+        .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera),
-        .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera, recipient.toShortString()),
                              R.drawable.ic_mic_white_48dp,
                              R.drawable.ic_videocam_white_48dp)
         .withPermanentDenialDialog(activity.getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.toShortString()))