Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85625b4f67 | ||
|
|
609da827c5 | ||
|
|
539f17cdda | ||
|
|
0bd686008d | ||
|
|
65ce3746ca | ||
|
|
6079df3b1e | ||
|
|
5f0dc8a981 | ||
|
|
d79a44491d | ||
|
|
4a04b21975 | ||
|
|
881162737b | ||
|
|
1f78953959 | ||
|
|
3092fcc6d3 | ||
|
|
60d6b1effc |
32
.github/workflows/pr-build-check.yml
vendored
@@ -1,27 +1,22 @@
|
||||
name: PR Build Check
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ main ]
|
||||
paths:
|
||||
- 'android/**'
|
||||
- '.github/workflows/pr-build-check.yml'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build & Test APK
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Code auschecken
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Java einrichten
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: '17'
|
||||
|
||||
- name: Gradle Cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
@@ -31,7 +26,6 @@ jobs:
|
||||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-gradle-
|
||||
|
||||
- name: Version auslesen
|
||||
run: |
|
||||
VERSION_NAME=$(grep "versionName = " android/app/build.gradle.kts | sed 's/.*versionName = "\(.*\)".*/\1/')
|
||||
@@ -39,18 +33,15 @@ jobs:
|
||||
echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
|
||||
echo "VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
|
||||
echo "📱 Version: $VERSION_NAME (Code: $VERSION_CODE)"
|
||||
|
||||
- name: Debug Build erstellen (ohne Signing)
|
||||
run: |
|
||||
cd android
|
||||
./gradlew assembleStandardDebug assembleFdroidDebug --no-daemon --stacktrace
|
||||
|
||||
- name: Unit Tests ausfuehren
|
||||
run: |
|
||||
cd android
|
||||
./gradlew test --no-daemon --stacktrace
|
||||
continue-on-error: true
|
||||
|
||||
- name: Build-Ergebnis pruefen
|
||||
run: |
|
||||
if [ -f "android/app/build/outputs/apk/standard/debug/app-standard-universal-debug.apk" ]; then
|
||||
@@ -60,7 +51,6 @@ jobs:
|
||||
echo "❌ Standard Debug APK Build fehlgeschlagen"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f "android/app/build/outputs/apk/fdroid/debug/app-fdroid-universal-debug.apk" ]; then
|
||||
echo "✅ F-Droid Debug APK erfolgreich gebaut"
|
||||
ls -lh android/app/build/outputs/apk/fdroid/debug/*.apk
|
||||
@@ -68,7 +58,6 @@ jobs:
|
||||
echo "❌ F-Droid Debug APK Build fehlgeschlagen"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Debug APKs hochladen (Artefakte)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -77,7 +66,6 @@ jobs:
|
||||
android/app/build/outputs/apk/standard/debug/*.apk
|
||||
android/app/build/outputs/apk/fdroid/debug/*.apk
|
||||
retention-days: 30
|
||||
|
||||
- name: Kommentar zu PR hinzufuegen
|
||||
uses: actions/github-script@v7
|
||||
if: success()
|
||||
@@ -88,26 +76,24 @@ jobs:
|
||||
.filter(f => f.endsWith('.apk'));
|
||||
const fdroidApk = fs.readdirSync('android/app/build/outputs/apk/fdroid/debug/')
|
||||
.filter(f => f.endsWith('.apk'));
|
||||
|
||||
github.rest.issues.createComment({
|
||||
issue_number: context.issue.number,
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
body: `## ✅ Build erfolgreich!
|
||||
|
||||
**Version:** ${{ env.VERSION_NAME }} (Code: ${{ env.VERSION_CODE }})
|
||||
**Version:** ${{ env.VERSION_NAME }} (Code: ${{ env.VERSION_CODE }})
|
||||
|
||||
### 📦 Debug APKs (Test-Builds)
|
||||
### 📦 Debug APKs (Test-Builds)
|
||||
Die Debug-APKs wurden erfolgreich gebaut und sind als Artefakte verfuegbar:
|
||||
|
||||
Die Debug-APKs wurden erfolgreich gebaut und sind als Artefakte verfuegbar:
|
||||
**Standard Flavor:**
|
||||
${standardApk.map(f => '- \`' + f + '\`').join('\n')}
|
||||
|
||||
**Standard Flavor:**
|
||||
${standardApk.map(f => '- `' + f + '`').join('\n')}
|
||||
**F-Droid Flavor:**
|
||||
${fdroidApk.map(f => '- \`' + f + '\`').join('\n')}
|
||||
|
||||
**F-Droid Flavor:**
|
||||
${fdroidApk.map(f => '- `' + f + '`').join('\n')}
|
||||
> ⚠️ **Hinweis:** Dies sind unsigned Debug-Builds zum Testen. Production Releases werden nur bei Merge auf \`main\` erstellt.
|
||||
|
||||
> ⚠️ **Hinweis:** Dies sind unsigned Debug-Builds zum Testen. Production Releases werden nur bei Merge auf \`main\` erstellt.
|
||||
|
||||
[📥 Download Artefakte](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})`
|
||||
[📥 Download Artefakte](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})`
|
||||
})
|
||||
42
README.en.md
@@ -12,13 +12,43 @@
|
||||
|
||||
---
|
||||
|
||||
## 📱 Screenshots
|
||||
|
||||
<p align="center">
|
||||
<img src="fastlane/metadata/android/de-DE/images/phoneScreenshots/1.jpg" width="250" alt="Notes list">
|
||||
<img src="fastlane/metadata/android/de-DE/images/phoneScreenshots/2.jpg" width="250" alt="Edit note">
|
||||
<img src="fastlane/metadata/android/de-DE/images/phoneScreenshots/3.jpg" width="250" alt="Settings">
|
||||
</p>
|
||||
|
||||
---
|
||||
|
||||
## Features
|
||||
|
||||
- 📝 Offline-First - Notes always available
|
||||
- 🔄 Auto-Sync - Configurable intervals (15/30/60 min)
|
||||
- 🏠 Self-Hosted - WebDAV on your server
|
||||
- 🔐 Privacy-First - No cloud, no tracking
|
||||
- 🔋 Battery-friendly - ~0.2-0.8% per day
|
||||
### 📝 Notes
|
||||
- Create and edit simple text notes
|
||||
- Automatic save
|
||||
- Swipe-to-delete with confirmation
|
||||
|
||||
### 🔄 Synchronization
|
||||
- Auto-sync (15/30/60 min intervals)
|
||||
- WiFi-based - Sync on home WiFi connection
|
||||
- Server check (2s timeout) - No errors in foreign networks
|
||||
- Conflict-free merging via timestamps
|
||||
|
||||
### 🏠 Self-Hosted & Privacy
|
||||
- WebDAV server (Nextcloud, ownCloud, etc.)
|
||||
- Your data stays with you - No tracking, no analytics
|
||||
- 100% Open Source (MIT license)
|
||||
|
||||
### 🔋 Performance
|
||||
- Battery-friendly (~0.2-0.8% per day)
|
||||
- Doze Mode optimized
|
||||
- Offline-first - All features work without internet
|
||||
|
||||
### 🎨 Material Design 3
|
||||
- Dynamic Colors (Material You)
|
||||
- Dark Mode
|
||||
- Modern, intuitive UI
|
||||
|
||||
---
|
||||
|
||||
@@ -75,4 +105,4 @@ Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
|
||||
|
||||
MIT License - see [LICENSE](LICENSE)
|
||||
|
||||
**v1.1.0** · Built with Kotlin + Material Design 3
|
||||
**v1.1.1** · Built with Kotlin + Material Design 3
|
||||
|
||||
42
README.md
@@ -12,13 +12,43 @@
|
||||
|
||||
---
|
||||
|
||||
## 📱 Screenshots
|
||||
|
||||
<p align="center">
|
||||
<img src="fastlane/metadata/android/de-DE/images/phoneScreenshots/1.jpg" width="250" alt="Notizliste">
|
||||
<img src="fastlane/metadata/android/de-DE/images/phoneScreenshots/2.jpg" width="250" alt="Notiz bearbeiten">
|
||||
<img src="fastlane/metadata/android/de-DE/images/phoneScreenshots/3.jpg" width="250" alt="Einstellungen">
|
||||
</p>
|
||||
|
||||
---
|
||||
|
||||
## Features
|
||||
|
||||
- 📝 Offline-First - Notizen immer verfügbar
|
||||
- 🔄 Auto-Sync - Konfigurierbare Intervalle (15/30/60 Min)
|
||||
- 🏠 Self-Hosted - WebDAV auf deinem Server
|
||||
- 🔐 Privacy-First - Keine Cloud, kein Tracking
|
||||
- 🔋 Akkuschonend - ~0.2-0.8% pro Tag
|
||||
### 📝 Notizen
|
||||
- Einfache Textnotizen erstellen und bearbeiten
|
||||
- Automatisches Speichern
|
||||
- Swipe-to-Delete mit Bestätigung
|
||||
|
||||
### 🔄 Synchronisation
|
||||
- Auto-Sync (15/30/60 Min Intervalle)
|
||||
- WiFi-basiert - Sync bei Heim-WLAN-Verbindung
|
||||
- Server-Check (2s Timeout) - Keine Fehler in fremden Netzwerken
|
||||
- Konfliktfreies Merging via Timestamps
|
||||
|
||||
### 🏠 Self-Hosted & Privacy
|
||||
- WebDAV-Server (Nextcloud, ownCloud, etc.)
|
||||
- Deine Daten bei dir - Kein Tracking, keine Analytics
|
||||
- 100% Open Source (MIT Lizenz)
|
||||
|
||||
### 🔋 Performance
|
||||
- Akkuschonend (~0.2-0.8% pro Tag)
|
||||
- Doze Mode optimiert
|
||||
- Offline-First - Alle Features ohne Internet
|
||||
|
||||
### 🎨 Material Design 3
|
||||
- Dynamic Colors (Material You)
|
||||
- Dark Mode
|
||||
- Moderne, intuitive UI
|
||||
|
||||
---
|
||||
|
||||
@@ -75,4 +105,4 @@ Beiträge sind willkommen! Siehe [CONTRIBUTING.md](CONTRIBUTING.md) für Details
|
||||
|
||||
MIT License - siehe [LICENSE](LICENSE)
|
||||
|
||||
**v1.1.0** · Gebaut mit Kotlin + Material Design 3
|
||||
**v1.1.1** · Gebaut mit Kotlin + Material Design 3
|
||||
|
||||
@@ -17,8 +17,8 @@ android {
|
||||
applicationId = "dev.dettmer.simplenotes"
|
||||
minSdk = 24
|
||||
targetSdk = 36
|
||||
versionCode = 3 // 🔥 Bugfix: Spurious Sync Error Notifications + Sync Icon Bug
|
||||
versionName = "1.1.1" // 🔥 Bugfix: Server-Erreichbarkeits-Check + Notification-Improvements
|
||||
versionCode = 4 // 🔥 v1.1.2: UX Fixes + CancellationException Handling
|
||||
versionName = "1.1.2" // 🔥 v1.1.2: Better UX + Job Cancellation Fix
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
@@ -26,6 +26,12 @@ android {
|
||||
buildConfigField("String", "BUILD_DATE", "\"${getBuildDate()}\"")
|
||||
}
|
||||
|
||||
// Disable Google dependency metadata for F-Droid/IzzyOnDroid compatibility
|
||||
dependenciesInfo {
|
||||
includeInApk = false // Removes DEPENDENCY_INFO_BLOCK from APK
|
||||
includeInBundle = false // Also disable for AAB (Google Play)
|
||||
}
|
||||
|
||||
// Enable multiple APKs per ABI for smaller downloads
|
||||
splits {
|
||||
abi {
|
||||
@@ -124,6 +130,9 @@ dependencies {
|
||||
// LocalBroadcastManager für UI Refresh
|
||||
implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
|
||||
|
||||
// SwipeRefreshLayout für Pull-to-Refresh
|
||||
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
||||
|
||||
// Testing (bleiben so)
|
||||
testImplementation(libs.junit)
|
||||
androidTestImplementation(libs.androidx.junit)
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.SimpleNotes"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:networkSecurityConfig="@xml/network_security_config"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
|
||||
@@ -34,6 +34,7 @@ import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import dev.dettmer.simplenotes.sync.WebDavSyncService
|
||||
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||
|
||||
class MainActivity : AppCompatActivity() {
|
||||
|
||||
@@ -41,6 +42,7 @@ class MainActivity : AppCompatActivity() {
|
||||
private lateinit var emptyStateCard: MaterialCardView
|
||||
private lateinit var fabAddNote: FloatingActionButton
|
||||
private lateinit var toolbar: MaterialToolbar
|
||||
private lateinit var swipeRefreshLayout: SwipeRefreshLayout
|
||||
|
||||
private lateinit var adapter: NotesAdapter
|
||||
private val storage by lazy { NotesStorage(this) }
|
||||
@@ -152,6 +154,12 @@ class MainActivity : AppCompatActivity() {
|
||||
try {
|
||||
val syncService = WebDavSyncService(this@MainActivity)
|
||||
|
||||
// 🔥 v1.1.2: Check if there are unsynced changes first (performance optimization)
|
||||
if (!syncService.hasUnsyncedChanges()) {
|
||||
Logger.d(TAG, "⏭️ Auto-sync ($source): No unsynced changes - skipping")
|
||||
return@launch
|
||||
}
|
||||
|
||||
// ⭐ WICHTIG: Server-Erreichbarkeits-Check VOR Sync (wie in SyncWorker)
|
||||
val isReachable = withContext(Dispatchers.IO) {
|
||||
syncService.isServerReachable()
|
||||
@@ -220,6 +228,7 @@ class MainActivity : AppCompatActivity() {
|
||||
emptyStateCard = findViewById(R.id.emptyStateCard)
|
||||
fabAddNote = findViewById(R.id.fabAddNote)
|
||||
toolbar = findViewById(R.id.toolbar)
|
||||
swipeRefreshLayout = findViewById<SwipeRefreshLayout>(R.id.swipeRefreshLayout)
|
||||
}
|
||||
|
||||
private fun setupToolbar() {
|
||||
@@ -233,10 +242,72 @@ class MainActivity : AppCompatActivity() {
|
||||
recyclerViewNotes.adapter = adapter
|
||||
recyclerViewNotes.layoutManager = LinearLayoutManager(this)
|
||||
|
||||
// 🔥 v1.1.2: Setup Pull-to-Refresh
|
||||
setupPullToRefresh()
|
||||
|
||||
// Setup Swipe-to-Delete
|
||||
setupSwipeToDelete()
|
||||
}
|
||||
|
||||
/**
|
||||
* Setup Pull-to-Refresh für manuellen Sync (v1.1.2)
|
||||
*/
|
||||
private fun setupPullToRefresh() {
|
||||
swipeRefreshLayout.setOnRefreshListener {
|
||||
Logger.d(TAG, "🔄 Pull-to-Refresh triggered - starting manual sync")
|
||||
|
||||
lifecycleScope.launch {
|
||||
try {
|
||||
val prefs = getSharedPreferences(Constants.PREFS_NAME, Context.MODE_PRIVATE)
|
||||
val serverUrl = prefs.getString(Constants.KEY_SERVER_URL, null)
|
||||
|
||||
if (serverUrl.isNullOrEmpty()) {
|
||||
showToast("⚠️ Server noch nicht konfiguriert")
|
||||
swipeRefreshLayout.isRefreshing = false
|
||||
return@launch
|
||||
}
|
||||
|
||||
val syncService = WebDavSyncService(this@MainActivity)
|
||||
|
||||
// 🔥 v1.1.2: Check if there are unsynced changes first (performance optimization)
|
||||
if (!syncService.hasUnsyncedChanges()) {
|
||||
Logger.d(TAG, "⏭️ No unsynced changes, skipping server reachability check")
|
||||
showToast("✅ Bereits synchronisiert")
|
||||
swipeRefreshLayout.isRefreshing = false
|
||||
return@launch
|
||||
}
|
||||
|
||||
// Check if server is reachable
|
||||
if (!syncService.isServerReachable()) {
|
||||
showToast("⚠️ Server nicht erreichbar")
|
||||
swipeRefreshLayout.isRefreshing = false
|
||||
return@launch
|
||||
}
|
||||
|
||||
// Perform sync
|
||||
val result = syncService.syncNotes()
|
||||
|
||||
if (result.isSuccess) {
|
||||
showToast("✅ ${result.syncedCount} Notizen synchronisiert")
|
||||
loadNotes()
|
||||
} else {
|
||||
showToast("❌ Sync fehlgeschlagen: ${result.errorMessage}")
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Logger.e(TAG, "Pull-to-Refresh sync failed", e)
|
||||
showToast("❌ Fehler: ${e.message}")
|
||||
} finally {
|
||||
swipeRefreshLayout.isRefreshing = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set Material 3 color scheme
|
||||
swipeRefreshLayout.setColorSchemeResources(
|
||||
com.google.android.material.R.color.material_dynamic_primary50
|
||||
)
|
||||
}
|
||||
|
||||
private fun setupSwipeToDelete() {
|
||||
val itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
|
||||
0, // No drag
|
||||
@@ -336,11 +407,18 @@ class MainActivity : AppCompatActivity() {
|
||||
private fun triggerManualSync() {
|
||||
lifecycleScope.launch {
|
||||
try {
|
||||
showToast("Starte Synchronisation...")
|
||||
|
||||
// Create sync service
|
||||
val syncService = WebDavSyncService(this@MainActivity)
|
||||
|
||||
// 🔥 v1.1.2: Check if there are unsynced changes first (performance optimization)
|
||||
if (!syncService.hasUnsyncedChanges()) {
|
||||
Logger.d(TAG, "⏭️ Manual Sync: No unsynced changes - skipping")
|
||||
showToast("✅ Bereits synchronisiert")
|
||||
return@launch
|
||||
}
|
||||
|
||||
showToast("Starte Synchronisation...")
|
||||
|
||||
// ⭐ WICHTIG: Server-Erreichbarkeits-Check VOR Sync (wie in SyncWorker)
|
||||
val isReachable = withContext(Dispatchers.IO) {
|
||||
syncService.isServerReachable()
|
||||
|
||||
@@ -41,7 +41,8 @@ class NoteEditorActivity : AppCompatActivity() {
|
||||
setSupportActionBar(toolbar)
|
||||
supportActionBar?.apply {
|
||||
setDisplayHomeAsUpEnabled(true)
|
||||
setHomeAsUpIndicator(android.R.drawable.ic_menu_close_clear_cancel)
|
||||
// 🔥 v1.1.2: Use default back arrow (Material Design) instead of X icon
|
||||
// Icon is set in XML: app:navigationIcon="?attr/homeAsUpIndicator"
|
||||
}
|
||||
|
||||
// Find views
|
||||
|
||||
@@ -10,6 +10,7 @@ import android.util.Log
|
||||
import android.view.MenuItem
|
||||
import android.widget.Button
|
||||
import android.widget.EditText
|
||||
import android.widget.RadioButton
|
||||
import android.widget.RadioGroup
|
||||
import android.widget.TextView
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
@@ -20,14 +21,12 @@ import androidx.lifecycle.lifecycleScope
|
||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
||||
import com.google.android.material.appbar.MaterialToolbar
|
||||
import com.google.android.material.card.MaterialCardView
|
||||
import com.google.android.material.chip.Chip
|
||||
import com.google.android.material.color.DynamicColors
|
||||
import com.google.android.material.switchmaterial.SwitchMaterial
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import dev.dettmer.simplenotes.utils.UrlValidator
|
||||
import kotlinx.coroutines.withContext
|
||||
import dev.dettmer.simplenotes.sync.WebDavSyncService
|
||||
import dev.dettmer.simplenotes.sync.NetworkMonitor
|
||||
@@ -49,6 +48,7 @@ class SettingsActivity : AppCompatActivity() {
|
||||
private const val LICENSE_URL = "https://github.com/inventory69/simple-notes-sync/blob/main/LICENSE"
|
||||
}
|
||||
|
||||
private lateinit var textInputLayoutServerUrl: com.google.android.material.textfield.TextInputLayout
|
||||
private lateinit var editTextServerUrl: EditText
|
||||
private lateinit var editTextUsername: EditText
|
||||
private lateinit var editTextPassword: EditText
|
||||
@@ -57,7 +57,12 @@ class SettingsActivity : AppCompatActivity() {
|
||||
private lateinit var buttonSyncNow: Button
|
||||
private lateinit var buttonRestoreFromServer: Button
|
||||
private lateinit var textViewServerStatus: TextView
|
||||
private lateinit var chipAutoSaveStatus: Chip
|
||||
|
||||
// Protocol Selection UI
|
||||
private lateinit var protocolRadioGroup: RadioGroup
|
||||
private lateinit var radioHttp: RadioButton
|
||||
private lateinit var radioHttps: RadioButton
|
||||
private lateinit var protocolHintText: TextView
|
||||
|
||||
// Sync Interval UI
|
||||
private lateinit var radioGroupSyncInterval: RadioGroup
|
||||
@@ -68,8 +73,6 @@ class SettingsActivity : AppCompatActivity() {
|
||||
private lateinit var cardDeveloperProfile: MaterialCardView
|
||||
private lateinit var cardLicense: MaterialCardView
|
||||
|
||||
private var autoSaveIndicatorJob: Job? = null
|
||||
|
||||
private val prefs by lazy {
|
||||
getSharedPreferences(Constants.PREFS_NAME, MODE_PRIVATE)
|
||||
}
|
||||
@@ -98,6 +101,7 @@ class SettingsActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun findViews() {
|
||||
textInputLayoutServerUrl = findViewById(R.id.textInputLayoutServerUrl)
|
||||
editTextServerUrl = findViewById(R.id.editTextServerUrl)
|
||||
editTextUsername = findViewById(R.id.editTextUsername)
|
||||
editTextPassword = findViewById(R.id.editTextPassword)
|
||||
@@ -106,7 +110,12 @@ class SettingsActivity : AppCompatActivity() {
|
||||
buttonSyncNow = findViewById(R.id.buttonSyncNow)
|
||||
buttonRestoreFromServer = findViewById(R.id.buttonRestoreFromServer)
|
||||
textViewServerStatus = findViewById(R.id.textViewServerStatus)
|
||||
chipAutoSaveStatus = findViewById(R.id.chipAutoSaveStatus)
|
||||
|
||||
// Protocol Selection UI
|
||||
protocolRadioGroup = findViewById(R.id.protocolRadioGroup)
|
||||
radioHttp = findViewById(R.id.radioHttp)
|
||||
radioHttps = findViewById(R.id.radioHttps)
|
||||
protocolHintText = findViewById(R.id.protocolHintText)
|
||||
|
||||
// Sync Interval UI
|
||||
radioGroupSyncInterval = findViewById(R.id.radioGroupSyncInterval)
|
||||
@@ -119,16 +128,91 @@ class SettingsActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun loadSettings() {
|
||||
editTextServerUrl.setText(prefs.getString(Constants.KEY_SERVER_URL, ""))
|
||||
val savedUrl = prefs.getString(Constants.KEY_SERVER_URL, "") ?: ""
|
||||
|
||||
// Parse existing URL to extract protocol and host/path
|
||||
if (savedUrl.isNotEmpty()) {
|
||||
val (protocol, hostPath) = parseUrl(savedUrl)
|
||||
|
||||
// Set protocol radio button
|
||||
when (protocol) {
|
||||
"http" -> radioHttp.isChecked = true
|
||||
"https" -> radioHttps.isChecked = true
|
||||
else -> radioHttp.isChecked = true // Default to HTTP (most users have local servers)
|
||||
}
|
||||
|
||||
// Set URL with protocol prefix in the text field
|
||||
editTextServerUrl.setText("$protocol://$hostPath")
|
||||
} else {
|
||||
// Default: HTTP selected (lokale Server sind häufiger), empty URL with prefix
|
||||
radioHttp.isChecked = true
|
||||
editTextServerUrl.setText("http://")
|
||||
}
|
||||
|
||||
editTextUsername.setText(prefs.getString(Constants.KEY_USERNAME, ""))
|
||||
editTextPassword.setText(prefs.getString(Constants.KEY_PASSWORD, ""))
|
||||
switchAutoSync.isChecked = prefs.getBoolean(Constants.KEY_AUTO_SYNC, false)
|
||||
|
||||
// Update hint text based on selected protocol
|
||||
updateProtocolHint()
|
||||
|
||||
// Server Status prüfen
|
||||
checkServerStatus()
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse URL into protocol and host/path components
|
||||
* @param url Full URL like "https://example.com:8080/webdav"
|
||||
* @return Pair of (protocol, hostPath) like ("https", "example.com:8080/webdav")
|
||||
*/
|
||||
private fun parseUrl(url: String): Pair<String, String> {
|
||||
return when {
|
||||
url.startsWith("https://") -> "https" to url.removePrefix("https://")
|
||||
url.startsWith("http://") -> "http" to url.removePrefix("http://")
|
||||
else -> "http" to url // Default to HTTP if no protocol specified
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the hint text below protocol selection based on selected protocol
|
||||
*/
|
||||
private fun updateProtocolHint() {
|
||||
protocolHintText.text = if (radioHttp.isChecked) {
|
||||
"HTTP nur für lokale Netzwerke (z.B. 192.168.x.x, 10.x.x.x)"
|
||||
} else {
|
||||
"HTTPS für sichere Verbindungen über das Internet"
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update protocol prefix in URL field when radio button changes
|
||||
* Keeps the host/path part, only changes http:// <-> https://
|
||||
*/
|
||||
private fun updateProtocolInUrl() {
|
||||
val currentText = editTextServerUrl.text.toString()
|
||||
val newProtocol = if (radioHttp.isChecked) "http" else "https"
|
||||
|
||||
// Extract host/path without protocol
|
||||
val hostPath = when {
|
||||
currentText.startsWith("https://") -> currentText.removePrefix("https://")
|
||||
currentText.startsWith("http://") -> currentText.removePrefix("http://")
|
||||
else -> currentText
|
||||
}
|
||||
|
||||
// Set new URL with correct protocol
|
||||
editTextServerUrl.setText("$newProtocol://$hostPath")
|
||||
|
||||
// Move cursor to end
|
||||
editTextServerUrl.setSelection(editTextServerUrl.text?.length ?: 0)
|
||||
}
|
||||
|
||||
private fun setupListeners() {
|
||||
// Protocol selection listener - update URL prefix when radio changes
|
||||
protocolRadioGroup.setOnCheckedChangeListener { _, checkedId ->
|
||||
updateProtocolInUrl()
|
||||
updateProtocolHint()
|
||||
}
|
||||
|
||||
buttonTestConnection.setOnClickListener {
|
||||
saveSettings()
|
||||
testConnection()
|
||||
@@ -146,24 +230,23 @@ class SettingsActivity : AppCompatActivity() {
|
||||
|
||||
switchAutoSync.setOnCheckedChangeListener { _, isChecked ->
|
||||
onAutoSyncToggled(isChecked)
|
||||
showAutoSaveIndicator()
|
||||
}
|
||||
|
||||
// Clear error when user starts typing again
|
||||
editTextServerUrl.addTextChangedListener(object : android.text.TextWatcher {
|
||||
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
|
||||
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
|
||||
textInputLayoutServerUrl.error = null
|
||||
}
|
||||
override fun afterTextChanged(s: android.text.Editable?) {}
|
||||
})
|
||||
|
||||
// Server Status Check bei Settings-Änderung
|
||||
editTextServerUrl.setOnFocusChangeListener { _, hasFocus ->
|
||||
if (!hasFocus) {
|
||||
checkServerStatus()
|
||||
showAutoSaveIndicator()
|
||||
}
|
||||
}
|
||||
|
||||
editTextUsername.setOnFocusChangeListener { _, hasFocus ->
|
||||
if (!hasFocus) showAutoSaveIndicator()
|
||||
}
|
||||
|
||||
editTextPassword.setOnFocusChangeListener { _, hasFocus ->
|
||||
if (!hasFocus) showAutoSaveIndicator()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -258,8 +341,26 @@ class SettingsActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun saveSettings() {
|
||||
// URL is already complete with protocol in the text field (http:// or https://)
|
||||
val fullUrl = editTextServerUrl.text.toString().trim()
|
||||
|
||||
// Clear previous error
|
||||
textInputLayoutServerUrl.error = null
|
||||
textInputLayoutServerUrl.isErrorEnabled = false
|
||||
|
||||
// 🔥 v1.1.2: Validate HTTP URL (only allow for local networks)
|
||||
if (fullUrl.isNotEmpty()) {
|
||||
val (isValid, errorMessage) = UrlValidator.validateHttpUrl(fullUrl)
|
||||
if (!isValid) {
|
||||
// Only show error in TextField (no Toast)
|
||||
textInputLayoutServerUrl.isErrorEnabled = true
|
||||
textInputLayoutServerUrl.error = errorMessage
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
prefs.edit().apply {
|
||||
putString(Constants.KEY_SERVER_URL, editTextServerUrl.text.toString().trim())
|
||||
putString(Constants.KEY_SERVER_URL, fullUrl)
|
||||
putString(Constants.KEY_USERNAME, editTextUsername.text.toString().trim())
|
||||
putString(Constants.KEY_PASSWORD, editTextPassword.text.toString().trim())
|
||||
putBoolean(Constants.KEY_AUTO_SYNC, switchAutoSync.isChecked)
|
||||
@@ -268,6 +369,24 @@ class SettingsActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun testConnection() {
|
||||
// URL is already complete with protocol in the text field (http:// or https://)
|
||||
val fullUrl = editTextServerUrl.text.toString().trim()
|
||||
|
||||
// Clear previous error
|
||||
textInputLayoutServerUrl.error = null
|
||||
textInputLayoutServerUrl.isErrorEnabled = false
|
||||
|
||||
// 🔥 v1.1.2: Validate before testing
|
||||
if (fullUrl.isNotEmpty()) {
|
||||
val (isValid, errorMessage) = UrlValidator.validateHttpUrl(fullUrl)
|
||||
if (!isValid) {
|
||||
// Only show error in TextField (no Toast)
|
||||
textInputLayoutServerUrl.isErrorEnabled = true
|
||||
textInputLayoutServerUrl.error = errorMessage
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
lifecycleScope.launch {
|
||||
try {
|
||||
showToast("Teste Verbindung...")
|
||||
@@ -291,8 +410,23 @@ class SettingsActivity : AppCompatActivity() {
|
||||
private fun syncNow() {
|
||||
lifecycleScope.launch {
|
||||
try {
|
||||
showToast("Synchronisiere...")
|
||||
val syncService = WebDavSyncService(this@SettingsActivity)
|
||||
|
||||
// 🔥 v1.1.2: Check if there are unsynced changes first (performance optimization)
|
||||
if (!syncService.hasUnsyncedChanges()) {
|
||||
showToast("✅ Bereits synchronisiert")
|
||||
return@launch
|
||||
}
|
||||
|
||||
showToast("Synchronisiere...")
|
||||
|
||||
// ⭐ WICHTIG: Server-Erreichbarkeits-Check VOR Sync (wie in anderen Triggern)
|
||||
if (!syncService.isServerReachable()) {
|
||||
showToast("⚠️ Server nicht erreichbar")
|
||||
checkServerStatus() // Server-Status aktualisieren
|
||||
return@launch
|
||||
}
|
||||
|
||||
val result = syncService.syncNotes()
|
||||
|
||||
if (result.isSuccess) {
|
||||
@@ -420,32 +554,6 @@ class SettingsActivity : AppCompatActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
private fun showAutoSaveIndicator() {
|
||||
// Cancel previous job if still running
|
||||
autoSaveIndicatorJob?.cancel()
|
||||
|
||||
// Show saving indicator
|
||||
chipAutoSaveStatus.apply {
|
||||
visibility = android.view.View.VISIBLE
|
||||
text = "💾 Speichere..."
|
||||
setChipBackgroundColorResource(android.R.color.darker_gray)
|
||||
}
|
||||
|
||||
// Save settings
|
||||
saveSettings()
|
||||
|
||||
// Show saved confirmation after short delay
|
||||
autoSaveIndicatorJob = lifecycleScope.launch {
|
||||
delay(300) // Short delay to show "Speichere..."
|
||||
chipAutoSaveStatus.apply {
|
||||
text = "✓ Gespeichert"
|
||||
setChipBackgroundColorResource(android.R.color.holo_green_light)
|
||||
}
|
||||
delay(2000) // Show for 2 seconds
|
||||
chipAutoSaveStatus.visibility = android.view.View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
private fun showRestoreConfirmation() {
|
||||
android.app.AlertDialog.Builder(this)
|
||||
.setTitle(R.string.restore_confirmation_title)
|
||||
|
||||
@@ -8,6 +8,7 @@ import androidx.work.WorkerParameters
|
||||
import dev.dettmer.simplenotes.BuildConfig
|
||||
import dev.dettmer.simplenotes.utils.Logger
|
||||
import dev.dettmer.simplenotes.utils.NotificationHelper
|
||||
import kotlinx.coroutines.CancellationException
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@@ -52,7 +53,25 @@ class SyncWorker(
|
||||
}
|
||||
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "📍 Step 2: Checking server reachability (Pre-Check)")
|
||||
Logger.d(TAG, "📍 Step 2: Checking for unsynced changes (Performance Pre-Check)")
|
||||
}
|
||||
|
||||
// 🔥 v1.1.2: Performance-Optimierung - Skip Sync wenn keine lokalen Änderungen
|
||||
// Spart Batterie + Netzwerk-Traffic + Server-Last
|
||||
if (!syncService.hasUnsyncedChanges()) {
|
||||
Logger.d(TAG, "⏭️ No local changes - skipping sync (performance optimization)")
|
||||
Logger.d(TAG, " Saves battery, network traffic, and server load")
|
||||
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "✅ SyncWorker.doWork() SUCCESS (no changes to sync)")
|
||||
Logger.d(TAG, "═══════════════════════════════════════")
|
||||
}
|
||||
|
||||
return@withContext Result.success()
|
||||
}
|
||||
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "📍 Step 3: Checking server reachability (Pre-Check)")
|
||||
}
|
||||
|
||||
// ⭐ KRITISCH: Server-Erreichbarkeits-Check VOR Sync
|
||||
@@ -63,6 +82,9 @@ class SyncWorker(
|
||||
Logger.d(TAG, " Reason: Server offline/wrong network/network not ready/not configured")
|
||||
Logger.d(TAG, " This is normal in foreign WiFi or during network initialization")
|
||||
|
||||
// 🔥 v1.1.2: Check if we should show warning (server unreachable for >24h)
|
||||
checkAndShowSyncWarning(syncService)
|
||||
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "✅ SyncWorker.doWork() SUCCESS (silent skip)")
|
||||
Logger.d(TAG, "═══════════════════════════════════════")
|
||||
@@ -147,6 +169,32 @@ class SyncWorker(
|
||||
}
|
||||
Result.failure()
|
||||
}
|
||||
} catch (e: CancellationException) {
|
||||
// ⭐ Job wurde gecancelt - KEIN FEHLER!
|
||||
// Gründe: App-Update, Doze Mode, Battery Optimization, Network Constraint, etc.
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "═══════════════════════════════════════")
|
||||
}
|
||||
Logger.d(TAG, "⏹️ Job was cancelled (normal - update/doze/constraints)")
|
||||
Logger.d(TAG, " Reason could be: App update, Doze mode, Battery opt, Network disconnect")
|
||||
Logger.d(TAG, " This is expected Android behavior - not an error!")
|
||||
|
||||
try {
|
||||
// UI-Refresh trotzdem triggern (falls MainActivity geöffnet)
|
||||
broadcastSyncCompleted(false, 0)
|
||||
} catch (broadcastError: Exception) {
|
||||
Logger.e(TAG, "Failed to broadcast after cancellation", broadcastError)
|
||||
}
|
||||
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "✅ SyncWorker.doWork() SUCCESS (cancelled, no error)")
|
||||
Logger.d(TAG, "═══════════════════════════════════════")
|
||||
}
|
||||
|
||||
// ⚠️ WICHTIG: Result.success() zurückgeben!
|
||||
// Cancellation ist KEIN Fehler, WorkManager soll nicht retries machen
|
||||
Result.success()
|
||||
|
||||
} catch (e: Exception) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
Logger.d(TAG, "═══════════════════════════════════════")
|
||||
@@ -189,4 +237,69 @@ class SyncWorker(
|
||||
LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
|
||||
Logger.d(TAG, "📡 Broadcast sent: success=$success, count=$count")
|
||||
}
|
||||
|
||||
/**
|
||||
* Prüft ob Server längere Zeit unreachable und zeigt ggf. Warnung (v1.1.2)
|
||||
* - Nur wenn Auto-Sync aktiviert
|
||||
* - Nur wenn schon mal erfolgreich gesynct
|
||||
* - Nur wenn >24h seit letztem erfolgreichen Sync
|
||||
* - Throttling: Max. 1 Warnung pro 24h
|
||||
*/
|
||||
private fun checkAndShowSyncWarning(syncService: WebDavSyncService) {
|
||||
try {
|
||||
val prefs = applicationContext.getSharedPreferences(
|
||||
dev.dettmer.simplenotes.utils.Constants.PREFS_NAME,
|
||||
android.content.Context.MODE_PRIVATE
|
||||
)
|
||||
|
||||
// Check 1: Auto-Sync aktiviert?
|
||||
val autoSyncEnabled = prefs.getBoolean(
|
||||
dev.dettmer.simplenotes.utils.Constants.KEY_AUTO_SYNC,
|
||||
false
|
||||
)
|
||||
if (!autoSyncEnabled) {
|
||||
Logger.d(TAG, "⏭️ Auto-Sync disabled - no warning needed")
|
||||
return
|
||||
}
|
||||
|
||||
// Check 2: Schon mal erfolgreich gesynct?
|
||||
val lastSuccessfulSync = syncService.getLastSuccessfulSyncTimestamp()
|
||||
if (lastSuccessfulSync == 0L) {
|
||||
Logger.d(TAG, "⏭️ Never synced successfully - no warning needed")
|
||||
return
|
||||
}
|
||||
|
||||
// Check 3: >24h seit letztem erfolgreichen Sync?
|
||||
val now = System.currentTimeMillis()
|
||||
val timeSinceLastSync = now - lastSuccessfulSync
|
||||
if (timeSinceLastSync < dev.dettmer.simplenotes.utils.Constants.SYNC_WARNING_THRESHOLD_MS) {
|
||||
Logger.d(TAG, "⏭️ Last successful sync <24h ago - no warning needed")
|
||||
return
|
||||
}
|
||||
|
||||
// Check 4: Throttling - schon Warnung in letzten 24h gezeigt?
|
||||
val lastWarningShown = prefs.getLong(
|
||||
dev.dettmer.simplenotes.utils.Constants.KEY_LAST_SYNC_WARNING_SHOWN,
|
||||
0L
|
||||
)
|
||||
if (now - lastWarningShown < dev.dettmer.simplenotes.utils.Constants.SYNC_WARNING_THRESHOLD_MS) {
|
||||
Logger.d(TAG, "⏭️ Warning already shown in last 24h - throttling")
|
||||
return
|
||||
}
|
||||
|
||||
// Zeige Warnung
|
||||
val hoursSinceLastSync = timeSinceLastSync / (1000 * 60 * 60)
|
||||
NotificationHelper.showSyncWarning(applicationContext, hoursSinceLastSync)
|
||||
|
||||
// Speichere Zeitpunkt der Warnung
|
||||
prefs.edit()
|
||||
.putLong(dev.dettmer.simplenotes.utils.Constants.KEY_LAST_SYNC_WARNING_SHOWN, now)
|
||||
.apply()
|
||||
|
||||
Logger.d(TAG, "⚠️ Sync warning shown: Server unreachable for ${hoursSinceLastSync}h")
|
||||
|
||||
} catch (e: Exception) {
|
||||
Logger.e(TAG, "Failed to check/show sync warning", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -189,6 +189,44 @@ class WebDavSyncService(private val context: Context) {
|
||||
return prefs.getString(Constants.KEY_SERVER_URL, null)
|
||||
}
|
||||
|
||||
/**
|
||||
* Prüft ob lokale Änderungen seit letztem Sync vorhanden sind (v1.1.2)
|
||||
* Performance-Optimierung: Vermeidet unnötige Sync-Operationen
|
||||
*
|
||||
* @return true wenn unsynced changes vorhanden, false sonst
|
||||
*/
|
||||
suspend fun hasUnsyncedChanges(): Boolean = withContext(Dispatchers.IO) {
|
||||
return@withContext try {
|
||||
val lastSyncTime = getLastSyncTimestamp()
|
||||
|
||||
// Wenn noch nie gesynct, dann haben wir Änderungen
|
||||
if (lastSyncTime == 0L) {
|
||||
Logger.d(TAG, "📝 Never synced - assuming changes exist")
|
||||
return@withContext true
|
||||
}
|
||||
|
||||
// Prüfe ob Notizen existieren die neuer sind als letzter Sync
|
||||
val storage = dev.dettmer.simplenotes.storage.NotesStorage(context)
|
||||
val allNotes = storage.loadAllNotes()
|
||||
|
||||
val hasChanges = allNotes.any { note ->
|
||||
note.updatedAt > lastSyncTime
|
||||
}
|
||||
|
||||
Logger.d(TAG, "📊 Unsynced changes check: $hasChanges (${allNotes.size} notes total)")
|
||||
if (hasChanges) {
|
||||
val unsyncedCount = allNotes.count { note -> note.updatedAt > lastSyncTime }
|
||||
Logger.d(TAG, " → $unsyncedCount notes modified since last sync")
|
||||
}
|
||||
|
||||
hasChanges
|
||||
} catch (e: Exception) {
|
||||
Logger.e(TAG, "Failed to check for unsynced changes - assuming changes exist", e)
|
||||
// Bei Fehler lieber sync durchführen (safe default)
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Prüft ob WebDAV-Server erreichbar ist (ohne Sync zu starten)
|
||||
* Verwendet Socket-Check für schnelle Erreichbarkeitsprüfung
|
||||
@@ -481,8 +519,10 @@ class WebDavSyncService(private val context: Context) {
|
||||
}
|
||||
|
||||
private fun saveLastSyncTimestamp() {
|
||||
val now = System.currentTimeMillis()
|
||||
prefs.edit()
|
||||
.putLong(Constants.KEY_LAST_SYNC, System.currentTimeMillis())
|
||||
.putLong(Constants.KEY_LAST_SYNC, now)
|
||||
.putLong(Constants.KEY_LAST_SUCCESSFUL_SYNC, now) // 🔥 v1.1.2: Track successful sync
|
||||
.apply()
|
||||
}
|
||||
|
||||
@@ -490,6 +530,10 @@ class WebDavSyncService(private val context: Context) {
|
||||
return prefs.getLong(Constants.KEY_LAST_SYNC, 0)
|
||||
}
|
||||
|
||||
fun getLastSuccessfulSyncTimestamp(): Long {
|
||||
return prefs.getLong(Constants.KEY_LAST_SUCCESSFUL_SYNC, 0)
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore all notes from server - overwrites local storage
|
||||
* @return RestoreResult with count of restored notes
|
||||
|
||||
@@ -10,6 +10,11 @@ object Constants {
|
||||
const val KEY_AUTO_SYNC = "auto_sync_enabled"
|
||||
const val KEY_LAST_SYNC = "last_sync_timestamp"
|
||||
|
||||
// 🔥 v1.1.2: Last Successful Sync Monitoring
|
||||
const val KEY_LAST_SUCCESSFUL_SYNC = "last_successful_sync_time"
|
||||
const val KEY_LAST_SYNC_WARNING_SHOWN = "last_sync_warning_shown_time"
|
||||
const val SYNC_WARNING_THRESHOLD_MS = 24 * 60 * 60 * 1000L // 24h
|
||||
|
||||
// 🔥 NEU: Sync Interval Configuration
|
||||
const val PREF_SYNC_INTERVAL_MINUTES = "sync_interval_minutes"
|
||||
const val DEFAULT_SYNC_INTERVAL_MINUTES = 30L
|
||||
|
||||
@@ -288,4 +288,40 @@ object NotificationHelper {
|
||||
Logger.d(TAG, "🗑️ Auto-cancelled error notification after 30s timeout")
|
||||
}, 30_000)
|
||||
}
|
||||
|
||||
/**
|
||||
* Zeigt Warnung wenn Server längere Zeit nicht erreichbar (v1.1.2)
|
||||
* Throttling: Max. 1 Warnung pro 24h
|
||||
*/
|
||||
fun showSyncWarning(context: Context, hoursSinceLastSync: Long) {
|
||||
// PendingIntent für App-Öffnung
|
||||
val intent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingIntent = PendingIntent.getActivity(
|
||||
context,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||
)
|
||||
|
||||
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
|
||||
.setSmallIcon(android.R.drawable.stat_notify_error)
|
||||
.setContentTitle("⚠️ Sync-Warnung")
|
||||
.setContentText("Server seit ${hoursSinceLastSync}h nicht erreichbar")
|
||||
.setStyle(NotificationCompat.BigTextStyle()
|
||||
.bigText("Der WebDAV-Server ist seit ${hoursSinceLastSync} Stunden nicht erreichbar. " +
|
||||
"Bitte prüfe deine Netzwerkverbindung oder Server-Einstellungen."))
|
||||
.setPriority(NotificationCompat.PRIORITY_DEFAULT)
|
||||
.setCategory(NotificationCompat.CATEGORY_STATUS)
|
||||
.setContentIntent(pendingIntent)
|
||||
.setAutoCancel(true)
|
||||
.build()
|
||||
|
||||
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE)
|
||||
as NotificationManager
|
||||
manager.notify(SYNC_NOTIFICATION_ID, notification)
|
||||
|
||||
Logger.d(TAG, "⚠️ Showed sync warning: Server unreachable for ${hoursSinceLastSync}h")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
package dev.dettmer.simplenotes.utils
|
||||
|
||||
import java.net.URL
|
||||
|
||||
/**
|
||||
* URL Validator für Network Security (v1.1.2)
|
||||
* Erlaubt HTTP nur für lokale Netzwerke (RFC 1918 Private IPs)
|
||||
*/
|
||||
object UrlValidator {
|
||||
|
||||
/**
|
||||
* Prüft ob eine URL eine lokale/private Adresse ist
|
||||
* Erlaubt:
|
||||
* - 192.168.x.x (Class C private)
|
||||
* - 10.x.x.x (Class A private)
|
||||
* - 172.16.x.x - 172.31.x.x (Class B private)
|
||||
* - 127.x.x.x (Localhost)
|
||||
* - .local domains (mDNS/Bonjour)
|
||||
*/
|
||||
fun isLocalUrl(url: String): Boolean {
|
||||
return try {
|
||||
val parsedUrl = URL(url)
|
||||
val host = parsedUrl.host.lowercase()
|
||||
|
||||
// Check for .local domains (e.g., nas.local)
|
||||
if (host.endsWith(".local")) {
|
||||
return true
|
||||
}
|
||||
|
||||
// Check for localhost
|
||||
if (host == "localhost" || host == "127.0.0.1") {
|
||||
return true
|
||||
}
|
||||
|
||||
// Parse IP address if it's numeric
|
||||
val ipPattern = """^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$""".toRegex()
|
||||
val match = ipPattern.find(host)
|
||||
|
||||
if (match != null) {
|
||||
val octets = match.groupValues.drop(1).map { it.toInt() }
|
||||
|
||||
// Validate octets are in range 0-255
|
||||
if (octets.any { it > 255 }) {
|
||||
return false
|
||||
}
|
||||
|
||||
val (o1, o2, o3, o4) = octets
|
||||
|
||||
// Check RFC 1918 private IP ranges
|
||||
return when {
|
||||
// 10.0.0.0/8 (10.0.0.0 - 10.255.255.255)
|
||||
o1 == 10 -> true
|
||||
|
||||
// 172.16.0.0/12 (172.16.0.0 - 172.31.255.255)
|
||||
o1 == 172 && o2 in 16..31 -> true
|
||||
|
||||
// 192.168.0.0/16 (192.168.0.0 - 192.168.255.255)
|
||||
o1 == 192 && o2 == 168 -> true
|
||||
|
||||
// 127.0.0.0/8 (Localhost)
|
||||
o1 == 127 -> true
|
||||
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
|
||||
// Not a recognized local address
|
||||
false
|
||||
} catch (e: Exception) {
|
||||
// Invalid URL format
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validiert ob HTTP URL erlaubt ist
|
||||
* @return Pair<Boolean, String?> - (isValid, errorMessage)
|
||||
*/
|
||||
fun validateHttpUrl(url: String): Pair<Boolean, String?> {
|
||||
return try {
|
||||
val parsedUrl = URL(url)
|
||||
|
||||
// HTTPS ist immer erlaubt
|
||||
if (parsedUrl.protocol.equals("https", ignoreCase = true)) {
|
||||
return Pair(true, null)
|
||||
}
|
||||
|
||||
// HTTP nur für lokale URLs erlaubt
|
||||
if (parsedUrl.protocol.equals("http", ignoreCase = true)) {
|
||||
if (isLocalUrl(url)) {
|
||||
return Pair(true, null)
|
||||
} else {
|
||||
return Pair(
|
||||
false,
|
||||
"HTTP ist nur für lokale Server erlaubt (z.B. 192.168.x.x, 10.x.x.x, nas.local). " +
|
||||
"Für öffentliche Server verwende bitte HTTPS."
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Anderes Protokoll
|
||||
Pair(false, "Ungültiges Protokoll: ${parsedUrl.protocol}. Bitte verwende HTTP oder HTTPS.")
|
||||
} catch (e: Exception) {
|
||||
Pair(false, "Ungültige URL: ${e.message}")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,170 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path
|
||||
android:fillColor="#3DDC84"
|
||||
android:pathData="M0,0h108v108h-108z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M9,0L9,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,0L19,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,0L29,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,0L39,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,0L49,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,0L59,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,0L69,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,0L79,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M89,0L89,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M99,0L99,108"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,9L108,9"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,19L108,19"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,29L108,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,39L108,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,49L108,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,59L108,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,69L108,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,79L108,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,89L108,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,99L108,99"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,29L89,29"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,39L89,39"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,49L89,49"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,59L89,59"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,69L89,69"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,79L89,79"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,19L29,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,19L39,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,19L49,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,19L59,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,19L69,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,19L79,89"
|
||||
android:strokeWidth="0.8"
|
||||
android:strokeColor="#33FFFFFF" />
|
||||
</vector>
|
||||
@@ -1,30 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:endX="85.84757"
|
||||
android:endY="92.4963"
|
||||
android:startX="42.9492"
|
||||
android:startY="49.59793"
|
||||
android:type="linear">
|
||||
<item
|
||||
android:color="#44000000"
|
||||
android:offset="0.0" />
|
||||
<item
|
||||
android:color="#00000000"
|
||||
android:offset="1.0" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="nonZero"
|
||||
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
||||
android:strokeWidth="1"
|
||||
android:strokeColor="#00000000" />
|
||||
</vector>
|
||||
@@ -14,7 +14,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:elevation="0dp"
|
||||
app:navigationIcon="@android:drawable/ic_menu_close_clear_cancel"
|
||||
app:navigationIcon="?attr/homeAsUpIndicator"
|
||||
app:title="@string/edit_note"
|
||||
app:titleTextAppearance="@style/TextAppearance.Material3.TitleLarge" />
|
||||
|
||||
|
||||
@@ -24,14 +24,22 @@
|
||||
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
||||
<!-- SwipeRefreshLayout für Pull-to-Refresh (v1.1.2) -->
|
||||
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipeRefreshLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||
|
||||
<!-- RecyclerView mit größerem Padding für Material 3 -->
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recyclerViewNotes"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clipToPadding="false"
|
||||
android:padding="16dp"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||
android:padding="16dp" />
|
||||
|
||||
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
||||
|
||||
<!-- Material 3 Empty State Card -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
|
||||
@@ -30,17 +30,6 @@
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp">
|
||||
|
||||
<!-- Auto-Save Status Indicator -->
|
||||
<com.google.android.material.chip.Chip
|
||||
android:id="@+id/chipAutoSaveStatus"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:visibility="gone"
|
||||
android:textSize="12sp"
|
||||
app:chipIconEnabled="false" />
|
||||
|
||||
<!-- Material 3 Card: Server Configuration -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
@@ -63,15 +52,65 @@
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
|
||||
android:layout_marginBottom="16dp" />
|
||||
|
||||
<!-- Server URL with Icon -->
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
<!-- Protocol Selection -->
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/server_url"
|
||||
android:text="Verbindungstyp"
|
||||
android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
|
||||
android:layout_marginBottom="8dp" />
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/protocolRadioGroup"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginBottom="16dp">
|
||||
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/radioHttp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="🏠 Intern (HTTP)"
|
||||
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
|
||||
android:checked="false" />
|
||||
|
||||
<com.google.android.material.radiobutton.MaterialRadioButton
|
||||
android:id="@+id/radioHttps"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="🌐 Extern (HTTPS)"
|
||||
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
|
||||
android:checked="true" />
|
||||
|
||||
</RadioGroup>
|
||||
|
||||
<!-- Helper Text for Protocol Selection -->
|
||||
<TextView
|
||||
android:id="@+id/protocolHintText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="HTTP nur für lokale Netzwerke (z.B. 192.168.x.x, 10.x.x.x)"
|
||||
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:paddingStart="4dp"
|
||||
android:paddingEnd="4dp" />
|
||||
|
||||
<!-- Server URL with Icon -->
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textInputLayoutServerUrl"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="Server-Adresse"
|
||||
android:layout_marginBottom="12dp"
|
||||
style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
|
||||
app:startIconDrawable="@android:drawable/ic_menu_compass"
|
||||
app:endIconMode="clear_text"
|
||||
app:helperText="z.B. http://192.168.0.188:8080/webdav"
|
||||
app:helperTextEnabled="true"
|
||||
app:boxCornerRadiusTopStart="12dp"
|
||||
app:boxCornerRadiusTopEnd="12dp"
|
||||
app:boxCornerRadiusBottomStart="12dp"
|
||||
@@ -185,7 +224,7 @@
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Material 3 Card: Auto-Sync Settings -->
|
||||
<!-- Material 3 Card: Synchronisation Settings (Auto-Sync + Interval) -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -230,6 +269,7 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
@@ -247,87 +287,22 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Material 3 Card: Backup & Restore -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
<!-- Divider -->
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
style="@style/Widget.Material3.CardView.Elevated"
|
||||
app:cardCornerRadius="16dp">
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginVertical="16dp"
|
||||
android:background="?attr/colorOutlineVariant" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="20dp">
|
||||
|
||||
<!-- Section Header -->
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/backup_restore_title"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
|
||||
android:layout_marginBottom="12dp" />
|
||||
|
||||
<!-- Warning Info Card -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:cardBackgroundColor="?attr/colorErrorContainer"
|
||||
app:cardCornerRadius="12dp"
|
||||
app:cardElevation="0dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="16dp"
|
||||
android:text="@string/backup_restore_warning"
|
||||
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
|
||||
android:textColor="?attr/colorOnErrorContainer"
|
||||
android:lineSpacingMultiplier="1.3" />
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Restore Button -->
|
||||
<Button
|
||||
android:id="@+id/buttonRestoreFromServer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/restore_from_server"
|
||||
style="@style/Widget.Material3.Button.TonalButton" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Material 3 Card: Sync Interval Configuration -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
style="@style/Widget.Material3.CardView.Elevated"
|
||||
app:cardCornerRadius="16dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="20dp">
|
||||
|
||||
<!-- Section Header -->
|
||||
<!-- Sync Interval Section -->
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Sync-Intervall"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
|
||||
android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
|
||||
android:layout_marginBottom="12dp" />
|
||||
|
||||
<!-- Info Card -->
|
||||
<!-- Interval Info Card -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -412,6 +387,60 @@
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Material 3 Card: Backup & Restore -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
style="@style/Widget.Material3.CardView.Elevated"
|
||||
app:cardCornerRadius="16dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="20dp">
|
||||
|
||||
<!-- Section Header -->
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/backup_restore_title"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
|
||||
android:layout_marginBottom="12dp" />
|
||||
|
||||
<!-- Warning Info Card -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:cardBackgroundColor="?attr/colorErrorContainer"
|
||||
app:cardCornerRadius="12dp"
|
||||
app:cardElevation="0dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="16dp"
|
||||
android:text="@string/backup_restore_warning"
|
||||
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
|
||||
android:textColor="?attr/colorOnErrorContainer"
|
||||
android:lineSpacingMultiplier="1.3" />
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Restore Button -->
|
||||
<Button
|
||||
android:id="@+id/buttonRestoreFromServer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/restore_from_server"
|
||||
style="@style/Widget.Material3.Button.TonalButton" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<!-- Material 3 Card: About Section -->
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 316 B |
BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 982 B After Width: | Height: | Size: 774 B |
BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 314 B |
BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 774 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 319 B |
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 327 B |
|
After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 329 B |
|
After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 2.9 KiB |
16
android/app/src/main/res/xml/network_security_config.xml
Normal file
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<network-security-config>
|
||||
<!-- Allow HTTP for all connections during development/testing -->
|
||||
<!-- Production validation happens in UrlValidator.kt to restrict HTTP to:
|
||||
- Private IP ranges: 192.168.x.x, 10.x.x.x, 172.16-31.x.x, 127.x.x.x
|
||||
- .local domains (mDNS/Bonjour)
|
||||
|
||||
This permissive config is necessary because Android's Network Security Config
|
||||
doesn't support IP-based rules, only domain patterns.
|
||||
We handle security through application-level validation instead. -->
|
||||
<base-config cleartextTrafficPermitted="true">
|
||||
<trust-anchors>
|
||||
<certificates src="system" />
|
||||
</trust-anchors>
|
||||
</base-config>
|
||||
</network-security-config>
|
||||
@@ -1,20 +0,0 @@
|
||||
🐛 Bugfixes v1.1.1
|
||||
|
||||
✅ Keine Fehler-Notifications mehr in fremden WiFi-Netzwerken!
|
||||
- Server-Erreichbarkeits-Check vor jedem Sync (2s Timeout)
|
||||
- Stiller Abbruch wenn Server nicht erreichbar
|
||||
- 80% schnellerer Abbruch: 2s statt 10+ Sekunden
|
||||
|
||||
✅ Keine Fehler beim WiFi-Connect / Nach-Hause-Kommen!
|
||||
- Pre-Check wartet bis Netzwerk bereit ist (DHCP, Routing, Gateway)
|
||||
- Kein Fehler mehr bei Netzwerk-Initialisierung
|
||||
|
||||
🔧 Notification-Verbesserungen:
|
||||
- Alte Notifications werden beim App-Start gelöscht
|
||||
- Fehler-Notifications verschwinden automatisch nach 30 Sekunden
|
||||
- Bessere Batterie-Effizienz (keine langen Timeouts mehr)
|
||||
|
||||
📱 UI-Fixes:
|
||||
- Sync-Icon wird nicht mehr angezeigt wenn Sync nicht konfiguriert ist
|
||||
- Swipe-to-Delete: Kein Flackern mehr beim schnellen Löschen mehrerer Notizen
|
||||
- Nach dem Speichern einer Notiz landet man automatisch ganz oben in der Liste
|
||||
@@ -1,20 +0,0 @@
|
||||
🐛 Bugfixes v1.1.1
|
||||
|
||||
✅ No more error notifications in foreign WiFi networks!
|
||||
- Server reachability check before each sync (2s timeout)
|
||||
- Silent abort when server is unreachable
|
||||
- 80% faster abort: 2s instead of 10+ seconds
|
||||
|
||||
✅ No more errors when connecting to WiFi / arriving home!
|
||||
- Pre-check waits until network is ready (DHCP, routing, gateway)
|
||||
- No more errors during network initialization
|
||||
|
||||
🔧 Notification improvements:
|
||||
- Old notifications are cleared on app start
|
||||
- Error notifications disappear automatically after 30 seconds
|
||||
- Better battery efficiency (no more long timeouts)
|
||||
|
||||
📱 UI fixes:
|
||||
- Sync icon no longer shown when sync is not configured
|
||||
- Swipe-to-delete: No more flickering when quickly deleting multiple notes
|
||||
- After saving a note, you automatically land at the top of the list
|
||||
BIN
android/gradle/wrapper/gradle-wrapper.jar
vendored
@@ -1,6 +1,6 @@
|
||||
#Sat Dec 20 00:06:31 CET 2025
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
|
||||
6
android/gradlew
vendored
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015 the original authors.
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -114,7 +114,7 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
4
android/gradlew.bat
vendored
@@ -70,11 +70,11 @@ goto fail
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
18
fastlane/metadata/android/de-DE/changelogs/3.txt
Normal file
@@ -0,0 +1,18 @@
|
||||
🐛 Bugfixes v1.1.1
|
||||
|
||||
✅ Keine Fehler-Notifications in fremden WiFi-Netzwerken
|
||||
- Server-Check vor Sync (2s Timeout)
|
||||
- Stiller Abbruch wenn Server offline
|
||||
|
||||
✅ WiFi-Connect Fixes
|
||||
- Pre-Check wartet bis Netzwerk bereit ist
|
||||
- Keine Fehler bei Netzwerk-Init
|
||||
|
||||
🔧 Notifications
|
||||
- Alte Notifications beim Start gelöscht
|
||||
- Fehler verschwinden nach 30s
|
||||
|
||||
📱 UI
|
||||
- Sync-Icon nur wenn konfiguriert
|
||||
- Swipe-to-Delete ohne Flackern
|
||||
- Nach Speichern: Scroll to top
|
||||
12
fastlane/metadata/android/de-DE/changelogs/4.txt
Normal file
@@ -0,0 +1,12 @@
|
||||
v1.1.2 - UX & Performance
|
||||
|
||||
• "Job was cancelled" Fehler behoben
|
||||
• Zurück-Pfeil statt X im Editor
|
||||
• Pull-to-Refresh für manuellen Sync
|
||||
• HTTP/HTTPS Protokoll-Auswahl (Radio Buttons)
|
||||
• Inline Fehler-Anzeige (keine Toast-Spam)
|
||||
• Settings gruppiert (Auto-Sync & Intervall)
|
||||
• Sync nur bei tatsächlichen Änderungen (spart Batterie)
|
||||
• 24h Server-Offline Warnung
|
||||
• HTTP nur für lokale Netzwerke (RFC 1918 IPs)
|
||||
• Auto-Save Benachrichtigungen entfernt
|
||||
BIN
fastlane/metadata/android/de-DE/images/icon.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
fastlane/metadata/android/de-DE/images/phoneScreenshots/1.jpg
Normal file
|
After Width: | Height: | Size: 118 KiB |
BIN
fastlane/metadata/android/de-DE/images/phoneScreenshots/2.jpg
Normal file
|
After Width: | Height: | Size: 90 KiB |
BIN
fastlane/metadata/android/de-DE/images/phoneScreenshots/3.jpg
Normal file
|
After Width: | Height: | Size: 137 KiB |
18
fastlane/metadata/android/en-US/changelogs/3.txt
Normal file
@@ -0,0 +1,18 @@
|
||||
🐛 Bugfixes v1.1.1
|
||||
|
||||
✅ No error notifications in foreign WiFi networks
|
||||
- Server check before sync (2s timeout)
|
||||
- Silent abort when server offline
|
||||
|
||||
✅ WiFi-connect fixes
|
||||
- Pre-check waits until network ready
|
||||
- No errors during network init
|
||||
|
||||
🔧 Notifications
|
||||
- Old notifications cleared on start
|
||||
- Errors disappear after 30s
|
||||
|
||||
📱 UI
|
||||
- Sync icon only when configured
|
||||
- Swipe-to-delete without flickering
|
||||
- After saving: Scroll to top
|
||||
12
fastlane/metadata/android/en-US/changelogs/4.txt
Normal file
@@ -0,0 +1,12 @@
|
||||
v1.1.2 - UX & Performance
|
||||
|
||||
• Fixed "Job was cancelled" error notifications
|
||||
• Back arrow instead of X in editor
|
||||
• Pull-to-Refresh for manual sync
|
||||
• HTTP/HTTPS protocol selector (radio buttons)
|
||||
• Inline error display (no toast spam)
|
||||
• Grouped settings (Auto-Sync & Interval)
|
||||
• Sync only on actual changes (saves battery)
|
||||
• 24h server offline warning
|
||||
• HTTP only for local networks (RFC 1918 IPs)
|
||||
• Removed auto-save notifications
|
||||
BIN
fastlane/metadata/android/en-US/images/icon.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
Normal file
|
After Width: | Height: | Size: 118 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
Normal file
|
After Width: | Height: | Size: 90 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
Normal file
|
After Width: | Height: | Size: 137 KiB |
53
metadata/dev.dettmer.simplenotes.yml
Normal file
@@ -0,0 +1,53 @@
|
||||
Categories:
|
||||
- Writing
|
||||
License: MIT
|
||||
AuthorName: Liq Dettmer
|
||||
AuthorEmail: liq@dettmer.dev
|
||||
AuthorWebSite: https://dettmer.dev
|
||||
SourceCode: https://github.com/inventory69/simple-notes-sync
|
||||
IssueTracker: https://github.com/inventory69/simple-notes-sync/issues
|
||||
Changelog: https://github.com/inventory69/simple-notes-sync/releases
|
||||
|
||||
AutoName: Simple Notes Sync
|
||||
|
||||
RepoType: git
|
||||
Repo: https://github.com/inventory69/simple-notes-sync.git
|
||||
|
||||
AntiFeatures:
|
||||
NonFreeNet:
|
||||
en-US: |-
|
||||
Allows unencrypted HTTP connections to self-hosted WebDAV servers on local networks.
|
||||
Starting with v1.1.2, HTTP connections will be restricted to:
|
||||
- Private IP ranges (RFC 1918: 10.x.x.x, 172.16-31.x.x, 192.168.x.x)
|
||||
- Localhost (127.0.0.1, ::1)
|
||||
- .local domains (mDNS)
|
||||
HTTPS is recommended and supported for all connections.
|
||||
de-DE: |-
|
||||
Erlaubt unverschlüsselte HTTP-Verbindungen zu selbst gehosteten WebDAV-Servern in lokalen Netzwerken.
|
||||
Ab Version 1.1.2 werden HTTP-Verbindungen eingeschränkt auf:
|
||||
- Private IP-Bereiche (RFC 1918: 10.x.x.x, 172.16-31.x.x, 192.168.x.x)
|
||||
- Localhost (127.0.0.1, ::1)
|
||||
- .local-Domains (mDNS)
|
||||
HTTPS wird empfohlen und für alle Verbindungen unterstützt.
|
||||
|
||||
Builds:
|
||||
- versionName: 1.1.1
|
||||
versionCode: 3
|
||||
commit: v1.1.1
|
||||
subdir: android/app
|
||||
sudo:
|
||||
- apt-get update
|
||||
- apt-get install -y openjdk-17-jdk-headless
|
||||
- update-java-alternatives -a
|
||||
gradle:
|
||||
- fdroid
|
||||
srclibs:
|
||||
- reproducible-apk-tools@v0.2.8
|
||||
prebuild: sed -i -e '/signingConfig/d' build.gradle.kts
|
||||
scandelete:
|
||||
- android/gradle/wrapper
|
||||
|
||||
AutoUpdateMode: Version
|
||||
UpdateCheckMode: Tags
|
||||
CurrentVersion: 1.1.1
|
||||
CurrentVersionCode: 3
|
||||