Skip to content

Test changes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AjmalShajahan wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Test changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0a9bca
chore: standardize commit message format for version bump
AjmalShajahan Aug 13, 2025
fb54053
feat: refactor package names and update AndroidManifest actions
AjmalShajahan Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 123 additions & 123 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,123 +1,123 @@
import org.gradle.configurationcache.extensions.capitalized
plugins {
id("com.android.application")
id("com.github.ben-manes.versions")
id("com.github.triplet.play") version "3.7.0"
id("org.jetbrains.kotlin.android") version "2.2.0"
}
dependencies {
implementation("eu.chainfire:libsuperuser:1.1.1")
implementation("com.google.android.material:material:1.8.0")
implementation("com.google.code.gson:gson:2.10.1")
implementation("org.mindrot:jbcrypt:0.4")
implementation("com.google.guava:guava:32.1.3-android")
implementation("com.annimon:stream:1.2.2")
implementation("com.android.volley:volley:1.2.1")
implementation("commons-io:commons-io:2.11.0")
implementation("com.journeyapps:zxing-android-embedded:4.3.0") {
isTransitive = false
}
implementation("com.google.zxing:core:3.4.1")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("com.google.dagger:dagger:2.49")
annotationProcessor("com.google.dagger:dagger-compiler:2.49")
androidTestImplementation("androidx.test:rules:1.4.0")
androidTestImplementation("androidx.annotation:annotation:1.2.0")
}
android {
val ndkVersionShared = rootProject.extra.get("ndkVersionShared")
// Changes to these values need to be reflected in `../docker/Dockerfile`
compileSdk = 36
buildToolsVersion = "36.0.0"
ndkVersion = "${ndkVersionShared}"
buildFeatures {
dataBinding = true
viewBinding = true
buildConfig = true
}
defaultConfig {
applicationId = "com.nutomic.syncthingandroid"
minSdk = 21
targetSdk = 33
versionCode = 4396
versionName = "2.0.0"
testApplicationId = "com.nutomic.syncthingandroid.test"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
signingConfigs {
create("release") {
storeFile = System.getenv("SYNCTHING_RELEASE_STORE_FILE")?.let(::file)
storePassword = System.getenv("SIGNING_PASSWORD")
keyAlias = System.getenv("SYNCTHING_RELEASE_KEY_ALIAS")
keyPassword = System.getenv("SIGNING_PASSWORD")
}
}
buildTypes {
getByName("debug") {
applicationIdSuffix = ".debug"
isDebuggable = true
isJniDebuggable = true
isMinifyEnabled = false
}
getByName("release") {
signingConfig = signingConfigs.runCatching { getByName("release") }
.getOrNull()
.takeIf { it?.storeFile != null }
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
// Otherwise libsyncthing.so doesn't appear where it should in installs
// based on app bundles, and thus nothing works.
packaging {
jniLibs {
useLegacyPackaging = true
}
}
namespace = "com.nutomic.syncthingandroid"
}
play {
serviceAccountCredentials.set(
file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: "keys.json")
)
track.set("beta")
}
/**
* Some languages are not supported by Google Play, so we ignore them.
*/
tasks.register<Delete>("deleteUnsupportedPlayTranslations") {
delete(
"src/main/play/listings/de_DE/",
"src/main/play/listings/el-EL/",
"src/main/play/listings/en/",
"src/main/play/listings/eo/",
"src/main/play/listings/eu/",
"src/main/play/listings/nb/",
"src/main/play/listings/nl_BE/",
"src/main/play/listings/nn/",
"src/main/play/listings/ta/",
)
}
project.afterEvaluate {
android.buildTypes.forEach {
tasks.named("merge${it.name.capitalized()}JniLibFolders") {
dependsOn(":syncthing:buildNative")
}
}
}
import org.gradle.configurationcache.extensions.capitalized

plugins {
id("com.android.application")
id("com.github.ben-manes.versions")
id("com.github.triplet.play") version "3.7.0"
id("org.jetbrains.kotlin.android") version "2.2.0"
}

dependencies {
implementation("eu.chainfire:libsuperuser:1.1.1")
implementation("com.google.android.material:material:1.8.0")
implementation("com.google.code.gson:gson:2.10.1")
implementation("org.mindrot:jbcrypt:0.4")
implementation("com.google.guava:guava:32.1.3-android")
implementation("com.annimon:stream:1.2.2")
implementation("com.android.volley:volley:1.2.1")
implementation("commons-io:commons-io:2.11.0")

implementation("com.journeyapps:zxing-android-embedded:4.3.0") {
isTransitive = false
}
implementation("com.google.zxing:core:3.4.1")

implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("com.google.dagger:dagger:2.49")
annotationProcessor("com.google.dagger:dagger-compiler:2.49")
androidTestImplementation("androidx.test:rules:1.4.0")
androidTestImplementation("androidx.annotation:annotation:1.2.0")
}

android {
val ndkVersionShared = rootProject.extra.get("ndkVersionShared")
// Changes to these values need to be reflected in `../docker/Dockerfile`
compileSdk = 36
buildToolsVersion = "36.0.0"
ndkVersion = "${ndkVersionShared}"

buildFeatures {
dataBinding = true
viewBinding = true
buildConfig = true
}

defaultConfig {
applicationId = "com.ajmalshajahan.syncthingandroid"
minSdk = 21
targetSdk = 33
versionCode = 4396
versionName = "2.0.0"
testApplicationId = "com.ajmalshajahan.syncthingandroid.test"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

signingConfigs {
create("release") {
storeFile = System.getenv("SYNCTHING_RELEASE_STORE_FILE")?.let(::file)
storePassword = System.getenv("SIGNING_PASSWORD")
keyAlias = System.getenv("SYNCTHING_RELEASE_KEY_ALIAS")
keyPassword = System.getenv("SIGNING_PASSWORD")
}
}

buildTypes {
getByName("debug") {
applicationIdSuffix = ".debug"
isDebuggable = true
isJniDebuggable = true
isMinifyEnabled = false
}
getByName("release") {
signingConfig = signingConfigs.runCatching { getByName("release") }
.getOrNull()
.takeIf { it?.storeFile != null }
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

// Otherwise libsyncthing.so doesn't appear where it should in installs
// based on app bundles, and thus nothing works.
packaging {
jniLibs {
useLegacyPackaging = true
}
}
namespace = "com.ajmalshajahan.syncthingandroid"
}

play {
serviceAccountCredentials.set(
file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: "keys.json")
)
track.set("beta")
}

/**
* Some languages are not supported by Google Play, so we ignore them.
*/
tasks.register<Delete>("deleteUnsupportedPlayTranslations") {
delete(
"src/main/play/listings/de_DE/",
"src/main/play/listings/el-EL/",
"src/main/play/listings/en/",
"src/main/play/listings/eo/",
"src/main/play/listings/eu/",
"src/main/play/listings/nb/",
"src/main/play/listings/nl_BE/",
"src/main/play/listings/nn/",
"src/main/play/listings/ta/",
)
}

project.afterEvaluate {
android.buildTypes.forEach {
tasks.named("merge${it.name.capitalized()}JniLibFolders") {
dependsOn(":syncthing:buildNative")
}
}
}
12 changes: 6 additions & 6 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@
tools:ignore="ExportedReceiver"
android:exported="true">
<intent-filter>
<action android:name="com.nutomic.syncthingandroid.action.START" />
<action android:name="com.nutomic.syncthingandroid.action.STOP" />
<action android:name="com.ajmalshajahan.syncthingandroid.action.START" />
<action android:name="com.ajmalshajahan.syncthingandroid.action.STOP" />
</intent-filter>
</receiver>
<activity android:name=".activities.FolderTypeDialogActivity"
Expand All @@ -146,30 +146,30 @@
android:parentActivityName=".activities.FolderActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nutomic.syncthingandroid.activities.FolderActivity" />
android:value="com.ajmalshajahan.syncthingandroid.activities.FolderActivity" />
</activity>
<activity android:name=".activities.PullOrderDialogActivity"
android:label="@string/pull_order"
android:theme="@style/Theme.Syncthing.Dialog"
android:parentActivityName=".activities.FolderActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nutomic.syncthingandroid.activities.FolderActivity" />
android:value="com.ajmalshajahan.syncthingandroid.activities.FolderActivity" />
</activity>
<activity android:name=".activities.VersioningDialogActivity"
android:label="@string/file_versioning"
android:theme="@style/Theme.Syncthing.Dialog"
android:parentActivityName=".activities.FolderActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nutomic.syncthingandroid.activities.FolderActivity" />
android:value="com.ajmalshajahan.syncthingandroid.activities.FolderActivity" />
</activity>
<activity android:name=".activities.QRScannerActivity"
android:label="QR Code Scanner"
android:parentActivityName=".activities.DeviceActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.nutomic.syncthingandroid.activities.DeviceActivity" />
android:value="com.ajmalshajahan.syncthingandroid.activities.DeviceActivity" />
</activity>
</application>

Expand Down
30 changes: 15 additions & 15 deletions app/src/main/java/com/nutomic/syncthingandroid/DaggerComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.nutomic.syncthingandroid;
package com.ajmalshajahan.syncthingandroid;

import com.nutomic.syncthingandroid.activities.FirstStartActivity;
import com.nutomic.syncthingandroid.activities.FolderPickerActivity;
import com.nutomic.syncthingandroid.activities.MainActivity;
import com.nutomic.syncthingandroid.activities.SettingsActivity;
import com.nutomic.syncthingandroid.activities.ShareActivity;
import com.nutomic.syncthingandroid.activities.ThemedAppCompatActivity;
import com.nutomic.syncthingandroid.receiver.AppConfigReceiver;
import com.nutomic.syncthingandroid.service.RunConditionMonitor;
import com.nutomic.syncthingandroid.service.EventProcessor;
import com.nutomic.syncthingandroid.service.NotificationHandler;
import com.nutomic.syncthingandroid.service.RestApi;
import com.nutomic.syncthingandroid.service.SyncthingRunnable;
import com.nutomic.syncthingandroid.service.SyncthingService;
import com.nutomic.syncthingandroid.util.Languages;
import com.ajmalshajahan.syncthingandroid.activities.FirstStartActivity;
import com.ajmalshajahan.syncthingandroid.activities.FolderPickerActivity;
import com.ajmalshajahan.syncthingandroid.activities.MainActivity;
import com.ajmalshajahan.syncthingandroid.activities.SettingsActivity;
import com.ajmalshajahan.syncthingandroid.activities.ShareActivity;
import com.ajmalshajahan.syncthingandroid.activities.ThemedAppCompatActivity;
import com.ajmalshajahan.syncthingandroid.receiver.AppConfigReceiver;
import com.ajmalshajahan.syncthingandroid.service.RunConditionMonitor;
import com.ajmalshajahan.syncthingandroid.service.EventProcessor;
import com.ajmalshajahan.syncthingandroid.service.NotificationHandler;
import com.ajmalshajahan.syncthingandroid.service.RestApi;
import com.ajmalshajahan.syncthingandroid.service.SyncthingRunnable;
import com.ajmalshajahan.syncthingandroid.service.SyncthingService;
import com.ajmalshajahan.syncthingandroid.util.Languages;

import javax.inject.Singleton;

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.nutomic.syncthingandroid;
package com.ajmalshajahan.syncthingandroid;

import android.app.Application;
import android.os.StrictMode;

import com.google.android.material.color.DynamicColors;
import com.nutomic.syncthingandroid.util.Languages;
import com.ajmalshajahan.syncthingandroid.util.Languages;

import javax.inject.Inject;

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/nutomic/syncthingandroid/SyncthingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.nutomic.syncthingandroid;
package com.ajmalshajahan.syncthingandroid;

import android.content.SharedPreferences;
import android.preference.PreferenceManager;

import com.nutomic.syncthingandroid.service.NotificationHandler;
import com.ajmalshajahan.syncthingandroid.service.NotificationHandler;

import javax.inject.Singleton;

Expand Down
Loading