Fix warnings and migrate to androidx

radio-pi · Nov 26, 2022 · e7a9f6b · e7a9f6b
1 parent 65bfc24
commit e7a9f6b
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-*.iml
 .gradle
 /local.properties
 /.idea/caches
@@ -12,7 +11,6 @@
 .DS_Store
 /build
 /captures
-.externalNativeBuild
 
 # Built application files
 *.apk
@@ -94,3 +92,5 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+app/release/
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    namespace 'name.l33t.radiopi'
+    compileSdkVersion 32
     defaultConfig {
         applicationId "name.l33t.radiopi"
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion 31
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -20,22 +21,21 @@ android {
         targetCompatibility = "8"
         sourceCompatibility = "8"
     }
-    namespace 'name.l33t.radiopi'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'org.java-websocket:Java-WebSocket:1.4.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'android.arch.persistence.room:runtime:1.1.1'
-    annotationProcessor 'android.arch.persistence.room:compiler:1.1.1'
-    implementation 'com.android.support:preference-v7:28.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'org.java-websocket:Java-WebSocket:1.5.3'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation group: 'com.google.android.material', name: 'material', version: '1.8.0-alpha03'
+    implementation 'androidx.room:room-runtime:2.4.3'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
+    annotationProcessor 'androidx.room:room-compiler:2.4.3'
+    implementation 'androidx.preference:preference:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="name.l33t.radiopi">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -26,7 +26,8 @@
             android:parentActivityName=".MainActivity"
             android:screenOrientation="portrait"/>
         <activity android:name=".MainActivity"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/java/name/l33t/radiopi/MainActivity.java b/app/src/main/java/name/l33t/radiopi/MainActivity.java
@@ -12,10 +12,12 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -25,9 +27,11 @@
 import android.widget.TextView;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.List;
 
 import name.l33t.radiopi.database.AppDatabase;
@@ -146,7 +150,7 @@ protected void onDestroy() {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
         getMenuInflater().inflate(R.menu.menu_main, menu);
         return true;
     }
@@ -214,8 +218,8 @@ public void updateNowPlaying(String streamkey) {
         isPlaying = !streamkey.equals(""); // If streamkey is empty, no stream is playing.
         currentlyPlayingStationUrl = streamkey;
         new SetRadioStationImageTask(findViewById(R.id.imageView)).execute(currentlyPlayingStationUrl);
-        runOnUiThread(() -> setPlayStopButton());
-        runOnUiThread(() -> setPlayStopButton());
+        runOnUiThread(this::setPlayStopButton);
+        runOnUiThread(this::setPlayStopButton);
     }
 
     //endregion
@@ -242,8 +246,15 @@ protected Bitmap doInBackground(String... stationUrls) {
                     imageUri = station.getImg();
                 }
             }
+            if(imageUri == null)
+            {
+                return null; // early return for empty url
+            }
+
             try {
-                stationImage = BitmapFactory.decodeStream(new java.net.URL(imageUri).openStream());
+                URL url = new URL(imageUri);
+                InputStream stream = url.openStream();
+                stationImage = BitmapFactory.decodeStream(stream);
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -292,7 +303,7 @@ private void switchPlayStop() {
             isPlaying = true;
             view.setBackgroundResource(R.drawable.stop);
             new StartPlayingTask(view).execute(currentlyPlayingStationUrl);
-            if(currentlyPlayingStationTitle != null && currentlyPlayingStationTitle != "") {
+            if(currentlyPlayingStationTitle != null && !currentlyPlayingStationTitle.equals("")) {
                 createNotification(currentlyPlayingStationTitle);
             }
         }
@@ -349,7 +360,7 @@ private void createNotificationChannel() {
     private void createNotification(String stationTitle) {
         Intent mainActivityIntent = new Intent(this, MainActivity.class);
         PendingIntent pendingIntent = PendingIntent
-                .getActivity(this, NOTIFICATION_PENDING_INTENT_ID, mainActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                .getActivity(this, NOTIFICATION_PENDING_INTENT_ID, mainActivityIntent, PendingIntent.FLAG_MUTABLE);
 
         Notification notification =  new NotificationCompat.Builder(this, CHANNEL_ID)
                 .setContentTitle("RadioPi Player")

diff --git a/app/src/main/java/name/l33t/radiopi/RadioStationEditActivity.java b/app/src/main/java/name/l33t/radiopi/RadioStationEditActivity.java
@@ -2,7 +2,7 @@
 
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;

diff --git a/app/src/main/java/name/l33t/radiopi/RadioStationListActivity.java b/app/src/main/java/name/l33t/radiopi/RadioStationListActivity.java
@@ -4,14 +4,14 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.List;
 

diff --git a/app/src/main/java/name/l33t/radiopi/SettingsActivity.java b/app/src/main/java/name/l33t/radiopi/SettingsActivity.java
@@ -1,7 +1,7 @@
 package name.l33t.radiopi;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class SettingsActivity extends AppCompatActivity {
 

diff --git a/app/src/main/java/name/l33t/radiopi/SettingsFragment.java b/app/src/main/java/name/l33t/radiopi/SettingsFragment.java
@@ -1,7 +1,7 @@
 package name.l33t.radiopi;
 
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
 
 public final class SettingsFragment extends PreferenceFragmentCompat {
     @Override

diff --git a/app/src/main/java/name/l33t/radiopi/database/AppDatabase.java b/app/src/main/java/name/l33t/radiopi/database/AppDatabase.java
@@ -1,11 +1,11 @@
 package name.l33t.radiopi.database;
 
-import android.arch.persistence.db.SupportSQLiteDatabase;
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.Executors;
 

diff --git a/app/src/main/java/name/l33t/radiopi/database/RadioStation.java b/app/src/main/java/name/l33t/radiopi/database/RadioStation.java
@@ -1,10 +1,10 @@
 package name.l33t.radiopi.database;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Ignore;
-import android.arch.persistence.room.PrimaryKey;
-import android.support.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+import androidx.annotation.NonNull;
 
 import java.util.UUID;
 

diff --git a/app/src/main/java/name/l33t/radiopi/database/RadioStationDao.java b/app/src/main/java/name/l33t/radiopi/database/RadioStationDao.java
@@ -1,9 +1,9 @@
 package name.l33t.radiopi.database;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Delete;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.Query;
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
 
 import java.util.List;
 

diff --git a/app/src/main/java/name/l33t/radiopi/network/WebSocket.java b/app/src/main/java/name/l33t/radiopi/network/WebSocket.java
@@ -29,7 +29,7 @@ public void onOpen(ServerHandshake serverHandshake) {
     @Override
     public void onMessage(String msg) {
         Log.d("onMessage", "got a new message: " + msg);
-        JSONObject jmsg = null;
+        JSONObject jmsg;
         try {
             jmsg = new JSONObject(msg);
 
@@ -40,12 +40,12 @@ public void onMessage(String msg) {
             }
 
             String title = jmsg.optString("title");
-            if(null != titleCallback && "" != title){
+            if(null != titleCallback && !title.equals("")){
                 titleCallback.updateTitle(title);
             }
 
             String streamkey = jmsg.optString("stream_key");
-            if(null != nowPlayingCallback && "" != streamkey){
+            if(null != nowPlayingCallback && !streamkey.equals("")){
                 nowPlayingCallback.updateNowPlaying(streamkey);
             }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -97,4 +97,4 @@
                 android:onClick="onPlayPauseClick"/>
         </LinearLayout>
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_radio_station_edit.xml b/app/src/main/res/layout/activity_radio_station_edit.xml
@@ -8,7 +8,7 @@
     tools:layout_editor_absoluteX="8dp"
     tools:layout_editor_absoluteY="8dp">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_layout_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -20,9 +20,9 @@
             android:layout_height="wrap_content"
             android:hint="@string/name"
             android:importantForAutofill="no"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_layout_url"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/radio_stream_url"
             android:importantForAutofill="no"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_radio_station_list.xml b/app/src/main/res/layout/activity_radio_station_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,7 +8,7 @@
 
     <include layout="@layout/content_radio_station_list" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,4 +17,4 @@
         android:src="@drawable/add"
         android:tint="@android:color/white"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_radio_station_list.xml b/app/src/main/res/layout/content_radio_station_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,4 +12,4 @@
         android:id="@+id/radioList"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/gradle.properties b/gradle.properties
@@ -12,3 +12,5 @@
 # org.gradle.parallel=true
 #Sat Nov 26 13:41:32 CET 2022
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+android.useAndroidX=true
+android.enableJetifier=true