feat: add support for custom headers

app/schemas/com.cappielloantonio.tempo.database.AppDatabase/10.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 10,
-    "identityHash": "58cb958cdb09f054c27673d1de7f26d0",
+    "identityHash": "2b970b61706696dcd6c142bf22c89d37",
     "entities": [
       {
         "tableName": "queue",
@@ -230,7 +230,7 @@
       },
       {
         "tableName": "server",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `server_name` TEXT NOT NULL, `username` TEXT NOT NULL, `password` TEXT NOT NULL, `address` TEXT NOT NULL, `local_address` TEXT, `timestamp` INTEGER NOT NULL, `low_security` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `server_name` TEXT NOT NULL, `username` TEXT NOT NULL, `password` TEXT NOT NULL, `address` TEXT NOT NULL, `local_address` TEXT, `timestamp` INTEGER NOT NULL, `low_security` INTEGER NOT NULL DEFAULT false, `custom_headers` TEXT, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "serverId",
@@ -280,6 +280,12 @@
             "affinity": "INTEGER",
             "notNull": true,
             "defaultValue": "false"
+          },
+          {
+            "fieldPath": "customHeaders",
+            "columnName": "custom_headers",
+            "affinity": "TEXT",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -1059,7 +1065,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '58cb958cdb09f054c27673d1de7f26d0')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2b970b61706696dcd6c142bf22c89d37')"
     ]
   }
 }

app/src/main/AndroidManifest.xml

@@ -75,4 +75,4 @@
                 android:value="true" />
         </service>
     </application>
-</manifest>
+</manifest>

app/src/main/java/com/cappielloantonio/tempo/App.java

@@ -13,6 +13,8 @@
 import com.cappielloantonio.tempo.subsonic.SubsonicPreferences;
 import com.cappielloantonio.tempo.util.Preferences;
 
+import java.util.Map;
+
 public class App extends Application {
     private static App instance;
     private static Context context;
@@ -98,11 +100,13 @@ private static SubsonicPreferences getSubsonicPreferences() {
         String token = Preferences.getToken();
         String salt = Preferences.getSalt();
         boolean isLowSecurity = Preferences.isLowScurity();
+        Map<String, String> customHeaders = Preferences.getCustomHeaders();
 
         SubsonicPreferences preferences = new SubsonicPreferences();
         preferences.setServerUrl(server);
         preferences.setUsername(username);
         preferences.setAuthentication(password, token, salt, isLowSecurity);
+        preferences.setCustomHeaders(customHeaders);
 
         return preferences;
     }

app/src/main/java/com/cappielloantonio/tempo/database/AppDatabase.java

@@ -9,6 +9,7 @@
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.database.converter.DateConverters;
+import com.cappielloantonio.tempo.database.converter.MapTypeConverter;
 import com.cappielloantonio.tempo.database.dao.ChronologyDao;
 import com.cappielloantonio.tempo.database.dao.DownloadDao;
 import com.cappielloantonio.tempo.database.dao.FavoriteDao;
@@ -32,7 +33,7 @@
         entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Chronology.class, Favorite.class, SessionMediaItem.class, Playlist.class},
         autoMigrations = {@AutoMigration(from = 9, to = 10)}
 )
-@TypeConverters({DateConverters.class})
+@TypeConverters({DateConverters.class, MapTypeConverter.class})
 public abstract class AppDatabase extends RoomDatabase {
     private final static String DB_NAME = "tempo_db";
     private static AppDatabase instance;

app/src/main/java/com/cappielloantonio/tempo/database/converter/MapTypeConverter.kt

@@ -0,0 +1,31 @@
+package com.cappielloantonio.tempo.database.converter
+
+import androidx.room.TypeConverter
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+object MapTypeConverter {
+
+    @TypeConverter
+    @JvmStatic
+    fun stringToMap(value: String?): Map<String, String> {
+        return if (value.isNullOrEmpty()) {
+            emptyMap()
+        } else {
+            try {
+                Gson().fromJson(value, object : TypeToken<Map<String, String>>() {}.type)
+                    ?: emptyMap()
+            } catch (e: Exception) {
+                emptyMap()
+            }
+        }
+    }
+
+
+    @TypeConverter
+    @JvmStatic
+    fun mapToString(value: Map<String, String>?): String {
+        return value?.let { Gson().toJson(it) } ?: ""
+    }
+}
+

app/src/main/java/com/cappielloantonio/tempo/model/Server.kt

@@ -35,5 +35,8 @@ data class Server(
     val timestamp: Long,
 
     @ColumnInfo(name = "low_security", defaultValue = "false")
-    val isLowSecurity: Boolean
+    val isLowSecurity: Boolean,
+
+    @ColumnInfo(name = "custom_headers")
+    var customHeaders: Map<String, String>? = null,
 ) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/RetrofitClient.kt

@@ -4,6 +4,7 @@ import com.cappielloantonio.tempo.App
 import com.cappielloantonio.tempo.subsonic.utils.CacheUtil
 import com.google.gson.GsonBuilder
 import okhttp3.Cache
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -12,14 +13,15 @@ import java.util.concurrent.TimeUnit
 
 class RetrofitClient(subsonic: Subsonic) {
     var retrofit: Retrofit
+    var customHeaders: Map<String, String> = subsonic.customHeaders;
 
-    init {
-        retrofit = Retrofit.Builder()
-            .baseUrl(subsonic.url)
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create()))
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().setLenient().create()))
-            .client(getOkHttpClient())
-            .build()
+    init {;
+        retrofit = Retrofit.Builder().baseUrl(subsonic.url).addConverterFactory(
+                GsonConverterFactory.create(
+                    GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create()
+                )
+            ).addConverterFactory(GsonConverterFactory.create(GsonBuilder().setLenient().create()))
+            .client(getOkHttpClient()).build()
     }
 
     private fun getOkHttpClient(): OkHttpClient {
@@ -35,16 +37,18 @@ class RetrofitClient(subsonic: Subsonic) {
         // SystemClient 60
         // AlbumSongListClient 60
 
-        return OkHttpClient.Builder()
-            .callTimeout(2, TimeUnit.MINUTES)
-            .connectTimeout(20, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .writeTimeout(30, TimeUnit.SECONDS)
-            .addInterceptor(getHttpLoggingInterceptor())
+        val builder = OkHttpClient.Builder().callTimeout(2, TimeUnit.MINUTES)
+            .connectTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS)
+            .writeTimeout(30, TimeUnit.SECONDS).addInterceptor(getHttpLoggingInterceptor())
             .addInterceptor(cacheUtil.offlineInterceptor)
             // .addNetworkInterceptor(cacheUtil.onlineInterceptor)
             .cache(getCache())
-            .build()
+
+        if (customHeaders.isNotEmpty()) {
+            builder.addNetworkInterceptor(getCustomHeadersInterceptor())
+        }
+
+        return builder.build()
     }
 
     private fun getHttpLoggingInterceptor(): HttpLoggingInterceptor {
@@ -53,6 +57,21 @@ class RetrofitClient(subsonic: Subsonic) {
         return loggingInterceptor
     }
 
+    private fun getCustomHeadersInterceptor(): Interceptor {
+        return Interceptor { chain ->
+            val original = chain.request()
+            val requestBuilder = original.newBuilder()
+
+            customHeaders.forEach { (key, value) ->
+                requestBuilder.addHeader(key, value)
+            }
+
+            val request = requestBuilder.build()
+            chain.proceed(request)
+        }
+    }
+
+
     private fun getCache(): Cache {
         val cacheSize = 10 * 1024 * 1024
         return Cache(App.getContext().cacheDir, cacheSize.toLong())

app/src/main/java/com/cappielloantonio/tempo/subsonic/Subsonic.java

@@ -142,6 +142,10 @@ public String getUrl() {
         return url.replace("//rest", "/rest");
     }
 
+    public Map<String, String> getCustomHeaders() {
+        return preferences.getCustomHeaders();
+    }
+
     public Map<String, String> getParams() {
         Map<String, String> params = new HashMap<>();
         params.put("u", preferences.getUsername());

app/src/main/java/com/cappielloantonio/tempo/subsonic/SubsonicPreferences.java

@@ -2,13 +2,16 @@
 
 import com.cappielloantonio.tempo.subsonic.utils.StringUtil;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 public class SubsonicPreferences {
     private String serverUrl;
     private String username;
     private String clientName = "Tempo";
     private SubsonicAuthentication authentication;
+    private Map<String, String> customHeaders;
 
     public String getServerUrl() {
         return serverUrl;
@@ -48,6 +51,19 @@ public void setAuthentication(String password, String token, String salt, boolea
         }
     }
 
+    public void setCustomHeaders(Map<String, String> headers) {
+        if (headers != null && !headers.isEmpty()) {
+            this.customHeaders = headers;
+        }
+    }
+
+    public Map<String, String> getCustomHeaders() {
+        if (this.customHeaders != null) {
+            return this.customHeaders;
+        }
+        return new HashMap<>();
+    }
+
     public static class SubsonicAuthentication {
         private String password;
         private String salt;

app/src/main/java/com/cappielloantonio/tempo/ui/adapter/CustomHeadersAdapter.java

@@ -0,0 +1,82 @@
+package com.cappielloantonio.tempo.ui.adapter;
+
+import android.annotation.SuppressLint;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.cappielloantonio.tempo.R;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class CustomHeadersAdapter extends RecyclerView.Adapter<CustomHeadersAdapter.ViewHolder> {
+    private final List<Map.Entry<String, String>> localCustomHeaders;
+    private final OnDeleteListener onDeleteListener;
+
+    public interface OnDeleteListener {
+        void onDelete(String key);
+    }
+
+    // ViewHolder class
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        private final TextView headerDetailsView;
+        private final Button deleteButton;
+
+        public ViewHolder(View view) {
+            super(view);
+            headerDetailsView = view.findViewById(R.id.custom_header_value_text_view);
+            deleteButton = view.findViewById(R.id.delete_icon);
+        }
+
+        public TextView getTextView() {
+            return headerDetailsView;
+        }
+    }
+
+    public CustomHeadersAdapter(Map<String, String> data, OnDeleteListener listener) {
+        this.localCustomHeaders = new ArrayList<>(data.entrySet());
+        this.onDeleteListener = listener;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_row_custom_header_value, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        Map.Entry<String, String> entry = localCustomHeaders.get(position);
+        String key = entry.getKey();
+        String value = entry.getValue();
+
+        holder.getTextView().setText(String.format("%s: %s", key, value));
+
+        holder.deleteButton.setOnClickListener(v -> {
+            if (onDeleteListener != null) {
+                this.onDeleteListener.onDelete(key);
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return localCustomHeaders.size();
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    public void updateData(Map<String, String> newData) {
+        localCustomHeaders.clear();
+        localCustomHeaders.addAll(newData.entrySet());
+
+        notifyDataSetChanged();
+    }
+}