Removing unrequired APi checks (#1620)

* Removing unrequired APi checks

* Bumping min sdk to 26 and further cleaning version checks

* More clean ups

* Removed unused class

app/src/main/AndroidManifest.xml

@@ -291,10 +291,6 @@
  android:name="org.thoughtcrime.securesms.scribbles.StickerSelectActivity"
  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
  android:theme="@style/Theme.Session.ForceDark" />
- <activity
- android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
- android:screenOrientation="portrait"
- android:theme="@style/Theme.AppCompat" />
  <activity
  android:name="org.thoughtcrime.securesms.ShortcutLauncherActivity"
  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"

app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java

@@ -4,12 +4,8 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import androidx.annotation.NonNull;
+
 import androidx.fragment.app.FragmentActivity;
-import android.view.KeyEvent;
 
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageActivityHelper;

app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -39,7 +39,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.loader.app.LoaderManager;
@@ -421,11 +423,13 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
  mode.getMenuInflater().inflate(R.menu.media_overview_context, menu);
  mode.setTitle("1");
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- Window window = getActivity().getWindow();
- originalStatusBarColor = window.getStatusBarColor();
- window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
- }
+ FragmentActivity activity = getActivity();
+ if (activity == null) return false;
+
+ Window window = activity.getWindow();
+ originalStatusBarColor = window.getStatusBarColor();
+ window.setStatusBarColor(ContextCompat.getColor(activity, R.color.action_mode_status_bar));
+
  return true;
  }
 
@@ -455,11 +459,12 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
  public void onDestroyActionMode(ActionMode mode) {
  actionMode = null;
  getListAdapter().clearSelection();
- ((MediaOverviewActivity) getActivity()).onExitMultiSelect();
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
- }
+ MediaOverviewActivity activity = ((MediaOverviewActivity) getActivity());
+ if(activity == null) return;
+
+ activity.onExitMultiSelect();
+ activity.getWindow().setStatusBarColor(originalStatusBarColor);
  }
  }
  }

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -26,7 +25,6 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -57,6 +55,9 @@
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestManager;
+
 import org.session.libsession.messaging.messages.control.DataExtractionNotification;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
@@ -72,8 +73,6 @@
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.mediapreview.MediaPreviewViewModel;
 import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.AttachmentUtil;

app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java

@@ -1,22 +1,19 @@
 package org.thoughtcrime.securesms.audio;
 
-import android.annotation.TargetApi;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
-import android.os.Build;
-import org.session.libsignal.utilities.Log;
 
 import org.session.libsession.utilities.Util;
+import org.session.libsignal.utilities.Log;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioCodec {
 
  private static final String TAG = AudioCodec.class.getSimpleName();

app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java

@@ -46,7 +46,7 @@ public class AudioSlidePlayer implements SensorEventListener {
  private final @NonNull Handler progressEventHandler;
  private final @NonNull AudioManager audioManager;
  private final @NonNull SensorManager sensorManager;
- private final @NonNull Sensor proximitySensor;
+ private final Sensor proximitySensor;
  private final @Nullable WakeLock wakeLock;
 
  private @NonNull WeakReference<Listener> listener;
@@ -132,7 +132,9 @@ public void onPlaybackStateChanged(int playbackState) {
  mediaPlayer.seekTo((long) (mediaPlayer.getDuration() * progress));
  }
 
- sensorManager.registerListener(AudioSlidePlayer.this, proximitySensor, SensorManager.SENSOR_DELAY_NORMAL);
+ if(proximitySensor != null) {
+ sensorManager.registerListener(AudioSlidePlayer.this, proximitySensor, SensorManager.SENSOR_DELAY_NORMAL);
+ }
 
  setPlaying(AudioSlidePlayer.this);
  }

app/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java

@@ -2,15 +2,10 @@
 
 import android.Manifest;
 import android.animation.Animator;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.loader.app.LoaderManager;
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -26,8 +21,12 @@
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import org.thoughtcrime.securesms.permissions.Permissions;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+
 import org.session.libsession.utilities.ViewUtil;
+import org.thoughtcrime.securesms.permissions.Permissions;
 
 import network.loki.messenger.R;
 
@@ -126,25 +125,19 @@ public void show(@NonNull Activity activity, final @NonNull View anchor) {
  public void onGlobalLayout() {
  getContentView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- animateWindowInCircular(anchor, getContentView());
- } else {
- animateWindowInTranslate(getContentView());
- }
+ animateWindowInCircular(anchor, getContentView());
  }
  });
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- animateButtonIn(imageButton, ANIMATION_DURATION / 2);
- animateButtonIn(cameraButton, ANIMATION_DURATION / 2);
+ animateButtonIn(imageButton, ANIMATION_DURATION / 2);
+ animateButtonIn(cameraButton, ANIMATION_DURATION / 2);
 
- animateButtonIn(audioButton, ANIMATION_DURATION / 3);
- animateButtonIn(locationButton, ANIMATION_DURATION / 3);
- animateButtonIn(documentButton, ANIMATION_DURATION / 4);
- animateButtonIn(gifButton, ANIMATION_DURATION / 4);
- animateButtonIn(contactButton, 0);
- animateButtonIn(closeButton, 0);
- }
+ animateButtonIn(audioButton, ANIMATION_DURATION / 3);
+ animateButtonIn(locationButton, ANIMATION_DURATION / 3);
+ animateButtonIn(documentButton, ANIMATION_DURATION / 4);
+ animateButtonIn(gifButton, ANIMATION_DURATION / 4);
+ animateButtonIn(contactButton, 0);
+ animateButtonIn(closeButton, 0);
  }
 
  private void updateHeight() {
@@ -159,11 +152,7 @@ private void updateHeight() {
 
  @Override
  public void dismiss() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- animateWindowOutCircular(currentAnchor, getContentView());
- } else {
- animateWindowOutTranslate(getContentView());
- }
+ animateWindowOutCircular(currentAnchor, getContentView());
  }
 
  public void setListener(@Nullable AttachmentClickedListener listener) {
@@ -182,7 +171,6 @@ private void animateButtonIn(View button, int delay) {
  button.startAnimation(animation);
  }
 
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
  private void animateWindowInCircular(@Nullable View anchor, @NonNull View contentView) {
  Pair<Integer, Integer> coordinates = getClickOrigin(anchor, contentView);
  Animator animator = ViewAnimationUtils.createCircularReveal(contentView,
@@ -201,7 +189,6 @@ private void animateWindowInTranslate(@NonNull View contentView) {
  getContentView().startAnimation(animation);
  }
 
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
  private void animateWindowOutCircular(@Nullable View anchor, @NonNull View contentView) {
  Pair<Integer, Integer> coordinates = getClickOrigin(anchor, contentView);
  Animator animator = ViewAnimationUtils.createCircularReveal(getContentView(),

app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.InputType;
 import android.text.Spannable;
@@ -16,15 +15,14 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.core.os.BuildCompat;
 import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 
-import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
-import org.session.libsignal.utilities.Log;
 import org.session.libsession.utilities.TextSecurePreferences;
+import org.session.libsignal.utilities.Log;
+import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
 
 public class ComposeText extends EmojiEditText {
 
@@ -136,7 +134,6 @@ public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
  editorInfo.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
  }
 
- if (Build.VERSION.SDK_INT < 21) return inputConnection;
  if (mediaListener == null) return inputConnection;
  if (inputConnection == null) return null;
 
@@ -154,7 +151,6 @@ private void initialize() {
  }
  }
 
- @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
  private static class CommitContentListener implements InputConnectionCompat.OnCommitContentListener {
 
  private static final String TAG = CommitContentListener.class.getSimpleName();

app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemAlertView.java

@@ -1,9 +1,7 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.os.Build.VERSION_CODES;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -27,7 +25,6 @@ public ConversationItemAlertView(Context context, AttributeSet attrs) {
  initialize(attrs);
  }
 
- @TargetApi(VERSION_CODES.HONEYCOMB)
  public ConversationItemAlertView(final Context context, AttributeSet attrs, int defStyle) {
  super(context, attrs, defStyle);
  initialize(attrs);

app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java

@@ -1,16 +1,15 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
 import android.view.animation.ScaleAnimation;
 import android.widget.LinearLayout;
 
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+
 public class HidingLinearLayout extends LinearLayout {
 
  public HidingLinearLayout(Context context) {
@@ -21,7 +20,6 @@ public HidingLinearLayout(Context context, AttributeSet attrs) {
  super(context, attrs);
  }
 
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
  public HidingLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
  super(context, attrs, defStyleAttr);
  }

app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java

@@ -1,13 +1,12 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.Uri;
-import android.os.Build;
-import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+
 public class InputPanel extends LinearLayout {
 
  public InputPanel(Context context) {
@@ -18,7 +17,6 @@ public InputPanel(Context context, AttributeSet attrs) {
  super(context, attrs);
  }
 
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
  public InputPanel(Context context, AttributeSet attrs, int defStyleAttr) {
  super(context, attrs, defStyleAttr);
  }