diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c51d14d0c..264522dd9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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("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("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") + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f50a335e6..d95e8e439 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -136,8 +136,8 @@ tools:ignore="ExportedReceiver" android:exported="true"> - - + + + android:value="com.ajmalshajahan.syncthingandroid.activities.FolderActivity" /> + android:value="com.ajmalshajahan.syncthingandroid.activities.FolderActivity" /> + android:value="com.ajmalshajahan.syncthingandroid.activities.FolderActivity" /> + android:value="com.ajmalshajahan.syncthingandroid.activities.DeviceActivity" /> diff --git a/app/src/main/java/com/nutomic/syncthingandroid/DaggerComponent.java b/app/src/main/java/com/nutomic/syncthingandroid/DaggerComponent.java index 0561e8085..b0ffc8332 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/DaggerComponent.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/DaggerComponent.java @@ -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; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java b/app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java index 4f3104b91..a3e0c8304 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/SyncthingApp.java @@ -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; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/SyncthingModule.java b/app/src/main/java/com/nutomic/syncthingandroid/SyncthingModule.java index c06c8a016..96ad99aab 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/SyncthingModule.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/SyncthingModule.java @@ -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; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java index 2aabb36ca..418676861 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java @@ -1,11 +1,11 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import static android.text.TextUtils.isEmpty; import static android.view.View.GONE; import static android.view.View.VISIBLE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN; -import static com.nutomic.syncthingandroid.service.SyncthingService.State.ACTIVE; -import static com.nutomic.syncthingandroid.util.Compression.METADATA; +import static com.ajmalshajahan.syncthingandroid.service.SyncthingService.State.ACTIVE; +import static com.ajmalshajahan.syncthingandroid.util.Compression.METADATA; import android.app.Activity; import android.app.Dialog; @@ -27,14 +27,14 @@ import androidx.core.content.ContextCompat; import com.google.gson.Gson; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.ActivityDeviceBinding; -import com.nutomic.syncthingandroid.model.Connections; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.util.Compression; -import com.nutomic.syncthingandroid.util.TextWatcherAdapter; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityDeviceBinding; +import com.ajmalshajahan.syncthingandroid.model.Connections; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.util.Compression; +import com.ajmalshajahan.syncthingandroid.util.TextWatcherAdapter; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.util.Arrays; import java.util.Collections; @@ -46,13 +46,13 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickListener { public static final String EXTRA_NOTIFICATION_ID = - "com.nutomic.syncthingandroid.activities.DeviceActivity.NOTIFICATION_ID"; + "com.ajmalshajahan.syncthingandroid.activities.DeviceActivity.NOTIFICATION_ID"; public static final String EXTRA_DEVICE_ID = - "com.nutomic.syncthingandroid.activities.DeviceActivity.DEVICE_ID"; + "com.ajmalshajahan.syncthingandroid.activities.DeviceActivity.DEVICE_ID"; public static final String EXTRA_DEVICE_NAME = - "com.nutomic.syncthingandroid.activities.DeviceActivity.DEVICE_NAME"; + "com.ajmalshajahan.syncthingandroid.activities.DeviceActivity.DEVICE_NAME"; public static final String EXTRA_IS_CREATE = - "com.nutomic.syncthingandroid.activities.DeviceActivity.IS_CREATE"; + "com.ajmalshajahan.syncthingandroid.activities.DeviceActivity.IS_CREATE"; private static final String TAG = "DeviceSettingsFragment"; private static final String IS_SHOWING_DISCARD_DIALOG = "DISCARD_FOLDER_DIALOG_STATE"; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java index 3de136787..12937362d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -34,12 +34,12 @@ import android.widget.Toast; import com.google.android.material.color.MaterialColors; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.databinding.ActivityFirstStartBinding; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.util.PermissionUtil; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityFirstStartBinding; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.util.PermissionUtil; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.io.File; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java index 3210ac35b..caa08d1ae 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.annotation.SuppressLint; import android.app.Activity; @@ -26,16 +26,16 @@ import com.google.android.material.materialswitch.MaterialSwitch; import com.google.gson.Gson; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.FragmentFolderBinding; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.util.FileUtils; -import com.nutomic.syncthingandroid.util.TextWatcherAdapter; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.FragmentFolderBinding; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.model.Folder; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.util.FileUtils; +import com.ajmalshajahan.syncthingandroid.util.TextWatcherAdapter; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.io.File; import java.io.IOException; @@ -49,7 +49,7 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP; import static android.view.Gravity.CENTER_VERTICAL; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import static com.nutomic.syncthingandroid.service.SyncthingService.State.ACTIVE; +import static com.ajmalshajahan.syncthingandroid.service.SyncthingService.State.ACTIVE; /** * Shows folder details and allows changing them. @@ -58,15 +58,15 @@ public class FolderActivity extends SyncthingActivity implements SyncthingActivity.OnServiceConnectedListener, SyncthingService.OnServiceStateChangeListener { public static final String EXTRA_NOTIFICATION_ID = - "com.nutomic.syncthingandroid.activities.FolderActivity.NOTIFICATION_ID"; + "com.ajmalshajahan.syncthingandroid.activities.FolderActivity.NOTIFICATION_ID"; public static final String EXTRA_IS_CREATE = - "com.nutomic.syncthingandroid.activities.FolderActivity.IS_CREATE"; + "com.ajmalshajahan.syncthingandroid.activities.FolderActivity.IS_CREATE"; public static final String EXTRA_FOLDER_ID = - "com.nutomic.syncthingandroid.activities.FolderActivity.FOLDER_ID"; + "com.ajmalshajahan.syncthingandroid.activities.FolderActivity.FOLDER_ID"; public static final String EXTRA_FOLDER_LABEL = - "com.nutomic.syncthingandroid.activities.FolderActivity.FOLDER_LABEL"; + "com.ajmalshajahan.syncthingandroid.activities.FolderActivity.FOLDER_LABEL"; public static final String EXTRA_DEVICE_ID = - "com.nutomic.syncthingandroid.activities.FolderActivity.DEVICE_ID"; + "com.ajmalshajahan.syncthingandroid.activities.FolderActivity.DEVICE_ID"; private static final String TAG = "FolderActivity"; @@ -545,7 +545,7 @@ private void checkWriteAndUpdateUI() { /** * Suggest folder type FOLDER_TYPE_SEND_RECEIVE for folders to be created * because the user most probably intentionally chose a special folder like - * "[storage]/Android/data/com.nutomic.syncthingandroid/files" + * "[storage]/Android/data/com.ajmalshajahan.syncthingandroid/files" * or enabled root mode thus having write access. */ mFolder.type = Constants.FOLDER_TYPE_SEND_RECEIVE; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java index 33242bd0e..abd4e7f32 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.annotation.SuppressLint; import android.app.Activity; @@ -28,12 +28,12 @@ import android.widget.Toast; import com.google.common.collect.Sets; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.service.SyncthingServiceBinder; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.io.File; import java.util.ArrayList; @@ -50,13 +50,13 @@ public class FolderPickerActivity extends SyncthingActivity implements AdapterView.OnItemClickListener, SyncthingService.OnServiceStateChangeListener { private static final String EXTRA_INITIAL_DIRECTORY = - "com.nutomic.syncthingandroid.activities.FolderPickerActivity.INITIAL_DIRECTORY"; + "com.ajmalshajahan.syncthingandroid.activities.FolderPickerActivity.INITIAL_DIRECTORY"; private static final String EXTRA_ROOT_DIRECTORY = - "com.nutomic.syncthingandroid.activities.FolderPickerActivity.ROOT_DIRECTORY"; + "com.ajmalshajahan.syncthingandroid.activities.FolderPickerActivity.ROOT_DIRECTORY"; public static final String EXTRA_RESULT_DIRECTORY = - "com.nutomic.syncthingandroid.activities.FolderPickerActivity.RESULT_DIRECTORY"; + "com.ajmalshajahan.syncthingandroid.activities.FolderPickerActivity.RESULT_DIRECTORY"; public static final int DIRECTORY_REQUEST_CODE = 234; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java index 839003560..b87a31455 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.app.Activity; import android.content.Intent; @@ -7,8 +7,8 @@ import android.widget.AdapterView; import android.widget.Button; import android.widget.Spinner; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.service.Constants; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java index c1e33cf41..712ca295f 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.content.Intent; import android.os.AsyncTask; @@ -12,7 +12,7 @@ import android.widget.ScrollView; import android.widget.TextView; -import com.nutomic.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.R; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java index 4c7154bde..4cc27e6e6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.annotation.SuppressLint; import android.app.Activity; @@ -47,17 +47,17 @@ import android.widget.Toast; import com.annimon.stream.function.Consumer; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.fragments.DeviceListFragment; -import com.nutomic.syncthingandroid.fragments.DrawerFragment; -import com.nutomic.syncthingandroid.fragments.FolderListFragment; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; -import com.nutomic.syncthingandroid.util.PermissionUtil; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.fragments.DeviceListFragment; +import com.ajmalshajahan.syncthingandroid.fragments.DrawerFragment; +import com.ajmalshajahan.syncthingandroid.fragments.FolderListFragment; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.service.SyncthingServiceBinder; +import com.ajmalshajahan.syncthingandroid.util.PermissionUtil; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.util.Date; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java index 820321bcf..d7b9f74ff 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java @@ -1,11 +1,11 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.AdapterView; -import com.nutomic.syncthingandroid.databinding.ActivityPullorderDialogBinding; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityPullorderDialogBinding; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java index 32b836ddf..edcbca1b5 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.Manifest; import android.app.Activity; @@ -13,8 +13,8 @@ import com.google.zxing.ResultPoint; import com.journeyapps.barcodescanner.BarcodeCallback; import com.journeyapps.barcodescanner.BarcodeResult; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.ActivityQrScannerBinding; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityQrScannerBinding; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java index f079bf386..5e4fd6cb9 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.content.Intent; import android.content.SharedPreferences; @@ -24,18 +24,18 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Iterables; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.model.Config; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.model.Options; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.NotificationHandler; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.util.Languages; -import com.nutomic.syncthingandroid.util.Util; -import com.nutomic.syncthingandroid.views.WifiSsidPreference; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.model.Config; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.model.Options; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.NotificationHandler; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.util.Languages; +import com.ajmalshajahan.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.views.WifiSsidPreference; import java.lang.ref.WeakReference; import java.security.InvalidParameterException; @@ -49,7 +49,7 @@ public class SettingsActivity extends SyncthingActivity { public static final String EXTRA_OPEN_SUB_PREF_SCREEN = - "com.nutomic.syncthingandroid.activities.SettingsActivity.OPEN_SUB_PREF_SCREEN"; + "com.ajmalshajahan.syncthingandroid.activities.SettingsActivity.OPEN_SUB_PREF_SCREEN"; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/ShareActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/ShareActivity.java index 47bb1ed76..4491da473 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/ShareActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/ShareActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN; @@ -22,12 +22,12 @@ import android.widget.Toast; import com.google.common.io.Files; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.databinding.ActivityShareBinding; -import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityShareBinding; +import com.ajmalshajahan.syncthingandroid.model.Folder; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.io.File; import java.io.FileNotFoundException; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java index 3578df900..5e5ba257a 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.content.Intent; import androidx.databinding.DataBindingUtil; @@ -10,17 +10,17 @@ import androidx.appcompat.app.AlertDialog; import android.view.View; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.DialogLoadingBinding; -import com.nutomic.syncthingandroid.model.RunConditionCheckResult; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.service.SyncthingService.State; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.DialogLoadingBinding; +import com.ajmalshajahan.syncthingandroid.model.RunConditionCheckResult; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService.State; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.util.Collection; import java.util.concurrent.TimeUnit; -import static com.nutomic.syncthingandroid.model.RunConditionCheckResult.*; +import static com.ajmalshajahan.syncthingandroid.model.RunConditionCheckResult.*; /** * Handles loading/disabled dialogs. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java index 7d7b67182..8d47a5dac 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.content.ComponentName; import android.content.Context; @@ -9,10 +9,10 @@ import androidx.appcompat.widget.Toolbar; import com.annimon.stream.Stream; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.service.SyncthingServiceBinder; import java.util.LinkedList; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java index 8f126a09d..d080c1723 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java @@ -1,12 +1,12 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.content.SharedPreferences; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatDelegate; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.service.Constants; import javax.inject.Inject; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java index 4fe305355..0e5128f41 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import android.app.Activity; import android.content.Intent; @@ -7,13 +7,13 @@ import android.widget.AdapterView; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.ActivityVersioningDialogBinding; -import com.nutomic.syncthingandroid.fragments.dialog.ExternalVersioningFragment; -import com.nutomic.syncthingandroid.fragments.dialog.NoVersioningFragment; -import com.nutomic.syncthingandroid.fragments.dialog.SimpleVersioningFragment; -import com.nutomic.syncthingandroid.fragments.dialog.StaggeredVersioningFragment; -import com.nutomic.syncthingandroid.fragments.dialog.TrashCanVersioningFragment; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityVersioningDialogBinding; +import com.ajmalshajahan.syncthingandroid.fragments.dialog.ExternalVersioningFragment; +import com.ajmalshajahan.syncthingandroid.fragments.dialog.NoVersioningFragment; +import com.ajmalshajahan.syncthingandroid.fragments.dialog.SimpleVersioningFragment; +import com.ajmalshajahan.syncthingandroid.fragments.dialog.StaggeredVersioningFragment; +import com.ajmalshajahan.syncthingandroid.fragments.dialog.TrashCanVersioningFragment; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java index 8e3dc1d69..792740102 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.activities; +package com.ajmalshajahan.syncthingandroid.activities; import static java.nio.charset.StandardCharsets.UTF_8; @@ -23,12 +23,12 @@ import android.webkit.WebViewClient; import android.widget.Toast; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.ActivityWebGuiBinding; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.service.SyncthingServiceBinder; -import com.nutomic.syncthingandroid.util.ConfigXml; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.ActivityWebGuiBinding; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.service.SyncthingServiceBinder; +import com.ajmalshajahan.syncthingandroid.util.ConfigXml; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java index a0c0e9b04..4f36e43e1 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments; +package com.ajmalshajahan.syncthingandroid.fragments; import android.content.Intent; import android.os.Bundle; @@ -10,14 +10,14 @@ import android.widget.AdapterView; import android.widget.ListView; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.activities.DeviceActivity; -import com.nutomic.syncthingandroid.activities.SyncthingActivity; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.views.DevicesAdapter; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.activities.DeviceActivity; +import com.ajmalshajahan.syncthingandroid.activities.SyncthingActivity; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.views.DevicesAdapter; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java index 3829e6fc7..c9a70b86b 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments; +package com.ajmalshajahan.syncthingandroid.fragments; import android.content.Intent; import android.content.SharedPreferences; @@ -16,18 +16,18 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.activities.MainActivity; -import com.nutomic.syncthingandroid.activities.SettingsActivity; -import com.nutomic.syncthingandroid.activities.WebGuiActivity; -import com.nutomic.syncthingandroid.http.ImageGetRequest; -import com.nutomic.syncthingandroid.model.Connections; -import com.nutomic.syncthingandroid.model.SystemInfo; -import com.nutomic.syncthingandroid.model.SystemVersion; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.activities.MainActivity; +import com.ajmalshajahan.syncthingandroid.activities.SettingsActivity; +import com.ajmalshajahan.syncthingandroid.activities.WebGuiActivity; +import com.ajmalshajahan.syncthingandroid.http.ImageGetRequest; +import com.ajmalshajahan.syncthingandroid.model.Connections; +import com.ajmalshajahan.syncthingandroid.model.SystemInfo; +import com.ajmalshajahan.syncthingandroid.model.SystemVersion; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.net.URL; import java.text.NumberFormat; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java index 8da44b77a..b47e16aae 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments; +package com.ajmalshajahan.syncthingandroid.fragments; import android.content.Intent; import android.os.Bundle; @@ -9,14 +9,14 @@ import android.view.View; import android.widget.AdapterView; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.activities.FolderActivity; -import com.nutomic.syncthingandroid.activities.SyncthingActivity; -import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.views.FoldersAdapter; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.activities.FolderActivity; +import com.ajmalshajahan.syncthingandroid.activities.SyncthingActivity; +import com.ajmalshajahan.syncthingandroid.model.Folder; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.views.FoldersAdapter; import java.util.List; import java.util.Timer; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/NumberPickerFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/NumberPickerFragment.java index 87e206162..36da0b5c6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/NumberPickerFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/NumberPickerFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments; +package com.ajmalshajahan.syncthingandroid.fragments; import android.os.Bundle; import androidx.annotation.Nullable; @@ -8,7 +8,7 @@ import android.view.ViewGroup; import android.widget.NumberPicker; -import com.nutomic.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.R; /** * Simply displays a numberpicker and allows easy access to configure it with the public functions. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/ExternalVersioningFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/ExternalVersioningFragment.java index 58a0e722e..ba6620639 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/ExternalVersioningFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/ExternalVersioningFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments.dialog; +package com.ajmalshajahan.syncthingandroid.fragments.dialog; import android.os.Bundle; import androidx.annotation.Nullable; @@ -10,7 +10,7 @@ import android.view.ViewGroup; import android.widget.TextView; -import com.nutomic.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.R; /** * Contains the configuration options for external file versioning. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/NoVersioningFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/NoVersioningFragment.java index 7c5882c09..95e309fce 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/NoVersioningFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/NoVersioningFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments.dialog; +package com.ajmalshajahan.syncthingandroid.fragments.dialog; import android.os.Bundle; import androidx.annotation.Nullable; @@ -7,7 +7,7 @@ import android.view.View; import android.view.ViewGroup; -import com.nutomic.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.R; public class NoVersioningFragment extends Fragment { diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/SimpleVersioningFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/SimpleVersioningFragment.java index d16aafcb8..ff4562dff 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/SimpleVersioningFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/SimpleVersioningFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments.dialog; +package com.ajmalshajahan.syncthingandroid.fragments.dialog; import android.os.Bundle; import androidx.annotation.Nullable; @@ -7,8 +7,8 @@ import android.view.View; import android.view.ViewGroup; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.fragments.NumberPickerFragment; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.fragments.NumberPickerFragment; /** * Contains the configuration options for simple file versioning. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/StaggeredVersioningFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/StaggeredVersioningFragment.java index 79ea2744a..2588f2a82 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/StaggeredVersioningFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/StaggeredVersioningFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments.dialog; +package com.ajmalshajahan.syncthingandroid.fragments.dialog; import android.app.Activity; import android.content.Intent; @@ -10,9 +10,9 @@ import android.view.ViewGroup; import android.widget.TextView; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.activities.FolderPickerActivity; -import com.nutomic.syncthingandroid.fragments.NumberPickerFragment; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.activities.FolderPickerActivity; +import com.ajmalshajahan.syncthingandroid.fragments.NumberPickerFragment; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/TrashCanVersioningFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/TrashCanVersioningFragment.java index 7e0cfb635..105ab93ba 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/TrashCanVersioningFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/TrashCanVersioningFragment.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.fragments.dialog; +package com.ajmalshajahan.syncthingandroid.fragments.dialog; import android.os.Bundle; import androidx.annotation.Nullable; @@ -7,8 +7,8 @@ import android.view.View; import android.view.ViewGroup; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.fragments.NumberPickerFragment; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.fragments.NumberPickerFragment; /** * Contains the configuration options for trashcan file versioning. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java b/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java index 4bc2c614c..55ef9752d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.content.Context; @@ -18,7 +18,7 @@ import com.android.volley.toolbox.Volley; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import com.nutomic.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.Constants; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/GetRequest.java b/app/src/main/java/com/nutomic/syncthingandroid/http/GetRequest.java index f639a372f..6cd406477 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/GetRequest.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/GetRequest.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.content.Context; import android.net.Uri; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/ImageGetRequest.java b/app/src/main/java/com/nutomic/syncthingandroid/http/ImageGetRequest.java index 9917d38fc..ce328929d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/ImageGetRequest.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/ImageGetRequest.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.content.Context; import android.net.Uri; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/PollWebGuiAvailableTask.java b/app/src/main/java/com/nutomic/syncthingandroid/http/PollWebGuiAvailableTask.java index 6c0ffc684..776125c1d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/PollWebGuiAvailableTask.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/PollWebGuiAvailableTask.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.content.Context; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/PostConfigRequest.java b/app/src/main/java/com/nutomic/syncthingandroid/http/PostConfigRequest.java index eb7597488..59094477f 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/PostConfigRequest.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/PostConfigRequest.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.content.Context; import android.net.Uri; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/PostRequest.java b/app/src/main/java/com/nutomic/syncthingandroid/http/PostRequest.java index 71190de06..6e687ba08 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/PostRequest.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/PostRequest.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.content.Context; import android.net.Uri; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/SyncthingTrustManager.java b/app/src/main/java/com/nutomic/syncthingandroid/http/SyncthingTrustManager.java index 544999d96..6877aab12 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/http/SyncthingTrustManager.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/http/SyncthingTrustManager.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.http; +package com.ajmalshajahan.syncthingandroid.http; import android.annotation.SuppressLint; import android.util.Log; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Completion.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Completion.java index 56e1733bc..c5ee007ba 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Completion.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Completion.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import android.util.Log; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/CompletionInfo.java b/app/src/main/java/com/nutomic/syncthingandroid/model/CompletionInfo.java index 796bc12c5..7e8b122cc 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/CompletionInfo.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/CompletionInfo.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; /** * According to syncthing REST API diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Config.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Config.java index 183f3f8d5..bc7532fb8 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Config.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Config.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Connections.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Connections.java index f88c31e73..74b41d707 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Connections.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Connections.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import java.util.Map; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Device.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Device.java index 71dbe507f..3ed06aa4d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Device.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Device.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import android.text.TextUtils; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Event.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Event.java index 592fd002f..f90cae2e3 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Event.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Event.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import java.util.Map; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java index 00fdcd02f..30819f326 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java @@ -1,8 +1,8 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import android.text.TextUtils; -import com.nutomic.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.Constants; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/FolderIgnoreList.java b/app/src/main/java/com/nutomic/syncthingandroid/model/FolderIgnoreList.java index 26811823a..583d31fda 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/FolderIgnoreList.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/FolderIgnoreList.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; /** * To avoid name confusion: diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/FolderStatus.java b/app/src/main/java/com/nutomic/syncthingandroid/model/FolderStatus.java index 2f5f4d624..f221da9fe 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/FolderStatus.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/FolderStatus.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; public class FolderStatus { public long globalBytes; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/IgnoredFolder.java b/app/src/main/java/com/nutomic/syncthingandroid/model/IgnoredFolder.java index 01264c2f3..9a52f7d66 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/IgnoredFolder.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/IgnoredFolder.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import android.text.TextUtils; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java index c876cc85a..70d84384a 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; public class Options { public String[] listenAddresses; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/RemoteIgnoredDevice.java b/app/src/main/java/com/nutomic/syncthingandroid/model/RemoteIgnoredDevice.java index 14e167777..372d6879f 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/RemoteIgnoredDevice.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/RemoteIgnoredDevice.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import android.text.TextUtils; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/RunConditionCheckResult.java b/app/src/main/java/com/nutomic/syncthingandroid/model/RunConditionCheckResult.java index 7250ed4d9..47d98eb29 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/RunConditionCheckResult.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/RunConditionCheckResult.java @@ -1,6 +1,6 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; -import com.nutomic.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.R; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/SystemInfo.java b/app/src/main/java/com/nutomic/syncthingandroid/model/SystemInfo.java index 9bb085d8a..a412da136 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/SystemInfo.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/SystemInfo.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; import java.util.Map; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/SystemVersion.java b/app/src/main/java/com/nutomic/syncthingandroid/model/SystemVersion.java index 5fd1b766c..cb1f8cecf 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/SystemVersion.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/SystemVersion.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.model; +package com.ajmalshajahan.syncthingandroid.model; public class SystemVersion { public String arch; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java b/app/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java index 3e2265e5d..9d18fa686 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.receiver; +package com.ajmalshajahan.syncthingandroid.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -6,10 +6,10 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.service.NotificationHandler; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.service.NotificationHandler; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; import javax.inject.Inject; @@ -21,14 +21,14 @@ public class AppConfigReceiver extends BroadcastReceiver { /** * Start the Syncthing-Service */ - private static final String ACTION_START = "com.nutomic.syncthingandroid.action.START"; + private static final String ACTION_START = "com.ajmalshajahan.syncthingandroid.action.START"; /** * Stop the Syncthing-Service * If startServiceOnBoot is enabled the service must not be stopped. Instead a * notification is presented to the user. */ - private static final String ACTION_STOP = "com.nutomic.syncthingandroid.action.STOP"; + private static final String ACTION_STOP = "com.ajmalshajahan.syncthingandroid.action.STOP"; @Inject NotificationHandler mNotificationHandler; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java b/app/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java index 1b0d7e50a..0529b167b 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/receiver/BootReceiver.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.receiver; +package com.ajmalshajahan.syncthingandroid.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -7,8 +7,8 @@ import android.os.Build; import android.preference.PreferenceManager; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; public class BootReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java index fc8f16d00..52b9726a8 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.Manifest; import android.app.PendingIntent; @@ -60,7 +60,7 @@ public enum PermissionRequestType { /** - * Interval in ms at which the GUI is updated (eg {@link com.nutomic.syncthingandroid.fragments.DrawerFragment}). + * Interval in ms at which the GUI is updated (eg {@link com.ajmalshajahan.syncthingandroid.fragments.DrawerFragment}). */ public static final long GUI_UPDATE_INTERVAL = TimeUnit.SECONDS.toMillis(5); diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java b/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java index 6b02ed407..9efa0e6ce 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.app.PendingIntent; import android.content.ContentResolver; @@ -16,15 +16,15 @@ import androidx.core.util.Consumer; import com.annimon.stream.Stream; -import com.nutomic.syncthingandroid.BuildConfig; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.activities.DeviceActivity; -import com.nutomic.syncthingandroid.activities.FolderActivity; -import com.nutomic.syncthingandroid.model.CompletionInfo; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.model.Event; -import com.nutomic.syncthingandroid.model.Folder; +import com.ajmalshajahan.syncthingandroid.BuildConfig; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.activities.DeviceActivity; +import com.ajmalshajahan.syncthingandroid.activities.FolderActivity; +import com.ajmalshajahan.syncthingandroid.model.CompletionInfo; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.model.Event; +import com.ajmalshajahan.syncthingandroid.model.Folder; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java b/app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java index 515de9dff..b98d596c8 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.annotation.TargetApi; import android.app.Notification; @@ -13,13 +13,13 @@ import androidx.core.app.NotificationCompat; import android.util.Log; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.activities.FirstStartActivity; -import com.nutomic.syncthingandroid.activities.LogActivity; -import com.nutomic.syncthingandroid.activities.MainActivity; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.SyncthingService.State; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.activities.FirstStartActivity; +import com.ajmalshajahan.syncthingandroid.activities.LogActivity; +import com.ajmalshajahan.syncthingandroid.activities.MainActivity; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService.State; import javax.inject.Inject; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/ReceiverManager.java b/app/src/main/java/com/nutomic/syncthingandroid/service/ReceiverManager.java index 0ed0679b3..0cf761969 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/ReceiverManager.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/ReceiverManager.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java index 8a82da0f1..1eb1b2e38 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.content.Context; import android.content.Intent; @@ -15,25 +15,25 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.nutomic.syncthingandroid.BuildConfig; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.activities.ShareActivity; -import com.nutomic.syncthingandroid.http.GetRequest; -import com.nutomic.syncthingandroid.http.PostRequest; -import com.nutomic.syncthingandroid.http.PostConfigRequest; -import com.nutomic.syncthingandroid.model.Config; -import com.nutomic.syncthingandroid.model.Completion; -import com.nutomic.syncthingandroid.model.CompletionInfo; -import com.nutomic.syncthingandroid.model.Connections; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.model.Event; -import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.model.FolderStatus; -import com.nutomic.syncthingandroid.model.IgnoredFolder; -import com.nutomic.syncthingandroid.model.Options; -import com.nutomic.syncthingandroid.model.RemoteIgnoredDevice; -import com.nutomic.syncthingandroid.model.SystemInfo; -import com.nutomic.syncthingandroid.model.SystemVersion; +import com.ajmalshajahan.syncthingandroid.BuildConfig; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.activities.ShareActivity; +import com.ajmalshajahan.syncthingandroid.http.GetRequest; +import com.ajmalshajahan.syncthingandroid.http.PostRequest; +import com.ajmalshajahan.syncthingandroid.http.PostConfigRequest; +import com.ajmalshajahan.syncthingandroid.model.Config; +import com.ajmalshajahan.syncthingandroid.model.Completion; +import com.ajmalshajahan.syncthingandroid.model.CompletionInfo; +import com.ajmalshajahan.syncthingandroid.model.Connections; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.model.Event; +import com.ajmalshajahan.syncthingandroid.model.Folder; +import com.ajmalshajahan.syncthingandroid.model.FolderStatus; +import com.ajmalshajahan.syncthingandroid.model.IgnoredFolder; +import com.ajmalshajahan.syncthingandroid.model.Options; +import com.ajmalshajahan.syncthingandroid.model.RemoteIgnoredDevice; +import com.ajmalshajahan.syncthingandroid.model.SystemInfo; +import com.ajmalshajahan.syncthingandroid.model.SystemVersion; import java.lang.reflect.Type; import java.net.URL; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java b/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java index 997aedc6d..e440ff54b 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.annotation.TargetApi; import android.content.BroadcastReceiver; @@ -19,8 +19,8 @@ import androidx.annotation.Nullable; import android.util.Log; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.model.RunConditionCheckResult; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.model.RunConditionCheckResult; import java.util.ArrayList; import java.util.HashSet; @@ -29,8 +29,8 @@ import javax.inject.Inject; -import static com.nutomic.syncthingandroid.model.RunConditionCheckResult.*; -import static com.nutomic.syncthingandroid.model.RunConditionCheckResult.BlockerReason.*; +import static com.ajmalshajahan.syncthingandroid.model.RunConditionCheckResult.*; +import static com.ajmalshajahan.syncthingandroid.model.RunConditionCheckResult.BlockerReason.*; /** * Holds information about the current wifi and charging state of the device. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java index 4cfc26145..c36b8e127 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.annotation.SuppressLint; import android.content.Context; @@ -12,10 +12,10 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java index 138f6e979..c0ec0752b 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.app.Service; import android.content.Intent; @@ -10,12 +10,12 @@ import androidx.annotation.Nullable; import com.google.common.io.Files; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; -import com.nutomic.syncthingandroid.http.PollWebGuiAvailableTask; -import com.nutomic.syncthingandroid.model.RunConditionCheckResult; -import com.nutomic.syncthingandroid.util.ConfigXml; -import com.nutomic.syncthingandroid.util.PermissionUtil; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.http.PollWebGuiAvailableTask; +import com.ajmalshajahan.syncthingandroid.model.RunConditionCheckResult; +import com.ajmalshajahan.syncthingandroid.util.ConfigXml; +import com.ajmalshajahan.syncthingandroid.util.PermissionUtil; import java.io.File; import java.io.IOException; @@ -38,76 +38,76 @@ public class SyncthingService extends Service { * Intent action to perform a Syncthing restart. */ public static final String ACTION_RESTART = - "com.nutomic.syncthingandroid.service.SyncthingService.RESTART"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.RESTART"; /** * Intent action to reset Syncthing's database. */ public static final String ACTION_RESET_DATABASE = - "com.nutomic.syncthingandroid.service.SyncthingService.RESET_DATABASE"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.RESET_DATABASE"; /** * Intent action to reset Syncthing's delta indexes. */ public static final String ACTION_RESET_DELTAS = - "com.nutomic.syncthingandroid.service.SyncthingService.RESET_DELTAS"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.RESET_DELTAS"; public static final String ACTION_REFRESH_NETWORK_INFO = - "com.nutomic.syncthingandroid.service.SyncthingService.REFRESH_NETWORK_INFO"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.REFRESH_NETWORK_INFO"; /** * Intent action to permanently ignore a device connection request. */ public static final String ACTION_IGNORE_DEVICE = - "com.nutomic.syncthingandroid.service.SyncthingService.IGNORE_DEVICE"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.IGNORE_DEVICE"; /** * Intent action to permanently ignore a folder share request. */ public static final String ACTION_IGNORE_FOLDER = - "com.nutomic.syncthingandroid.service.SyncthingService.IGNORE_FOLDER"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.IGNORE_FOLDER"; /** * Intent action to override folder changes. */ public static final String ACTION_OVERRIDE_CHANGES = - "com.nutomic.syncthingandroid.service.SyncthingService.OVERRIDE_CHANGES"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.OVERRIDE_CHANGES"; /** * Extra used together with ACTION_IGNORE_DEVICE, ACTION_IGNORE_FOLDER. */ public static final String EXTRA_NOTIFICATION_ID = - "com.nutomic.syncthingandroid.service.SyncthingService.EXTRA_NOTIFICATION_ID"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.EXTRA_NOTIFICATION_ID"; /** * Extra used together with ACTION_IGNORE_DEVICE */ public static final String EXTRA_DEVICE_ID = - "com.nutomic.syncthingandroid.service.SyncthingService.EXTRA_DEVICE_ID"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.EXTRA_DEVICE_ID"; /** * Extra used together with ACTION_IGNORE_DEVICE */ public static final String EXTRA_DEVICE_NAME = - "com.nutomic.syncthingandroid.service.SyncthingService.EXTRA_DEVICE_NAME"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.EXTRA_DEVICE_NAME"; /** * Extra used together with ACTION_IGNORE_DEVICE */ public static final String EXTRA_DEVICE_ADDRESS = - "com.nutomic.syncthingandroid.service.SyncthingService.EXTRA_DEVICE_ADDRESS"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.EXTRA_DEVICE_ADDRESS"; /** * Extra used together with ACTION_IGNORE_FOLDER */ public static final String EXTRA_FOLDER_ID = - "com.nutomic.syncthingandroid.service.SyncthingService.EXTRA_FOLDER_ID"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.EXTRA_FOLDER_ID"; /** * Extra used together with ACTION_IGNORE_FOLDER */ public static final String EXTRA_FOLDER_LABEL = - "com.nutomic.syncthingandroid.service.SyncthingService.EXTRA_FOLDER_LABEL"; + "com.ajmalshajahan.syncthingandroid.service.SyncthingService.EXTRA_FOLDER_LABEL"; public interface OnServiceStateChangeListener { void onServiceStateChange(State currentState); diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java index 67b0400cc..21d3ba822 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingServiceBinder.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.service; +package com.ajmalshajahan.syncthingandroid.service; import android.os.Binder; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Compression.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Compression.java index 28063ecb7..b96340540 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/Compression.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/Compression.java @@ -1,8 +1,8 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.content.Context; -import com.nutomic.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.R; /** * Device compression attribute helper. This unifies operations between string values as expected by diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java index 0e2d245dd..91e2ef22f 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.content.Context; import android.content.SharedPreferences; @@ -8,9 +8,9 @@ import android.text.TextUtils; import android.util.Log; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.SyncthingRunnable; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.SyncthingRunnable; import org.mindrot.jbcrypt.BCrypt; import org.w3c.dom.Document; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java b/app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java index db75f9140..f2e59b36d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Languages.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Languages.java index d74e1433e..9f43f4b5a 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/Languages.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/Languages.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -11,8 +11,8 @@ import android.os.Build; import android.text.TextUtils; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.SyncthingApp; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.SyncthingApp; import java.util.Arrays; import java.util.Collections; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/PermissionUtil.java b/app/src/main/java/com/nutomic/syncthingandroid/util/PermissionUtil.java index a793dd509..351a65b1d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/PermissionUtil.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/PermissionUtil.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.Manifest; import android.content.Context; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/TextWatcherAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/util/TextWatcherAdapter.java index ee9f2888e..3a86639df 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/TextWatcherAdapter.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/TextWatcherAdapter.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java index 1b8c32dc6..aba9e4582 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.util; +package com.ajmalshajahan.syncthingandroid.util; import android.app.Activity; import android.app.Dialog; @@ -14,8 +14,8 @@ import android.widget.Toast; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.service.Constants; import java.io.BufferedWriter; import java.io.DataOutputStream; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java index c8e8e340b..4c2999394 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.views; +package com.ajmalshajahan.syncthingandroid.views; import android.content.Context; import android.content.res.Resources; @@ -13,11 +13,11 @@ import android.widget.TextView; import com.google.android.material.color.MaterialColors; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.model.Connections; -import com.nutomic.syncthingandroid.model.Device; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.model.Connections; +import com.ajmalshajahan.syncthingandroid.model.Device; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.util.Util; /** * Generates item views for device items. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java b/app/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java index acedcd399..659b86741 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.views; +package com.ajmalshajahan.syncthingandroid.views; import android.content.Context; import androidx.appcompat.widget.AppCompatEditText; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java index 4605f7d96..cbecdbcd6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.views; +package com.ajmalshajahan.syncthingandroid.views; import android.content.Context; import android.content.Intent; @@ -18,14 +18,14 @@ import android.widget.Toast; import com.google.android.material.color.MaterialColors; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.databinding.ItemFolderListBinding; -import com.nutomic.syncthingandroid.model.Folder; -import com.nutomic.syncthingandroid.model.FolderStatus; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.service.RestApi; -import com.nutomic.syncthingandroid.service.SyncthingService; -import com.nutomic.syncthingandroid.util.Util; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.databinding.ItemFolderListBinding; +import com.ajmalshajahan.syncthingandroid.model.Folder; +import com.ajmalshajahan.syncthingandroid.model.FolderStatus; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.RestApi; +import com.ajmalshajahan.syncthingandroid.service.SyncthingService; +import com.ajmalshajahan.syncthingandroid.util.Util; import java.io.File; import java.util.HashMap; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java b/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java index e5870e13b..c7e6f5b44 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.views; +package com.ajmalshajahan.syncthingandroid.views; import android.Manifest; import android.content.Context; @@ -10,7 +10,7 @@ import android.util.AttributeSet; import android.util.Log; -import com.nutomic.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.service.Constants; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java b/app/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java index c592b0fcc..05f4056c2 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.views; +package com.ajmalshajahan.syncthingandroid.views; import android.app.Activity; import android.content.Context; @@ -12,9 +12,9 @@ import android.util.AttributeSet; import android.widget.Toast; -import com.nutomic.syncthingandroid.R; -import com.nutomic.syncthingandroid.service.Constants; -import com.nutomic.syncthingandroid.util.PermissionUtil; +import com.ajmalshajahan.syncthingandroid.R; +import com.ajmalshajahan.syncthingandroid.service.Constants; +import com.ajmalshajahan.syncthingandroid.util.PermissionUtil; import java.util.ArrayList; import java.util.HashSet; diff --git a/app/src/main/res/layout/activity_device.xml b/app/src/main/res/layout/activity_device.xml index e409db874..0a3f4e477 100644 --- a/app/src/main/res/layout/activity_device.xml +++ b/app/src/main/res/layout/activity_device.xml @@ -28,7 +28,7 @@ android:background="?selectableItemBackground" android:orientation="horizontal"> - + tools:context="com.ajmalshajahan.syncthingandroid.activities.ShareActivity"> - Syncthing + Syncthing Fork diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8a9f437a2..4b6177f4d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Отворено и заслужаващо доверие приложение за нецентрализирано синхронизиране на файлове. diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 63a7663e3..d7e56db02 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Una aplicació de sincronització de fitxers oberta, confiable i descentralitzada. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 004f4267e..529e6c462 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Otevřená, důvěryhodná a decentralizovaná aplikace pro synchronizaci souborů. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ef00579aa..0d39c9947 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork En åben, troværdig og decentraliseret fil-synkroniserings applikation. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f63132db8..9cd253c8c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Eine offene, vertrauenswürdige und dezentralisierte Anwendung zur Dateisynchronisation. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0eb515921..1f9508a5c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Μια ανοιχτή, αξιόπιστη και αποκεντρωμένη εφαρμογή συγχρονισμού αρχείων. diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 4ddf813c5..23e3d120b 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Una aplicación para sincronización de archivos abierta, confiable y descentralizada. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5c7c7d7ed..dfd09a269 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Una aplicación de sincronización de ficheros abierta, de confianza y descentralizada. diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 15b711840..2dee63e82 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Sinkronizazio aplikazio irekia, konfiantzazkoa eta zentralizatu gabea. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index bf1e57a44..db4947503 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Avoin, luotettava ja hajautettu tiedostojensynkronointisovellus. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 391dc9774..67acb8e85 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Une application ouverte, fiable et décentralisée pour synchroniser des fichiers. diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 6fd37160b..09bd670b2 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Android के लिए Syncthing में आपका स्वागत है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 923c3e43a..d10572d47 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Egy nyílt, megbízható és decentralizált fájl szinkronizáló alkalmazás. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 80c6d0d55..bc7596a90 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Aplikasi penyelarasan berkas yang terbuka, tepercaya dan terdesentralisasi. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 92b3d116a..975afb42a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Un\'applicazione affidabile, decentralizzata e aperta per la sincronizzazione di file. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 184b58030..f6b010cc7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork オープンで、信頼できる、分散型ファイル同期アプリケーション。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index bc255e850..16c7740b2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork 개방적이고 신뢰할 수 있는 분산형 파일 동기화 응용프로그램. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 931e2f893..e64c162cf 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork En åpen, pålitelig og desentralisert filsynkroniseringsapplikasjon. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3d09a3f03..d688812b1 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Een open, betrouwbare en gedecentraliseerde toepassing voor bestandssynchronisatie. diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index f3ea223ab..1fd3dbf9b 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Ein open, påliteleg og desentralisert app for filsynkronisering. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f13092637..54f59a7f9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Otwarta, godna zaufania i zdecentralizowana aplikacja do synchronizacji plików. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 258d130cf..5932342f6 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Uma aplicação aberta, confiável e descentralizada para sincronização de arquivos. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 023bf79fa..03e297ba1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Uma aplicação de sincronização de ficheiros aberta, fiável e descentralizada. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index eac95f6f2..503ed282c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork O aplicație de sincronizare de fișiere în mod deschis, de încredere și descentralizat. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4d671bfff..8d54fbe69 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Открытое, надёжное и децентрализованное приложение для синхронизации файлов. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 088ae2098..7f1678b88 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Otvorená, dôveryhodná a decentralizovaná aplikácia pre synchronizáciu súborov. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8e20c66ba..dbe6157be 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork En öppen, pålitlig och decentraliserad filsynkroniserings applikation. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1481838f1..746a725a3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Açık, güvenilir ve merkezi olmayan bir dosya eşitleme uygulaması. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a55145970..c35097012 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Відкритий, надійний додаток для децентралізованої синхронізації файлів. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c9450b166..1258e6cb4 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork Một ứng dụng đồng bộ hoá tệp phi tập trung, mở và đáng tin cậy. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c9cc594c9..b9a5b01dc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork 开放且值得信赖的去中心化文件同步应用程序。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index f1f03ec4b..aff63fac9 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork 一個開放、可靠、去中心化的檔案同步應用程式。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c94e1534e..1d93f3c21 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,6 +1,6 @@ - Syncthing + Syncthing Fork 一個開放、可靠、去中心化的檔案同步應用程式。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83bc3a68f..0bdee9358 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Syncthing + Syncthing Fork An open, trustworthy and decentralized file synchronization application. diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index f8575d8ed..a7b5676fb 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -30,7 +30,7 @@ android:summary="@string/run_on_metered_wifi_summary" android:defaultValue="false" /> - @@ -207,7 +207,7 @@ android:title="@string/notify_crashes_title" android:summary="@string/notify_crashes_summary"/> - diff --git a/scripts/bump-version.ps1 b/scripts/bump-version.ps1 index 1f0ef4830..e9931eb50 100644 --- a/scripts/bump-version.ps1 +++ b/scripts/bump-version.ps1 @@ -52,7 +52,7 @@ $OLD_VERSION_NAME = Select-String 'versionName' "app/build.gradle.kts" | ForEach (Get-Content "app/build.gradle.kts") -replace "$OLD_VERSION_NAME", "`"$NEW_VERSION_NAME`"" | Set-Content "app/build.gradle.kts" git add "app/build.gradle.kts" $CHANGELOG -git commit -m "Bumped version to $NEW_VERSION_NAME" +git commit -m "chore: bump version to $NEW_VERSION_NAME" $changelogContent = Get-Content $CHANGELOG | Out-String git tag -a $NEW_VERSION_NAME -m "$NEW_VERSION_NAME`n`n$changelogContent"