Simplify intent code since the minimum target level is Android 7

Author: Bertware

Hyperrail/src/main/java/be/hyperrail/android/VehiclePopupContextMenu.java

@@ -15,11 +15,15 @@
 import android.graphics.Color;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+
 import androidx.annotation.NonNull;
+
 import com.google.android.material.snackbar.Snackbar;
+
 import androidx.core.app.NotificationCompat.Builder;
 import androidx.core.app.NotificationCompat.DecoratedCustomViewStyle;
 import androidx.core.content.ContextCompat;
+
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.LinearLayout;
@@ -165,7 +169,7 @@ private void bindTrain(Dialog vDialog, TransportDataSource mApiInstance) {
 
         vDialog.setTitle(
                 mLeg.getVehicleInformation().getName() + " " +
-                        mLeg.getDeparture().getStation().getLocalizedName() + "-" + mLeg.getArrival().getStation().getLocalizedName());
+                mLeg.getDeparture().getStation().getLocalizedName() + "-" + mLeg.getArrival().getStation().getLocalizedName());
 
         // Occupancy + departure ETA
         if (mLeg.getType() != RouteLegType.WALK) {
@@ -265,7 +269,7 @@ private void bindTrainStop(Dialog vDialog, TransportDataSource mApiInstance) {
                 mVehicleSemanticId, mDateTime);
 
         vDialog.setTitle(mVehicleStop.getVehicle().getName() + " " +
-                mVehicleStop.getStopLocation().getLocalizedName());
+                         mVehicleStop.getStopLocation().getLocalizedName());
 
         String mDepartureEtaText = String.format(mContext.getString(string.ETA_stop_departure),
                 DATETIMEFORMAT_HHMM.print(
@@ -398,7 +402,7 @@ public void onClick(View v) {
                                 mContext,
                                 0,
                                 resultIntent,
-                                PendingIntent.FLAG_UPDATE_CURRENT
+                                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
                         );
                 mBuilder.setContentIntent(resultPendingIntent);
 

Hyperrail/src/main/java/be/hyperrail/android/widget/NextDeparturesRemoteViewsDataProvider.java

@@ -119,14 +119,7 @@ public RemoteViews getViewAt(int position) {
                         QueryTimeDefinition.EQUAL_OR_LATER,
                         LiveboardType.DEPARTURES,
                         null));
-
-        int flags;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
-        } else {
-            flags = PendingIntent.FLAG_UPDATE_CURRENT;
-        }
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, onClickIntent, flags);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, onClickIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         bindTimeAndDelays(rv, stop);
         rv.setOnClickPendingIntent(R.id.binder, pendingIntent);
         rv.setTextViewText(R.id.text_destination, stop.getHeadsign());

Hyperrail/src/main/java/be/hyperrail/android/widget/NextDeparturesWidgetProvider.java

@@ -25,6 +25,8 @@
 
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
 
+import java.util.Objects;
+
 public class NextDeparturesWidgetProvider extends AppWidgetProvider {
     private static final HyperRailLog log = HyperRailLog.getLogger(NextDeparturesWidgetProvider.class);
     private static final String INTENT_EXTRA_STATION_ID = "stationId";
@@ -106,14 +108,7 @@ private PendingIntent createOnClickIntent(Context context, StopLocation station)
         Intent onClickIntent = new Intent(context, NextDeparturesWidgetProvider.class);
         onClickIntent.setAction(INTENT_ACTION_LAUNCH_LIVEBOARD_VIEW);
         onClickIntent.putExtra(INTENT_EXTRA_STATION_ID, station);
-        int flags;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
-        } else {
-            flags = PendingIntent.FLAG_UPDATE_CURRENT;
-        }
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, onClickIntent, flags);
-        return pendingIntent;
+        return PendingIntent.getActivity(context, 0, onClickIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     private void setErrorLayout(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
@@ -142,7 +137,7 @@ public void onDisabled(Context context) {
     @Override
     public void onReceive(Context context, Intent intent) {
         super.onReceive(context, intent);
-        if (intent.getAction().equals(INTENT_ACTION_LAUNCH_LIVEBOARD_VIEW)) {
+        if (Objects.equals(intent.getAction(), INTENT_ACTION_LAUNCH_LIVEBOARD_VIEW)) {
             String stationId = intent.getStringExtra(INTENT_EXTRA_STATION_ID);
             Intent liveboardLaunchIntent = LiveboardActivity.createShortcutIntent(context, stationId);
             liveboardLaunchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);