diff --git a/app/build.gradle b/app/build.gradle index db796b69..e5dae627 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,6 +9,18 @@ android { } signingConfigs { + debug { + def props = new Properties() + def localPropsFile = rootProject.file('local.properties') + if (localPropsFile.exists()) { + localPropsFile.withInputStream { props.load(it) } + } + + storeFile = file(props['storeFile'] ?: "") + storePassword = props['storePassword'] ?: "" + keyAlias = props['keyAlias'] ?: "" + keyPassword = props['keyPassword'] ?: "" + } } compileSdk 34 @@ -17,7 +29,7 @@ android { minSdkVersion 29 //noinspection OldTargetApi targetSdkVersion 34 - versionCode 30001 + versionCode 30004 versionName "0.7.4" archivesBaseName = "Save-$versionName" multiDexEnabled true @@ -28,9 +40,15 @@ android { flavorDimensions += "free" buildTypes { release { + signingConfig signingConfigs.debug minifyEnabled false + shrinkResources false proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } + + debug { + signingConfig signingConfigs.debug + } } packagingOptions { resources { diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt index 4ef288a7..c253ed62 100644 --- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt +++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt @@ -27,16 +27,16 @@ class SpaceSetupFragment : Fragment() { setFragmentResult(RESULT_REQUEST_KEY, bundleOf(RESULT_BUNDLE_KEY to RESULT_VAL_WEBDAV)) } -// if (Space.has(Space.Type.INTERNET_ARCHIVE)) { -// mBinding.internetArchive.hide() -// } else { -// mBinding.internetArchive.setOnClickListener { -// setFragmentResult( -// RESULT_REQUEST_KEY, -// bundleOf(RESULT_BUNDLE_KEY to RESULT_VAL_INTERNET_ARCHIVE) -// ) -// } -// } + if (Space.has(Space.Type.INTERNET_ARCHIVE)) { + mBinding.internetArchive.hide() + } else { + mBinding.internetArchive.setOnClickListener { + setFragmentResult( + RESULT_REQUEST_KEY, + bundleOf(RESULT_BUNDLE_KEY to RESULT_VAL_INTERNET_ARCHIVE) + ) + } + } // if (Space.has(Space.Type.GDRIVE) || !playServicesAvailable()) { // mBinding.gdrive.hide() diff --git a/app/src/main/res/layout/fragment_space_setup.xml b/app/src/main/res/layout/fragment_space_setup.xml index a4daf43f..8ac63e5b 100644 --- a/app/src/main/res/layout/fragment_space_setup.xml +++ b/app/src/main/res/layout/fragment_space_setup.xml @@ -108,80 +108,80 @@ - - - - - - - - - - - - - - + - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - + - - - - - + - + - - - - - - - - - - - + - + - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f038e21..f09ccce7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,7 +21,7 @@ Internet Archive - Upload your media to a public server. + Upload your media to a free public or paid private account on the Internet Archive. Google Drive Google Driveā„¢ Upload to Google Drive @@ -300,7 +300,7 @@ Email Screen Name Login - Sign up + Create one No account? Continue