From 1e265a61da79a9f8015e38b7ef54cafa75333dca Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 7 Sep 2022 20:05:12 +0200 Subject: [PATCH] OeffiActivity: make lifecycle available to all activities --- oeffi/build.gradle | 3 ++- oeffi/proguard.cfg | 3 ++- oeffi/src/de/schildbach/oeffi/OeffiActivity.java | 4 ++-- .../de/schildbach/oeffi/network/NetworkPickerActivity.java | 4 ++-- oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 4 ++-- .../de/schildbach/oeffi/stations/DecodeForeignActivity.java | 4 ++-- .../NearestFavoriteStationsWidgetPermissionActivity.java | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 1f51a6f..fbba455 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -7,7 +7,6 @@ configurations { all*.exclude group: 'org.json', module: 'json' all*.exclude group: 'net.sf.kxml', module: 'kxml2' all*.exclude group: 'androidx.legacy', module: 'legacy-support-core-ui' - all*.exclude group: 'androidx.lifecycle', module: 'lifecycle-runtime' } dependencies { @@ -17,6 +16,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.1' implementation 'androidx.core:core:1.8.0' + implementation 'androidx.activity:activity:1.5.1' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.13' //noinspection GradleDependency @@ -92,6 +92,7 @@ android { exclude 'META-INF/*.version' exclude 'META-INF/proguard/**' exclude 'META-INF/*.kotlin_module' + exclude 'META-INF/com.android.tools/proguard/coroutines.pro' exclude 'kotlin/**' } } diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg index 2158d22..2d1732a 100644 --- a/oeffi/proguard.cfg +++ b/oeffi/proguard.cfg @@ -46,11 +46,12 @@ } # androidx --dontwarn androidx.core.** +-dontwarn kotlinx.coroutines.** -dontwarn module-info -dontnote androidx.core.** -dontnote androidx.versionedparcelable.VersionedParcel -dontnote kotlin.** +-dontnote kotlinx.** # OkHttp -dontwarn okio.DeflaterSink diff --git a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java index ede9d8e..8ab20f5 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java @@ -18,7 +18,6 @@ package de.schildbach.oeffi; import android.annotation.TargetApi; -import android.app.Activity; import android.app.ActivityManager.TaskDescription; import android.content.SharedPreferences; import android.content.res.Resources; @@ -31,6 +30,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.activity.ComponentActivity; import de.schildbach.oeffi.network.NetworkResources; import de.schildbach.oeffi.util.ErrorReporter; import de.schildbach.pte.NetworkId; @@ -38,7 +38,7 @@ import de.schildbach.pte.dto.ResultHeader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class OeffiActivity extends Activity { +public abstract class OeffiActivity extends ComponentActivity { protected Application application; protected SharedPreferences prefs; diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index ecbde91..f6204fe 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -19,7 +19,6 @@ package de.schildbach.oeffi.network; import android.Manifest; import android.annotation.TargetApi; -import android.app.Activity; import android.app.ActivityManager.TaskDescription; import android.content.Context; import android.content.Intent; @@ -40,6 +39,7 @@ import android.view.KeyEvent; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.activity.ComponentActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; @@ -75,7 +75,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -public class NetworkPickerActivity extends Activity implements ActivityCompat.OnRequestPermissionsResultCallback, +public class NetworkPickerActivity extends ComponentActivity implements ActivityCompat.OnRequestPermissionsResultCallback, LocationHelper.Callback, NetworkClickListener, NetworkContextMenuItemListener { public static void start(final Context context) { final Intent intent = new Intent(context, NetworkPickerActivity.class); diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index 900fb72..f2ff948 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -17,7 +17,6 @@ package de.schildbach.oeffi.plans; -import android.app.Activity; import android.app.SearchManager; import android.content.Context; import android.content.Intent; @@ -36,6 +35,7 @@ import android.view.animation.AnimationUtils; import android.widget.PopupMenu; import android.widget.TextView; import android.widget.ViewAnimator; +import androidx.activity.ComponentActivity; import androidx.annotation.Nullable; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -79,7 +79,7 @@ import java.util.TreeSet; import static com.google.common.base.Preconditions.checkNotNull; -public class PlanActivity extends Activity { +public class PlanActivity extends ComponentActivity { public static final String INTENT_EXTRA_PLAN_ID = "plan_id"; // Used in launcher shortcuts private static final String INTENT_EXTRA_SELECTED_STATION_ID = PlanActivity.class.getName() + ".selected_station_id"; diff --git a/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java b/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java index 58b020b..7728cde 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/DecodeForeignActivity.java @@ -17,11 +17,11 @@ package de.schildbach.oeffi.stations; -import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import androidx.activity.ComponentActivity; import de.schildbach.oeffi.Application; import de.schildbach.oeffi.R; import de.schildbach.oeffi.util.DialogBuilder; @@ -38,7 +38,7 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class DecodeForeignActivity extends Activity { +public class DecodeForeignActivity extends ComponentActivity { private static final Pattern PATTERN_META_REFRESH = Pattern .compile("