README.md

@@ -1,11 +1,12 @@
-# Comet
+Comet
+=====
 
 Comet is a Gemini browser for Android, compatible back to Android 7.0.
 
-It is an unfinished, abandoned and archived project, use another browser.
-Android development is too much of a pain for me to bother at this point.
 
-## Features
+
+Features
+--------
 
 - Developed using standard Android SDK practices for an intuitive experience.
 - Uses the TLS capabilities of your device.
@@ -13,6 +14,9 @@ Android development is too much of a pain for me to bother at this point.
 - Streaming for all content types.
 - History.
 
-## About
 
-Comet is licensed as GPLv3. The app logo is licensed under CC0.
+
+About
+-----
+
+Comet is licensed as GPLv3. The app logo is licensed under CC0.

app/build.gradle

@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-    compileSdk 35
+    compileSdk 33
 
     defaultConfig {
         applicationId "dev.lowrespalmtree.comet"
         minSdk 24
-        targetSdk 35
+        targetSdk 33
         versionCode 1
         versionName "0.1.0"
 
@@ -43,28 +43,27 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'dev.lowrespalmtree.comet'
 }
 
 dependencies {
-    def nav_version = '2.7.7'
+    def nav_version = "2.5.3"
-    def room_version = '2.6.1'
+    def room_version = "2.5.1"
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.fragment:fragment-ktx:1.8.2'
+    implementation 'androidx.fragment:fragment-ktx:1.5.6'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.material:material:1.8.0'
     kapt "androidx.room:room-compiler:$room_version"
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="dev.lowrespalmtree.comet">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/dev/lowrespalmtree/comet/Request.kt

@@ -50,8 +50,8 @@ class Request(private val uri: Uri, private val keyManager: KeyManager? = null)
         scope.launch(Dispatchers.IO) {
             val buffer = ByteArray(1024)
             var numRead: Int
-            socket.inputStream.use { socketInputStream ->
+            socket.inputStream.use { socket_input_stream ->
-                BufferedInputStream(socketInputStream).use { bis ->
+                BufferedInputStream(socket_input_stream).use { bis ->
                     try {
                         while ((bis.read(buffer).also { numRead = it }) >= 0) {
                             val received = buffer.sliceArray(0 until numRead)

app/src/main/res/layout/fragment_identities.xml

@@ -26,8 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:contentDescription="@string/identity_new"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="@+id/list" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -53,6 +53,5 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="logo">Logo</string>
-    <string name="identity_new">Add new identity</string>
 
 </resources>

app/src/main/res/xml/root_preferences.xml

@@ -41,6 +41,17 @@
             app:showSeekBarValue="true"
             app:title="@string/pref_read_timeout_title" />
 
+        <SwitchPreferenceCompat
+            app:key="sync"
+            app:title="@string/sync_title" />
+
+        <SwitchPreferenceCompat
+            app:dependency="sync"
+            app:key="attachment"
+            app:summaryOff="@string/attachment_summary_off"
+            app:summaryOn="@string/attachment_summary_on"
+            app:title="@string/attachment_title" />
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>

build.gradle

@@ -6,8 +6,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
     }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }

gradle.properties

@@ -18,7 +18,4 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Nov 29 12:01:36 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME