diff --git a/.circleci/config.yml b/.circleci/config.yml index d524fe69..e824e3fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: build: working_directory: ~/code docker: - - image: circleci/android:api-29 + - image: cimg/android:2022.12.1 steps: - checkout - restore_cache: @@ -36,7 +36,7 @@ jobs: test: working_directory: ~/code docker: - - image: circleci/android:api-29 + - image: cimg/android:2022.12.1 steps: - checkout - restore_cache: diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 505404cb..c3c02825 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -23,17 +23,16 @@ android { compileSdkVersion 25 defaultConfig { - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 25 - versionCode 1 - versionName "1.0" } - lintOptions { - abortOnError false - } useLibrary 'org.apache.http.legacy' + lint { + abortOnError false + } + namespace 'com.klinker.android.send_message' } dependencies { diff --git a/android-smsmms/src/main/AndroidManifest.xml b/android-smsmms/src/main/AndroidManifest.xml index c87baa9a..3af6653c 100755 --- a/android-smsmms/src/main/AndroidManifest.xml +++ b/android-smsmms/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ - + diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java b/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java deleted file mode 100755 index cf36a404..00000000 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (C) 2015 Jacob Klinker - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.mms.service_alt; - -import android.content.Context; -import android.content.SharedPreferences; -import android.database.Cursor; -import android.database.sqlite.SqliteWrapper; -import android.net.NetworkUtilsHelper; -import android.net.Uri; -import android.preference.PreferenceManager; -import android.provider.Telephony; -import android.text.TextUtils; -import com.android.mms.service_alt.exception.ApnException; -import timber.log.Timber; - -import java.net.URI; -import java.net.URISyntaxException; - -/** - * APN settings used for MMS transactions - */ -public class ApnSettings { - - // MMSC URL - private final String mServiceCenter; - // MMSC proxy address - private final String mProxyAddress; - // MMSC proxy port - private final int mProxyPort; - // Debug text for this APN: a concatenation of interesting columns of this APN - private final String mDebugText; - - private static final String[] APN_PROJECTION = { - Telephony.Carriers.TYPE, - Telephony.Carriers.MMSC, - Telephony.Carriers.MMSPROXY, - Telephony.Carriers.MMSPORT, - Telephony.Carriers.NAME, - Telephony.Carriers.APN, - Telephony.Carriers.BEARER, - Telephony.Carriers.PROTOCOL, - Telephony.Carriers.ROAMING_PROTOCOL, - Telephony.Carriers.AUTH_TYPE, - Telephony.Carriers.MVNO_TYPE, - Telephony.Carriers.MVNO_MATCH_DATA, - Telephony.Carriers.PROXY, - Telephony.Carriers.PORT, - Telephony.Carriers.SERVER, - Telephony.Carriers.USER, - Telephony.Carriers.PASSWORD, - }; - private static final int COLUMN_TYPE = 0; - private static final int COLUMN_MMSC = 1; - private static final int COLUMN_MMSPROXY = 2; - private static final int COLUMN_MMSPORT = 3; - private static final int COLUMN_NAME = 4; - private static final int COLUMN_APN = 5; - private static final int COLUMN_BEARER = 6; - private static final int COLUMN_PROTOCOL = 7; - private static final int COLUMN_ROAMING_PROTOCOL = 8; - private static final int COLUMN_AUTH_TYPE = 9; - private static final int COLUMN_MVNO_TYPE = 10; - private static final int COLUMN_MVNO_MATCH_DATA = 11; - private static final int COLUMN_PROXY = 12; - private static final int COLUMN_PORT = 13; - private static final int COLUMN_SERVER = 14; - private static final int COLUMN_USER = 15; - private static final int COLUMN_PASSWORD = 16; - - - /** - * Load APN settings from system - * - * @param context - * @param apnName the optional APN name to match - */ - public static ApnSettings load(Context context, String apnName, int subId) - throws ApnException { - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - String mmsc = sharedPrefs.getString("mmsc_url", ""); - if (!TextUtils.isEmpty(mmsc)) { - String mmsProxy = sharedPrefs.getString("mms_proxy", ""); - String mmsPort = sharedPrefs.getString("mms_port", ""); - return new ApnSettings(mmsc, mmsProxy, parsePort(mmsPort), "Default from settings"); - } - - Timber.v("ApnSettings: apnName " + apnName); - // TODO: CURRENT semantics is currently broken in telephony. Revive this when it is fixed. - //String selection = Telephony.Carriers.CURRENT + " IS NOT NULL"; - String selection = null; - String[] selectionArgs = null; - apnName = apnName != null ? apnName.trim() : null; - if (!TextUtils.isEmpty(apnName)) { - //selection += " AND " + Telephony.Carriers.APN + "=?"; - selection = Telephony.Carriers.APN + "=?"; - selectionArgs = new String[]{ apnName }; - } - Cursor cursor = null; - try { - cursor = SqliteWrapper.query( - context, - context.getContentResolver(), - Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "/subId/" + subId), - APN_PROJECTION, - selection, - selectionArgs, - null/*sortOrder*/); - if (cursor != null) { - String mmscUrl = null; - String proxyAddress = null; - int proxyPort = -1; - while (cursor.moveToNext()) { - // Read values from APN settings - if (isValidApnType( - cursor.getString(COLUMN_TYPE), "mms")) { - mmscUrl = trimWithNullCheck(cursor.getString(COLUMN_MMSC)); - if (TextUtils.isEmpty(mmscUrl)) { - continue; - } - mmscUrl = NetworkUtilsHelper.trimV4AddrZeros(mmscUrl); - try { - new URI(mmscUrl); - } catch (URISyntaxException e) { - throw new ApnException("Invalid MMSC url " + mmscUrl); - } - proxyAddress = trimWithNullCheck(cursor.getString(COLUMN_MMSPROXY)); - if (!TextUtils.isEmpty(proxyAddress)) { - proxyAddress = NetworkUtilsHelper.trimV4AddrZeros(proxyAddress); - final String portString = - trimWithNullCheck(cursor.getString(COLUMN_MMSPORT)); - if (portString != null) { - try { - proxyPort = Integer.parseInt(portString); - } catch (NumberFormatException e) { - Timber.e("Invalid port " + portString); - throw new ApnException("Invalid port " + portString); - } - } - } - return new ApnSettings( - mmscUrl, proxyAddress, proxyPort, getDebugText(cursor)); - } - } - - } - } finally { - if (cursor != null) { - cursor.close(); - } - } - - return new ApnSettings("", "", 80, "Failed to find APNs :("); - } - - private static String getDebugText(Cursor cursor) { - final StringBuilder sb = new StringBuilder(); - sb.append("APN ["); - for (int i = 0; i < cursor.getColumnCount(); i++) { - final String name = cursor.getColumnName(i); - final String value = cursor.getString(i); - if (TextUtils.isEmpty(value)) { - continue; - } - if (i > 0) { - sb.append(' '); - } - sb.append(name).append('=').append(value); - } - sb.append("]"); - return sb.toString(); - } - - private static String trimWithNullCheck(String value) { - return value != null ? value.trim() : null; - } - - public ApnSettings(String mmscUrl, String proxyAddr, int proxyPort, String debugText) { - mServiceCenter = mmscUrl; - mProxyAddress = proxyAddr; - mProxyPort = proxyPort; - mDebugText = debugText; - } - - public String getMmscUrl() { - return mServiceCenter; - } - - public String getProxyAddress() { - return mProxyAddress; - } - - public int getProxyPort() { - return mProxyPort; - } - - public boolean isProxySet() { - return !TextUtils.isEmpty(mProxyAddress); - } - - private static boolean isValidApnType(String types, String requestType) { - // If APN type is unspecified, assume APN_TYPE_ALL. - if (TextUtils.isEmpty(types)) { - return true; - } - for (String type : types.split(",")) { - type = type.trim(); - if (type.equals(requestType) || type.equals("*")) { - return true; - } - } - return false; - } - - private static int parsePort(String port) { - if (TextUtils.isEmpty(port)) { - return 80; - } else { - return Integer.parseInt(port); - } - } - - public String toString() { - return mDebugText; - } -} diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java b/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java index b7067949..4a4cd749 100755 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java +++ b/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java @@ -28,7 +28,6 @@ import android.os.Bundle; import android.provider.Telephony; import android.text.TextUtils; -import com.android.mms.service_alt.exception.MmsHttpException; import com.google.android.mms.MmsException; import com.google.android.mms.pdu_alt.GenericPdu; import com.google.android.mms.pdu_alt.PduHeaders; @@ -75,44 +74,6 @@ public class DownloadRequest extends MmsRequest { mContentUri = contentUri; } - @Override - protected byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn) - throws MmsHttpException { - final MmsHttpClient mmsHttpClient = netMgr.getOrCreateHttpClient(); - if (mmsHttpClient == null) { - Timber.e("MMS network is not ready!"); - throw new MmsHttpException(0/*statusCode*/, "MMS network is not ready"); - } - return mmsHttpClient.execute( - mLocationUrl, - null/*pud*/, - MmsHttpClient.METHOD_GET, - apn.isProxySet(), - apn.getProxyAddress(), - apn.getProxyPort(), - mMmsConfig); - } - - @Override - protected PendingIntent getPendingIntent() { - return mDownloadedIntent; - } - - @Override - protected int getQueueType() { - return 1; - } - - @Override - protected Uri persistIfRequired(Context context, int result, byte[] response) { - if (!mRequestManager.getAutoPersistingPref()) { - notifyOfDownload(context); - return null; - } - - return persist(context, response, mMmsConfig, mLocationUrl, mSubId, mCreator); - } - public static Uri persist(Context context, byte[] response, MmsConfig.Overridden mmsConfig, String locationUrl, int subId, String creator) { // Let any mms apps running as secondary user know that a new mms has been downloaded. @@ -266,41 +227,6 @@ public class DownloadRequest extends MmsRequest { // } } - /** - * Transfer the received response to the caller (for download requests write to content uri) - * - * @param fillIn the intent that will be returned to the caller - * @param response the pdu to transfer - */ - @Override - protected boolean transferResponse(Intent fillIn, final byte[] response) { - return mRequestManager.writePduToContentUri(mContentUri, response); - } - - @Override - protected boolean prepareForHttpRequest() { - return true; - } - - /** - * Try downloading via the carrier app. - * - * @param context The context - * @param carrierMessagingServicePackage The carrier messaging service handling the download - */ - public void tryDownloadingByCarrierApp(Context context, String carrierMessagingServicePackage) { -// final CarrierDownloadManager carrierDownloadManger = new CarrierDownloadManager(); -// final CarrierDownloadCompleteCallback downloadCallback = -// new CarrierDownloadCompleteCallback(context, carrierDownloadManger); -// carrierDownloadManger.downloadMms(context, carrierMessagingServicePackage, -// downloadCallback); - } - - @Override - protected void revokeUriPermission(Context context) { - context.revokeUriPermission(mContentUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION); - } - private String getContentLocation(Context context, Uri uri) throws MmsException { Cursor cursor = android.database.sqlite.SqliteWrapper.query(context, context.getContentResolver(), diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java index 00eb2357..597826ac 100755 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java +++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java @@ -551,15 +551,11 @@ public class MmsConfig { final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService( Context.TELEPHONY_SERVICE); - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { + try { + Method method = telephonyManager.getClass().getMethod("getLine1NumberForSubscriber", int.class); + return (String) method.invoke(telephonyManager, subId); + } catch (Exception e) { return telephonyManager.getLine1Number(); - } else { - try { - Method method = telephonyManager.getClass().getMethod("getLine1NumberForSubscriber", int.class); - return (String) method.invoke(telephonyManager, subId); - } catch (Exception e) { - return telephonyManager.getLine1Number(); - } } } @@ -581,16 +577,12 @@ public class MmsConfig { String nai = ""; - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { + try { + Method method = telephonyManager.getClass().getMethod("getNai", int.class); + Method getSlotId = SubscriptionManager.class.getMethod("getSlotId", int.class); + nai = (String) method.invoke(telephonyManager, getSlotId.invoke(null, subId)); + } catch (Exception e) { nai = SystemPropertiesProxy.get(context, "persist.radio.cdma.nai"); - } else { - try { - Method method = telephonyManager.getClass().getMethod("getNai", int.class); - Method getSlotId = SubscriptionManager.class.getMethod("getSlotId", int.class); - nai = (String) method.invoke(telephonyManager, getSlotId.invoke(null, subId)); - } catch (Exception e) { - nai = SystemPropertiesProxy.get(context, "persist.radio.cdma.nai"); - } } Timber.v("MmsConfig.getNai: nai=" + nai); diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java index 1f1aca0a..a95170df 100755 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java +++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java @@ -73,24 +73,19 @@ public class MmsConfigManager { public void init(final Context context) { mContext = context; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - mSubscriptionManager = SubscriptionManager.from(context); + mSubscriptionManager = SubscriptionManager.from(context); - // TODO: When this object "finishes" we should unregister. - IntentFilter intentFilterLoaded = - new IntentFilter("LOADED"); + // TODO: When this object "finishes" we should unregister. + IntentFilter intentFilterLoaded = new IntentFilter("LOADED"); - try { - context.registerReceiver(mReceiver, intentFilterLoaded); - } catch (Exception e) { + try { + context.registerReceiver(mReceiver, intentFilterLoaded); + } catch (Exception e) { - } - - load(context); - } else { - load(context); } + load(context); + // TODO: When this object "finishes" we should unregister by invoking // SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener); // This is not strictly necessary because it will be unregistered if the @@ -151,39 +146,37 @@ public class MmsConfigManager { * */ private void load(Context context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - List subs = mSubscriptionManager.getActiveSubscriptionInfoList(); - if (subs == null || subs.size() < 1) { - Timber.e("MmsConfigManager.load -- empty getActiveSubInfoList"); - return; - } - // Load all the mms_config.xml files in a separate map and then swap with the - // real map at the end so we don't block anyone sync'd on the real map. - final Map newConfigMap = new ArrayMap(); - for (SubscriptionInfo sub : subs) { - Configuration configuration = new Configuration(); - if (sub.getMcc() == 0 && sub.getMnc() == 0) { - Configuration config = mContext.getResources().getConfiguration(); - configuration.mcc = config.mcc; - configuration.mnc = config.mnc; - Timber.i("MmsConfigManager.load -- no mcc/mnc for sub: " + sub + - " using mcc/mnc from main context: " + configuration.mcc + "/" + - configuration.mnc); - } else { - Timber.i("MmsConfigManager.load -- mcc/mnc for sub: " + sub); + List subs = mSubscriptionManager.getActiveSubscriptionInfoList(); + if (subs == null || subs.size() < 1) { + Timber.e("MmsConfigManager.load -- empty getActiveSubInfoList"); + return; + } + // Load all the mms_config.xml files in a separate map and then swap with the + // real map at the end so we don't block anyone sync'd on the real map. + final Map newConfigMap = new ArrayMap(); + for (SubscriptionInfo sub : subs) { + Configuration configuration = new Configuration(); + if (sub.getMcc() == 0 && sub.getMnc() == 0) { + Configuration config = mContext.getResources().getConfiguration(); + configuration.mcc = config.mcc; + configuration.mnc = config.mnc; + Timber.i("MmsConfigManager.load -- no mcc/mnc for sub: " + sub + + " using mcc/mnc from main context: " + configuration.mcc + "/" + + configuration.mnc); + } else { + Timber.i("MmsConfigManager.load -- mcc/mnc for sub: " + sub); - configuration.mcc = sub.getMcc(); - configuration.mnc = sub.getMnc(); - } - Context subContext = context.createConfigurationContext(configuration); + configuration.mcc = sub.getMcc(); + configuration.mnc = sub.getMnc(); + } + Context subContext = context.createConfigurationContext(configuration); - int subId = sub.getSubscriptionId(); - newConfigMap.put(subId, new MmsConfig(subContext, subId)); - } - synchronized (mSubIdConfigMap) { - mSubIdConfigMap.clear(); - mSubIdConfigMap.putAll(newConfigMap); - } + int subId = sub.getSubscriptionId(); + newConfigMap.put(subId, new MmsConfig(subContext, subId)); + } + synchronized (mSubIdConfigMap) { + mSubIdConfigMap.clear(); + mSubIdConfigMap.putAll(newConfigMap); } } diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java index ce3fe460..e3092499 100755 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java +++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java @@ -87,18 +87,11 @@ public class MmsNetworkManager implements com.squareup.okhttp.internal.Network { mSubId = subId; if (!MmsRequest.useWifi(context)) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - mNetworkRequest = new NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) - .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS) - .setNetworkSpecifier(Integer.toString(mSubId)) - .build(); - } else { - mNetworkRequest = new NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) - .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS) - .build(); - } + mNetworkRequest = new NetworkRequest.Builder() + .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) + .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS) + .setNetworkSpecifier(Integer.toString(mSubId)) + .build(); } else { mNetworkRequest = new NetworkRequest.Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java index 7ba80c07..2328d347 100755 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java +++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java @@ -16,32 +16,19 @@ package com.android.mms.service_alt; -import android.app.Activity; -import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; -import android.net.wifi.WifiManager; -import android.os.Build; import android.os.Bundle; -import android.provider.Settings; -import android.service.carrier.CarrierMessagingService; -import android.telephony.SmsManager; -import android.telephony.TelephonyManager; -import com.android.mms.service_alt.exception.ApnException; -import com.android.mms.service_alt.exception.MmsHttpException; + import com.klinker.android.send_message.Utils; -import timber.log.Timber; /** * Base class for MMS requests. This has the common logic of sending/downloading MMS. */ public abstract class MmsRequest { - private static final int RETRY_TIMES = 3; - /** * Interface for certain functionalities from MmsService */ @@ -86,8 +73,6 @@ public abstract class MmsRequest { // MMS config overrides protected Bundle mMmsConfigOverrides; - private boolean mobileDataEnabled; - public MmsRequest(RequestManager requestManager, int subId, String creator, Bundle configOverrides) { mRequestManager = requestManager; @@ -101,192 +86,6 @@ public abstract class MmsRequest { return mSubId; } - private boolean ensureMmsConfigLoaded() { - if (mMmsConfig == null) { - final MmsConfig config; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - // Not yet retrieved from mms config manager. Try getting it. - config = MmsConfigManager.getInstance().getMmsConfigBySubId(mSubId); - } else { - config = MmsConfigManager.getInstance().getMmsConfig(); - } - - if (config != null) { - mMmsConfig = new MmsConfig.Overridden(config, mMmsConfigOverrides); - } - } - return mMmsConfig != null; - } - - private static boolean inAirplaneMode(final Context context) { - return Settings.System.getInt(context.getContentResolver(), - Settings.Global.AIRPLANE_MODE_ON, 0) != 0; - } - - private static boolean isMobileDataEnabled(final Context context, final int subId) { - final TelephonyManager telephonyManager = - (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - return Utils.isDataEnabled(telephonyManager, subId); - } - - private static boolean isDataNetworkAvailable(final Context context, final int subId) { - return !inAirplaneMode(context) && isMobileDataEnabled(context, subId); - } - - /** - * Execute the request - * - * @param context The context - * @param networkManager The network manager to use - */ - public void execute(Context context, MmsNetworkManager networkManager) { - int result = SmsManager.MMS_ERROR_UNSPECIFIED; - int httpStatusCode = 0; - byte[] response = null; - - WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - boolean isWifiEnabled = wifi.isWifiEnabled(); - - if (!useWifi(context)) { - wifi.setWifiEnabled(false); - } - - mobileDataEnabled = Utils.isMobileDataEnabled(context); - Timber.v("mobile data enabled: " + mobileDataEnabled); - - if (!mobileDataEnabled && !useWifi(context)) { - Timber.v("mobile data not enabled, so forcing it to enable"); - Utils.setMobileDataEnabled(context, true); - } - - if (!ensureMmsConfigLoaded()) { // Check mms config - Timber.e("MmsRequest: mms config is not loaded yet"); - result = SmsManager.MMS_ERROR_CONFIGURATION_ERROR; - } else if (!prepareForHttpRequest()) { // Prepare request, like reading pdu data from user - Timber.e("MmsRequest: failed to prepare for request"); - result = SmsManager.MMS_ERROR_IO_ERROR; - } else if (!isDataNetworkAvailable(context, mSubId)) { - Timber.e("MmsRequest: in airplane mode or mobile data disabled"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - result = SmsManager.MMS_ERROR_NO_DATA_NETWORK; - } else { - result = 8; - } - } else { // Execute - long retryDelaySecs = 2; - // Try multiple times of MMS HTTP request - for (int i = 0; i < RETRY_TIMES; i++) { - try { - try { - networkManager.acquireNetwork(); - } catch (Exception e) { - Timber.e(e, "error acquiring network"); - } - - final String apnName = networkManager.getApnName(); - try { - ApnSettings apn = null; - try { - apn = ApnSettings.load(context, apnName, mSubId); - } catch (ApnException e) { - // If no APN could be found, fall back to trying without the APN name - if (apnName == null) { - // If the APN name was already null then don't need to retry - throw (e); - } - Timber.i("MmsRequest: No match with APN name:" - + apnName + ", try with no name"); - apn = ApnSettings.load(context, null, mSubId); - } - Timber.i("MmsRequest: using " + apn.toString()); - response = doHttp(context, networkManager, apn); - result = Activity.RESULT_OK; - // Success - break; - } finally { - networkManager.releaseNetwork(); - } - } catch (ApnException e) { - Timber.e(e, "MmsRequest: APN failure"); - result = SmsManager.MMS_ERROR_INVALID_APN; - break; -// } catch (MmsNetworkException e) { -// Timber.e(e, "MmsRequest: MMS network acquiring failure"); -// result = SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS; -// // Retry - } catch (MmsHttpException e) { - Timber.e(e, "MmsRequest: HTTP or network I/O failure"); - result = SmsManager.MMS_ERROR_HTTP_FAILURE; - httpStatusCode = e.getStatusCode(); - // Retry - } catch (Exception e) { - Timber.e(e, "MmsRequest: unexpected failure"); - result = SmsManager.MMS_ERROR_UNSPECIFIED; - break; - } - try { - Thread.sleep(retryDelaySecs * 1000, 0/*nano*/); - } catch (InterruptedException e) { - } - retryDelaySecs <<= 1; - } - } - - if (!mobileDataEnabled) { - Timber.v("setting mobile data back to disabled"); - Utils.setMobileDataEnabled(context, false); - } - - if (!useWifi(context)) { - wifi.setWifiEnabled(isWifiEnabled); - } - - processResult(context, result, response, httpStatusCode); - } - - /** - * Process the result of the completed request, including updating the message status - * in database and sending back the result via pending intents. - * @param context The context - * @param result The result code of execution - * @param response The response body - * @param httpStatusCode The optional http status code in case of http failure - */ - public void processResult(Context context, int result, byte[] response, int httpStatusCode) { - final Uri messageUri = persistIfRequired(context, result, response); - - // Return MMS HTTP request result via PendingIntent - final PendingIntent pendingIntent = getPendingIntent(); - if (pendingIntent != null) { - boolean succeeded = true; - // Extra information to send back with the pending intent - Intent fillIn = new Intent(); - if (response != null) { - succeeded = transferResponse(fillIn, response); - } - if (messageUri != null) { - fillIn.putExtra("uri", messageUri.toString()); - } - if (result == SmsManager.MMS_ERROR_HTTP_FAILURE && httpStatusCode != 0) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - fillIn.putExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, httpStatusCode); - } else { - fillIn.putExtra("android.telephony.extra.MMS_HTTP_STATUS", httpStatusCode); - } - } - try { - if (!succeeded) { - result = SmsManager.MMS_ERROR_IO_ERROR; - } - pendingIntent.send(context, result, fillIn); - } catch (PendingIntent.CanceledException e) { - Timber.e(e, "MmsRequest: sending pending intent canceled"); - } - } - - revokeUriPermission(context); - } - /** * are we set up to use wifi? if so, send mms over it. */ @@ -303,90 +102,4 @@ public abstract class MmsRequest { return false; } - /** - * Returns true if sending / downloading using the carrier app has failed and completes the - * action using platform API's, otherwise false. - */ - protected boolean maybeFallbackToRegularDelivery(int carrierMessagingAppResult) { - if (carrierMessagingAppResult - == CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK - || carrierMessagingAppResult - == CarrierMessagingService.DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK) { - Timber.d("Sending/downloading MMS by IP failed."); - mRequestManager.addSimRequest(MmsRequest.this); - return true; - } else { - return false; - } - } - - /** - * Converts from {@code carrierMessagingAppResult} to a platform result code. - */ - protected static int toSmsManagerResult(int carrierMessagingAppResult) { - switch (carrierMessagingAppResult) { - case CarrierMessagingService.SEND_STATUS_OK: - return Activity.RESULT_OK; - case CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK: - return SmsManager.MMS_ERROR_RETRY; - default: - return SmsManager.MMS_ERROR_UNSPECIFIED; - } - } - - /** - * Making the HTTP request to MMSC - * - * @param context The context - * @param netMgr The current {@link MmsNetworkManager} - * @param apn The APN setting - * @return The HTTP response data - * @throws MmsHttpException If any network error happens - */ - protected abstract byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn) - throws MmsHttpException; - - /** - * @return The PendingIntent associate with the MMS sending invocation - */ - protected abstract PendingIntent getPendingIntent(); - - /** - * @return The queue should be used by this request, 0 is sending and 1 is downloading - */ - protected abstract int getQueueType(); - - /** - * Persist message into telephony if required (i.e. when auto-persisting is on or - * the calling app is non-default sms app for sending) - * - * @param context The context - * @param result The result code of execution - * @param response The response body - * @return The persisted URI of the message or null if we don't persist or fail - */ - protected abstract Uri persistIfRequired(Context context, int result, byte[] response); - - /** - * Prepare to make the HTTP request - will download message for sending - * @return true if preparation succeeds (and request can proceed) else false - */ - protected abstract boolean prepareForHttpRequest(); - - /** - * Transfer the received response to the caller - * - * @param fillIn the intent that will be returned to the caller - * @param response the pdu to transfer - * @return true if response transfer succeeds else false - */ - protected abstract boolean transferResponse(Intent fillIn, byte[] response); - - /** - * Revoke the content URI permission granted by the MMS app to the phone package. - * - * @param context The context - */ - protected abstract void revokeUriPermission(Context context); - } diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java b/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java index afff0de0..611b9509 100755 --- a/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java +++ b/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java @@ -16,21 +16,19 @@ class SubscriptionIdChecker { // I met a device which does not have Telephony.Mms.SUBSCRIPTION_ID event if it's API Level is 22. private void check(Context context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - Cursor c = null; - try { - c = SqliteWrapper.query(context, context.getContentResolver(), - Telephony.Mms.CONTENT_URI, - new String[]{Telephony.Mms.SUBSCRIPTION_ID}, null, null, null); - if (c != null) { - mCanUseSubscriptionId = true; - } - } catch (SQLiteException e) { - Timber.e("SubscriptionIdChecker.check() fail"); - } finally { - if (c != null) { - c.close(); - } + Cursor c = null; + try { + c = SqliteWrapper.query(context, context.getContentResolver(), + Telephony.Mms.CONTENT_URI, + new String[]{Telephony.Mms.SUBSCRIPTION_ID}, null, null, null); + if (c != null) { + mCanUseSubscriptionId = true; + } + } catch (SQLiteException e) { + Timber.e("SubscriptionIdChecker.check() fail"); + } finally { + if (c != null) { + c.close(); } } } diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java b/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java index 698817ca..a8f6de5f 100755 --- a/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java +++ b/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java @@ -73,7 +73,7 @@ public class DownloadManager { download.putExtra(MmsReceivedReceiver.EXTRA_TRIGGER_PUSH, byPush); download.putExtra(MmsReceivedReceiver.EXTRA_URI, uri); final PendingIntent pendingIntent = PendingIntent.getBroadcast( - context, 0, download, PendingIntent.FLAG_CANCEL_CURRENT); + context, 0, download, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); final SmsManager smsManager = SmsManagerFactory.INSTANCE.createSmsManager(subscriptionId); Bundle configOverrides = new Bundle(); diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java b/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java index 4de1c9b8..238d5ef8 100755 --- a/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java +++ b/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java @@ -124,11 +124,6 @@ public class RetrieveTransaction extends Transaction implements Runnable { } public void run() { -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { -// DownloadRequest request = new DownloadRequest(mContentLocation, mUri, null, null, null); -// MmsNetworkManager manager = new MmsNetworkManager(mContext); -// request.execute(mContext, manager); -// } else { try { // Change the downloading state of the M-Notification.ind. DownloadManager.init(mContext.getApplicationContext()); diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java b/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java index 45558181..414f14e7 100755 --- a/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java +++ b/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java @@ -309,7 +309,7 @@ public class RetryScheduler implements Observer { Intent service = new Intent(TransactionService.ACTION_ONALARM, null, context, TransactionService.class); PendingIntent operation = PendingIntent.getService( - context, 0, service, PendingIntent.FLAG_ONE_SHOT); + context, 0, service, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE); AlarmManager am = (AlarmManager) context.getSystemService( Context.ALARM_SERVICE); am.set(AlarmManager.RTC, retryAt, operation); diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java index 78146c9e..299740a3 100755 --- a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java +++ b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java @@ -197,33 +197,6 @@ public class TransactionService extends Service implements Observer { @Override public int onStartCommand(final Intent intent, int flags, int startId) { if (intent != null) { -// if (intent.getBooleanExtra(TransactionBundle.LOLLIPOP_RECEIVING, false)) { -// lollipopReceiving = true; -// new Thread(new Runnable() { -// @Override -// public void run() { -// Timber.v("starting receiving with new lollipop method"); -// try { Thread.sleep(60000); } catch (Exception e) { } -// Timber.v("done sleeping, lets try and grab the message"); -// Uri contentUri = Uri.parse(intent.getStringExtra(TransactionBundle.URI)); -// String downloadLocation = null; -// Cursor locationQuery = getContentResolver().query(contentUri, new String[]{Telephony.Mms.CONTENT_LOCATION, Telephony.Mms._ID}, null, null, "date desc"); -// -// if (locationQuery != null && locationQuery.moveToFirst()) { -// Timber.v("grabbing content location url"); -// downloadLocation = locationQuery.getString(locationQuery.getColumnIndex(Telephony.Mms.CONTENT_LOCATION)); -// } -// -// Timber.v("creating request with url: " + downloadLocation); -// DownloadRequest request = new DownloadRequest(downloadLocation, contentUri, null, null, null); -// MmsNetworkManager manager = new MmsNetworkManager(TransactionService.this); -// request.execute(TransactionService.this, manager); -// stopSelf(); -// } -// }).start(); -// return START_NOT_STICKY; -// } - if (mServiceHandler == null) { initServiceHandler(); } @@ -539,11 +512,6 @@ public class TransactionService extends Service implements Observer { // cancel timer for renewal of lease mServiceHandler.removeMessages(EVENT_CONTINUE_MMS_CONNECTIVITY); - if (mConnMgr != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - mConnMgr.stopUsingNetworkFeature( - ConnectivityManager.TYPE_MOBILE, - "enableMMS"); - } } finally { releaseWakeLock(); } diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java index 242fb417..9490215c 100755 --- a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java +++ b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java @@ -35,17 +35,6 @@ public class TransactionSettings { private String mProxyAddress; private int mProxyPort = -1; - private static final String[] APN_PROJECTION = { - Telephony.Carriers.TYPE, // 0 - Telephony.Carriers.MMSC, // 1 - Telephony.Carriers.MMSPROXY, // 2 - Telephony.Carriers.MMSPORT // 3 - }; - private static final int COLUMN_TYPE = 0; - private static final int COLUMN_MMSC = 1; - private static final int COLUMN_MMSPROXY = 2; - private static final int COLUMN_MMSPORT = 3; - /** * Constructor that uses the default settings of the MMS Client. * @@ -53,29 +42,6 @@ public class TransactionSettings { */ public TransactionSettings(Context context, String apnName) { Timber.v("TransactionSettings: apnName: " + apnName); -// String selection = "current" + " IS NOT NULL"; -// String[] selectionArgs = null; -// if (!TextUtils.isEmpty(apnName)) { -// selection += " AND " + "apn" + "=?"; -// selectionArgs = new String[]{ apnName.trim() }; -// } -// -// Cursor cursor; -// -// try { -// cursor = SqliteWrapper.query(context, context.getContentResolver(), -// Telephony.Carriers.CONTENT_URI, -// APN_PROJECTION, selection, selectionArgs, null); -// -// Timber.v("TransactionSettings looking for apn: " + selection + " returned: " + -// (cursor == null ? "null cursor" : (cursor.getCount() + " hits"))); -// } catch (SecurityException e) { -// Timber.e(e, "exception thrown"); -// cursor = null; -// } -// -// if (cursor == null) { -// Timber.e("Apn is not found in Database!"); if (Transaction.Companion.getSettings() == null) { Transaction.Companion.setSettings(Utils.getDefaultSendSettings(context)); } @@ -109,46 +75,6 @@ public class TransactionSettings { Timber.e(e, "could not get proxy: " + Transaction.Companion.getSettings().getPort()); } } -// } - -// boolean sawValidApn = false; -// try { -// while (cursor.moveToNext() && TextUtils.isEmpty(mServiceCenter)) { -// // Read values from APN settings -// if (isValidApnType(cursor.getString(COLUMN_TYPE), "mms")) { -// sawValidApn = true; -// -// String mmsc = cursor.getString(COLUMN_MMSC); -// if (mmsc == null) { -// continue; -// } -// -// mServiceCenter = NetworkUtils.trimV4AddrZeros(mmsc.trim()); -// mProxyAddress = NetworkUtils.trimV4AddrZeros( -// cursor.getString(COLUMN_MMSPROXY)); -// if (isProxySet()) { -// String portString = cursor.getString(COLUMN_MMSPORT); -// try { -// mProxyPort = Integer.parseInt(portString); -// } catch (NumberFormatException e) { -// if (TextUtils.isEmpty(portString)) { -// Timber.w("mms port not set!"); -// } else { -// Timber.e(e, "Bad port number format: " + portString); -// } -// } -// } -// } -// } -// } finally { -// cursor.close(); -// } -// -// Timber.v("APN setting: MMSC: " + mServiceCenter + " looked for: " + selection); -// -// if (sawValidApn && TextUtils.isEmpty(mServiceCenter)) { -// Timber.e("Invalid APN setting: MMSC is empty"); -// } } /** @@ -186,17 +112,4 @@ public class TransactionSettings { return (mProxyAddress != null) && (mProxyAddress.trim().length() != 0); } - static private boolean isValidApnType(String types, String requestType) { - // If APN type is unspecified, assume APN_TYPE_ALL. - if (TextUtils.isEmpty(types)) { - return true; - } - - for (String t : types.split(",")) { - if (t.equals(requestType) || t.equals("*")) { - return true; - } - } - return false; - } } diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java index 07bcb551..10ea303e 100755 --- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java +++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java @@ -1604,8 +1604,6 @@ public class PduPersister { * Check if read permissions for SMS have been granted */ private boolean checkReadSmsPermissions() { - return Build.VERSION.SDK_INT < Build.VERSION_CODES.M || - mContext.checkSelfPermission(Manifest.permission.READ_SMS) == - PackageManager.PERMISSION_GRANTED; + return mContext.checkSelfPermission(Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED; } } diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt index 10d078e4..2f239384 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt @@ -1,6 +1,5 @@ package com.klinker.android.send_message -import android.os.Build import android.telephony.SmsManager object SmsManagerFactory { @@ -8,7 +7,7 @@ object SmsManagerFactory { fun createSmsManager(subscriptionId: Int): SmsManager { var manager: SmsManager? = null - if (subscriptionId != -1 && Build.VERSION.SDK_INT >= 22) { + if (subscriptionId != -1) { try { manager = SmsManager.getSmsManagerForSubscriptionId(subscriptionId) } catch (e: Exception) { diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt index e7169cbe..2650c67d 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt @@ -101,7 +101,7 @@ class Transaction @JvmOverloads constructor(private val context: Context, settin sentIntent.putExtra(EXTRA_CONTENT_URI, messageUri.toString()) sentIntent.putExtra(EXTRA_FILE_PATH, sendFile.path) - val sentPI = PendingIntent.getBroadcast(context, 0, sentIntent, PendingIntent.FLAG_CANCEL_CURRENT) + val sentPI = PendingIntent.getBroadcast(context, 0, sentIntent, PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE) val updatedIntent = Intent(MMS_UPDATED).putExtra("uri", messageUri.toString()) BroadcastUtils.addClassName(context, updatedIntent, MMS_UPDATED) diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java index 2fc44693..5851cd8f 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java @@ -59,14 +59,9 @@ public class Utils { } public static T ensureRouteToMmsNetwork(Context context, String url, String proxy, Task task) throws IOException { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - return ensureRouteToMmsNetworkMarshmallow(context, task); - } else { - return ensureRouteToMmsNetworkLollipop(context, task); - } + return ensureRouteToMmsNetworkMarshmallow(context, task); } - @TargetApi(Build.VERSION_CODES.M) private static T ensureRouteToMmsNetworkMarshmallow(Context context, Task task) throws IOException { final MmsNetworkManager networkManager = new MmsNetworkManager(context.getApplicationContext(), Utils.getDefaultSubscriptionId()); final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); @@ -85,24 +80,6 @@ public class Utils { } } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - private static T ensureRouteToMmsNetworkLollipop(Context context, Task task) throws IOException { - final MmsNetworkManager networkManager = new MmsNetworkManager(context.getApplicationContext(), Utils.getDefaultSubscriptionId()); - Network network = null; - try { - network = networkManager.acquireNetwork(); - ConnectivityManager.setProcessDefaultNetwork(network); - return task.run(); - } catch (MmsNetworkException e) { - throw new IOException(e); - } finally { - if (network != null) { - ConnectivityManager.setProcessDefaultNetwork(null); - } - networkManager.releaseNetwork(); - } - } - /** * Ensures that the host MMSC is reachable * @@ -296,18 +273,6 @@ public class Utils { //throw new IllegalArgumentException("Unable to find or allocate a thread ID."); } - public static boolean doesThreadIdExist(Context context, long threadId) { - Uri uri = Uri.parse("content://mms-sms/conversations/" + threadId + "/"); - - Cursor cursor = context.getContentResolver().query(uri, new String[] {"_id"}, null, null, null); - if (cursor != null && cursor.moveToFirst()) { - cursor.close(); - return true; - } else { - return false; - } - } - private static boolean isEmailAddress(String address) { if (TextUtils.isEmpty(address)) { return false; @@ -381,10 +346,6 @@ public class Utils { } public static int getDefaultSubscriptionId() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - return SmsManager.getDefaultSmsSubscriptionId(); - } else { - return DEFAULT_SUBSCRIPTION_ID; - } + return SmsManager.getDefaultSmsSubscriptionId(); } } diff --git a/build.gradle b/build.gradle index f7a1e2c8..3930dfb9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.androidx_appcompat_version = '1.1.0' + ext.androidx_appcompat_version = '1.3.1' ext.androidx_constraintlayout_version = '1.1.3' ext.androidx_core_version = '1.1.0' + ext.androidx_documentfile_version = '1.0.1' ext.androidx_emoji_version = '1.0.0' ext.androidx_exifinterface_version = '1.0.0' ext.androidx_testrunner_version = '1.1.0-alpha3' ext.androidx_viewpager_version = '1.0.0-beta05' ext.autodispose_version = '1.3.0' - ext.billing_version = '3.0.2' + ext.billing_version = '5.1.0' ext.conductor_version = '2.1.5' ext.coroutines_version = '1.4.3' ext.dagger_version = "2.16" @@ -17,13 +18,13 @@ buildscript { ext.exoplayer_version = "2.8.1" ext.glide_version = "4.8.0" ext.junit_version = '4.12' - ext.kotlin_version = '1.3.60' + ext.kotlin_version = '1.7.20' ext.lifecycle_version = '2.1.0' ext.material_version = '1.0.0' ext.mockito_version = '2.18.3' ext.moshi_version = '1.8.0' - ext.okhttp3_version = '4.1.0' - ext.realm_version = '5.8.0' + ext.okhttp3_version = '4.10.0' + ext.realm_version = '10.13.0' ext.realm_adapters_version = '3.1.0' ext.rxandroid_version = '2.0.1' ext.rxdogtag_version = '0.2.0' @@ -42,9 +43,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' + classpath 'com.google.gms:google-services:4.3.14' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:$realm_version" } diff --git a/common/build.gradle b/common/build.gradle index a893d1c1..21a56b45 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -20,14 +20,15 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 + compileSdkVersion 33 defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion 23 + targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + namespace 'com.moez.QKSMS.common' } dependencies { diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index 969a751c..21edd1fd 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -16,4 +16,4 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt b/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt index c8fa84bd..9f88e83a 100644 --- a/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt +++ b/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt @@ -42,28 +42,7 @@ object TelephonyCompat { } fun getOrCreateThreadId(context: Context, recipients: Collection): Long { - return if (Build.VERSION.SDK_INT >= 23) { - Telephony.Threads.getOrCreateThreadId(context, recipients.toSet()) - } else { - val uriBuilder = THREAD_ID_CONTENT_URI.buildUpon() - - recipients - .map { recipient -> if (isEmailAddress(recipient)) extractAddrSpec(recipient) else recipient } - .forEach { recipient -> uriBuilder.appendQueryParameter("recipient", recipient) } - - val uri = uriBuilder.build() - - SqliteWrapper.query(context, context.contentResolver, uri, ID_PROJECTION, null, null, null)?.use { cursor -> - if (cursor.moveToFirst()) { - return cursor.getLong(0) - } else { - Timber.e("getOrCreateThreadId returned no rows!") - } - } - - Timber.e("getOrCreateThreadId failed with " + recipients.size + " recipients") - throw IllegalArgumentException("Unable to find or allocate a thread ID.") - } + return Telephony.Threads.getOrCreateThreadId(context, recipients.toSet()) } fun extractAddrSpec(address: String): String { diff --git a/data/build.gradle b/data/build.gradle index a76aff2b..ee9114cd 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 + compileSdkVersion 33 publishNonDefault true flavorDimensions "analytics" @@ -31,8 +31,8 @@ android { } defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion 23 + targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" @@ -42,6 +42,7 @@ android { withAnalytics { dimension "analytics" } noAnalytics { dimension "analytics" } } + namespace 'com.moez.QKSMS.data' } dependencies { @@ -50,6 +51,7 @@ dependencies { implementation "androidx.appcompat:appcompat:$androidx_appcompat_version" implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.exifinterface:exifinterface:$androidx_exifinterface_version" + implementation "androidx.documentfile:documentfile:$androidx_documentfile_version" // glide implementation "com.github.bumptech.glide:glide:$glide_version" diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml index 3c6184a7..21edd1fd 100644 --- a/data/src/main/AndroidManifest.xml +++ b/data/src/main/AndroidManifest.xml @@ -16,4 +16,4 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/data/src/main/assets/changelog.json b/data/src/main/assets/changelog.json index c4d2e917..8485028b 100644 --- a/data/src/main/assets/changelog.json +++ b/data/src/main/assets/changelog.json @@ -1,4 +1,26 @@ [ + { + "versionCode": "2220", + "versionName": "3.10.1", + "fixed": [ + "Crash when launching the app" + ] + }, + { + "versionCode": "2219", + "versionName": "3.10.0", + "added": [ + "Support for Call Blocker (blocking manager)" + ], + "improved": [ + "Support for Scoped Storage" + ], + "fixed": [ + "Incorrect handling of shared text that contains a comma", + "Crash in billing flow", + "Crash when viewing VCard attachment with no name" + ] + }, { "versionCode": "2218", "versionName": "3.9.4", diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt index f6674e4c..c18561b9 100644 --- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt @@ -22,7 +22,6 @@ import android.annotation.TargetApi import android.os.Build import android.telephony.SubscriptionInfo -@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1) data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) { val subscriptionId get() = subscriptionInfo.subscriptionId diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt index fb6174ff..4a2e4a2b 100644 --- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt @@ -31,36 +31,29 @@ class SubscriptionManagerCompat @Inject constructor(context: Context, private va val activeSubscriptionInfoList: List get() { - return if (Build.VERSION.SDK_INT >= 22) { - subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf() - } else listOf() + return subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf() } init { - subscriptionManager = if (Build.VERSION.SDK_INT >= 22) SubscriptionManager.from(context) else null + subscriptionManager = SubscriptionManager.from(context) } fun addOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) { - if (Build.VERSION.SDK_INT >= 22) { - subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener) - } + subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener) } fun removeOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) { - if (Build.VERSION.SDK_INT >= 22) { - subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener) - } + subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener) } abstract class OnSubscriptionsChangedListener { - val listener: SubscriptionManager.OnSubscriptionsChangedListener? = if (Build.VERSION.SDK_INT >= 22) { + val listener: SubscriptionManager.OnSubscriptionsChangedListener? = object : SubscriptionManager.OnSubscriptionsChangedListener() { override fun onSubscriptionsChanged() { this@OnSubscriptionsChangedListener.onSubscriptionsChanged() } } - } else null abstract fun onSubscriptionsChanged() diff --git a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt index 526d5d0a..1d928042 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt @@ -29,16 +29,12 @@ class AlarmManagerImpl @Inject constructor(private val context: Context) : Alarm override fun getScheduledMessageIntent(id: Long): PendingIntent { val intent = Intent(context, SendScheduledMessageReceiver::class.java).putExtra("id", id) - return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) + return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) } override fun setAlarm(date: Long, intent: PendingIntent) { val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as android.app.AlarmManager - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - alarmManager.setExactAndAllowWhileIdle(android.app.AlarmManager.RTC_WAKEUP, date, intent) - } else { - alarmManager.setExact(android.app.AlarmManager.RTC_WAKEUP, date, intent) - } + alarmManager.setExactAndAllowWhileIdle(android.app.AlarmManager.RTC_WAKEUP, date, intent) } } \ No newline at end of file diff --git a/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt index 93620b69..93c3b1e1 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt @@ -19,6 +19,8 @@ package com.moez.QKSMS.manager import android.Manifest +import android.app.AlarmManager +import android.app.NotificationManager import android.app.role.RoleManager import android.content.Context import android.content.pm.PackageManager @@ -29,6 +31,8 @@ import javax.inject.Inject class PermissionManagerImpl @Inject constructor(private val context: Context) : PermissionManager { + private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + override fun isDefaultSms(): Boolean { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { context.getSystemService(RoleManager::class.java)?.isRoleHeld(RoleManager.ROLE_SMS) == true @@ -49,6 +53,13 @@ class PermissionManagerImpl @Inject constructor(private val context: Context) : return hasPermission(Manifest.permission.READ_CONTACTS) } + override fun hasNotifications(): Boolean { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + return true + } + return notificationManager.areNotificationsEnabled() + } + override fun hasPhone(): Boolean { return hasPermission(Manifest.permission.READ_PHONE_STATE) } @@ -61,6 +72,15 @@ class PermissionManagerImpl @Inject constructor(private val context: Context) : return hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) } + override fun hasExactAlarms(): Boolean { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { + return true + } + + val alarmManager = context.getSystemService(AlarmManager::class.java) + return alarmManager.canScheduleExactAlarms() + } + private fun hasPermission(permission: String): Boolean { return ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED } diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt index 7d5e1525..60fab4f2 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt @@ -34,7 +34,7 @@ class DeleteMessagesReceiver : BroadcastReceiver() { val pendingResult = goAsync() val threadId = intent.getLongExtra("threadId", 0) - val messageIds = intent.getLongArrayExtra("messageIds") + val messageIds = intent.getLongArrayExtra("messageIds") ?: longArrayOf() deleteMessages.execute(DeleteMessages.Params(messageIds.toList(), threadId)) { pendingResult.finish() } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index 9fff3db3..214dd20e 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -18,26 +18,27 @@ */ package com.moez.QKSMS.repository +import android.annotation.SuppressLint import android.content.Context +import android.content.Intent +import android.net.Uri import android.os.Environment import android.provider.Telephony import androidx.core.content.contentValuesOf +import androidx.core.net.toUri +import androidx.documentfile.provider.DocumentFile +import com.moez.QKSMS.common.util.extensions.now import com.moez.QKSMS.model.BackupFile import com.moez.QKSMS.model.Message import com.moez.QKSMS.util.Preferences -import com.moez.QKSMS.util.QkFileObserver -import com.moez.QKSMS.util.tryOrNull import com.squareup.moshi.Moshi import io.reactivex.Observable -import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.Realm import okio.buffer import okio.source import timber.log.Timber -import java.io.File -import java.io.FileOutputStream import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject @@ -52,10 +53,6 @@ class BackupRepositoryImpl @Inject constructor( private val syncRepo: SyncRepository ) : BackupRepository { - companion object { - private val BACKUP_DIRECTORY = Environment.getExternalStorageDirectory().toString() + "/QKSMS/Backups" - } - data class Backup( val messageCount: Int = 0, val messages: List = listOf() @@ -91,11 +88,35 @@ class BackupRepositoryImpl @Inject constructor( @Volatile private var stopFlag: Boolean = false + override fun getDefaultBackupPath(): String { + return "${Environment.getExternalStorageDirectory()}/QKSMS/Backups" + } + + override fun getBackupDocumentTree(): DocumentFile? { + return prefs.backupDirectory.get() + .takeIf { uri -> uri != Uri.EMPTY } + ?.let { uri -> DocumentFile.fromTreeUri(context, uri) } + ?.takeIf { dir -> dir.exists() && dir.canRead() && dir.canWrite() } + } + + override fun getBackupPathUriForPicker(): Uri { + return prefs.backupDirectory.get().takeIf { uri -> uri != Uri.EMPTY } + ?: getDefaultBackupPath().toUri() + } + + override fun persistBackupDirectory(directory: Uri) { + context.contentResolver.takePersistableUriPermission(directory, + Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) + prefs.backupDirectory.set(directory) + + Timber.v("Updated backup directory: $directory") + } + override fun performBackup() { // If a backup or restore is already running, don't do anything if (isBackupOrRestoreRunning()) return - var messageCount = 0 + var messageCount: Int // Map all the messages into our object we'll use for the Json mapping val backupMessages = Realm.getDefaultInstance().use { realm -> @@ -119,13 +140,15 @@ class BackupRepositoryImpl @Inject constructor( val json = adapter.toJson(Backup(messageCount, backupMessages)).toByteArray() try { - // Create the directory and file - val dir = File(BACKUP_DIRECTORY).apply { mkdirs() } - val timestamp = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(System.currentTimeMillis()) - val file = File(dir, "backup-$timestamp.json") + val timestamp = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(now()) + val inputStream = getBackupDocumentTree() + ?.createFile("application/json", "backup-$timestamp.json") + ?.let { file -> context.contentResolver.openOutputStream(file.uri) } + ?: throw Exception("Failed to open output stream") - // Write the log to the file - FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(json) } + inputStream.use { stream -> + stream.write(json) + } } catch (e: Exception) { Timber.w(e) } @@ -151,36 +174,34 @@ class BackupRepositoryImpl @Inject constructor( override fun getBackupProgress(): Observable = backupProgress - override fun getBackups(): Observable> = QkFileObserver(BACKUP_DIRECTORY).observable - .map { File(BACKUP_DIRECTORY).listFiles() ?: arrayOf() } - .subscribeOn(Schedulers.io()) - .observeOn(Schedulers.computation()) - .map { files -> - files.mapNotNull { file -> - val adapter = moshi.adapter(BackupMetadata::class.java) - val backup = tryOrNull(false) { - file.source().buffer().use(adapter::fromJson) - } ?: return@mapNotNull null + @SuppressLint("Recycle") // InputStream is closed by Okio BufferedSource + override fun parseBackup(uri: Uri): BackupFile { + val adapter = moshi.adapter(BackupMetadata::class.java) - val path = file.path - val date = file.lastModified() - val messages = backup.messageCount - val size = file.length() - BackupFile(path, date, messages, size) - } - } - .map { files -> files.sortedByDescending { file -> file.date } } + val file = DocumentFile.fromSingleUri(context, uri) + ?: throw IllegalArgumentException("Couldn't open backup file") - override fun performRestore(filePath: String) { + val metadata = context.contentResolver.openInputStream(file.uri) + ?.source() + ?.buffer() + ?.use(adapter::fromJson) + ?: throw IllegalArgumentException("Couldn't parse backup file") + + return BackupFile(file.lastModified(), metadata.messageCount) + } + + override fun performRestore(uri: Uri) { // If a backupFile or restore is already running, don't do anything if (isBackupOrRestoreRunning()) return restoreProgress.onNext(BackupRepository.Progress.Parsing()) - val file = File(filePath) - val backup = file.source().buffer().use { source -> - moshi.adapter(Backup::class.java).fromJson(source) - } + val adapter = moshi.adapter(Backup::class.java) + val backup = DocumentFile.fromSingleUri(context, uri) + ?.let { file -> context.contentResolver.openInputStream(file.uri) } + ?.source() + ?.buffer() + ?.use(adapter::fromJson) val messageCount = backup?.messages?.size ?: 0 var errorCount = 0 @@ -234,12 +255,12 @@ class BackupRepositoryImpl @Inject constructor( Timer().schedule(1000) { restoreProgress.onNext(BackupRepository.Progress.Idle()) } } + override fun getRestoreProgress(): Observable = restoreProgress + override fun stopRestore() { stopFlag = true } - override fun getRestoreProgress(): Observable = restoreProgress - private fun isBackupOrRestoreRunning(): Boolean { return backupProgress.blockingFirst().running || restoreProgress.blockingFirst().running } diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index a5438d34..14514832 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -26,8 +26,10 @@ import android.content.Context import android.content.Intent import android.graphics.BitmapFactory import android.media.MediaScannerConnection +import android.net.Uri import android.os.Build import android.os.Environment +import android.provider.MediaStore import android.provider.Telephony import android.provider.Telephony.Mms import android.provider.Telephony.Sms @@ -44,6 +46,8 @@ import com.klinker.android.send_message.Transaction import com.moez.QKSMS.common.util.extensions.now import com.moez.QKSMS.compat.TelephonyCompat import com.moez.QKSMS.extensions.anyOf +import com.moez.QKSMS.extensions.isImage +import com.moez.QKSMS.extensions.isVideo import com.moez.QKSMS.manager.ActiveConversationManager import com.moez.QKSMS.manager.KeyManager import com.moez.QKSMS.model.Attachment @@ -61,6 +65,8 @@ import io.realm.Case import io.realm.Realm import io.realm.RealmResults import io.realm.Sort +import okio.buffer +import okio.source import timber.log.Timber import java.io.File import java.io.FileNotFoundException @@ -167,36 +173,53 @@ class MessageRepositoryImpl @Inject constructor( .findAllAsync() } - override fun savePart(id: Long): File? { + override fun savePart(id: Long): Uri? { val part = getPart(id) ?: return null val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(part.type) ?: return null val date = part.messages?.first()?.date - val dir = File(Environment.getExternalStorageDirectory(), "QKSMS/Media").apply { mkdirs() } val fileName = part.name?.takeIf { name -> name.endsWith(extension) } ?: "${part.type.split("/").last()}_$date.$extension" - var file: File - var index = 0 - do { - file = File(dir, if (index == 0) fileName else fileName.replace(".$extension", " ($index).$extension")) - index++ - } while (file.exists()) - try { - FileOutputStream(file).use { outputStream -> + val values = contentValuesOf( + MediaStore.MediaColumns.DISPLAY_NAME to fileName, + MediaStore.MediaColumns.MIME_TYPE to part.type, + ) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + values.put(MediaStore.MediaColumns.IS_PENDING, 1) + values.put(MediaStore.MediaColumns.RELATIVE_PATH, when { + part.isImage() -> "${Environment.DIRECTORY_PICTURES}/QKSMS" + part.isVideo() -> "${Environment.DIRECTORY_MOVIES}/QKSMS" + else -> "${Environment.DIRECTORY_DOWNLOADS}/QKSMS" + }) + } + + val contentUri = when { + part.isImage() -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI + part.isVideo() -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI + Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> MediaStore.Downloads.EXTERNAL_CONTENT_URI + else -> MediaStore.Files.getContentUri("external") + } + val resolver = context.contentResolver + val uri = resolver.insert(contentUri, values) + Timber.v("Saving $fileName (${part.type}) to $uri") + + uri?.let { + resolver.openOutputStream(uri)?.use { outputStream -> context.contentResolver.openInputStream(part.getUri())?.use { inputStream -> inputStream.copyTo(outputStream, 1024) } } - } catch (e: FileNotFoundException) { - e.printStackTrace() - } catch (e: IOException) { - e.printStackTrace() + Timber.v("Saved $fileName (${part.type}) to $uri") + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + resolver.update(uri, contentValuesOf(MediaStore.MediaColumns.IS_PENDING to 0), null, null) + Timber.v("Marked $uri as not pending") + } } - MediaScannerConnection.scanFile(context, arrayOf(file.path), null, null) - - return file.takeIf { it.exists() } + return uri } /** @@ -328,11 +351,7 @@ class MessageRepositoryImpl @Inject constructor( val intent = getIntentForDelayedSms(message.id) val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, sendTime, intent) - } else { - alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent) - } + alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, sendTime, intent) } else { // No delay val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, now()) sendSms(message) @@ -445,13 +464,13 @@ class MessageRepositoryImpl @Inject constructor( val sentIntents = parts.map { val intent = Intent(context, SmsSentReceiver::class.java).putExtra("id", message.id) - PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) } val deliveredIntents = parts.map { val intent = Intent(context, SmsDeliveredReceiver::class.java).putExtra("id", message.id) val pendingIntent = PendingIntent - .getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) + .getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) if (prefs.delivery.get()) pendingIntent else null } @@ -495,7 +514,7 @@ class MessageRepositoryImpl @Inject constructor( private fun getIntentForDelayedSms(id: Long): PendingIntent { val intent = Intent(context, SendSmsReceiver::class.java).putExtra("id", id) - return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) + return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) } override fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message { diff --git a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt index 243bfb53..6cb00076 100644 --- a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt +++ b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt @@ -99,11 +99,11 @@ class NightModeManager @Inject constructor( private fun updateAlarms() { val dayCalendar = createCalendar(prefs.nightEnd.get()) val day = Intent(context, NightModeReceiver::class.java) - val dayIntent = PendingIntent.getBroadcast(context, 0, day, 0) + val dayIntent = PendingIntent.getBroadcast(context, 0, day, PendingIntent.FLAG_IMMUTABLE) val nightCalendar = createCalendar(prefs.nightStart.get()) val night = Intent(context, NightModeReceiver::class.java) - val nightIntent = PendingIntent.getBroadcast(context, 1, night, 0) + val nightIntent = PendingIntent.getBroadcast(context, 1, night, PendingIntent.FLAG_IMMUTABLE) context.sendBroadcast(day) context.sendBroadcast(night) diff --git a/domain/build.gradle b/domain/build.gradle index 85a69fd8..90a4cfe5 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 + compileSdkVersion 33 compileOptions { sourceCompatibility 1.8 @@ -31,12 +31,15 @@ android { } defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion 23 + targetSdkVersion 33 } + namespace 'com.moez.QKSMS.domain' } dependencies { + // androidx + implementation "androidx.documentfile:documentfile:$androidx_documentfile_version" // dagger implementation "com.google.dagger:dagger:$dagger_version" diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index 00485b51..21edd1fd 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -16,4 +16,4 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt index 03ef3ca1..2dfb6ce4 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt @@ -18,17 +18,18 @@ */ package com.moez.QKSMS.interactor +import android.net.Uri import com.moez.QKSMS.repository.BackupRepository import io.reactivex.Flowable import javax.inject.Inject class PerformRestore @Inject constructor( private val backupRepo: BackupRepository -) : Interactor() { +) : Interactor() { - override fun buildObservable(params: String): Flowable<*> { + override fun buildObservable(params: Uri): Flowable<*> { return Flowable.just(params) .doOnNext(backupRepo::performRestore) } -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt index 0fd6123a..f53ea5b4 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt @@ -28,10 +28,14 @@ interface PermissionManager { fun hasContacts(): Boolean + fun hasNotifications(): Boolean + fun hasPhone(): Boolean fun hasCalling(): Boolean fun hasStorage(): Boolean -} \ No newline at end of file + fun hasExactAlarms(): Boolean + +} diff --git a/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt b/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt index eca65921..5de80d21 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt @@ -19,8 +19,6 @@ package com.moez.QKSMS.model data class BackupFile( - val path: String, val date: Long, - val messages: Int, - val size: Long -) \ No newline at end of file + val messages: Int +) diff --git a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt index 7c73a731..57bc7695 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt @@ -18,6 +18,8 @@ */ package com.moez.QKSMS.repository +import android.net.Uri +import androidx.documentfile.provider.DocumentFile import com.moez.QKSMS.model.BackupFile import io.reactivex.Observable @@ -32,19 +34,24 @@ interface BackupRepository { class Finished : Progress(true, false) } + fun getDefaultBackupPath(): String + + fun getBackupDocumentTree(): DocumentFile? + + fun getBackupPathUriForPicker(): Uri + + fun persistBackupDirectory(directory: Uri) + fun performBackup() fun getBackupProgress(): Observable - /** - * Returns a list of all local backups - */ - fun getBackups(): Observable> + fun parseBackup(uri: Uri): BackupFile - fun performRestore(filePath: String) - - fun stopRestore() + fun performRestore(uri: Uri) fun getRestoreProgress(): Observable -} \ No newline at end of file + fun stopRestore() + +} diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index a3ef7c19..162f3266 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -18,6 +18,7 @@ */ package com.moez.QKSMS.repository +import android.net.Uri import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.model.Message import com.moez.QKSMS.model.MmsPart @@ -40,7 +41,7 @@ interface MessageRepository { fun getPartsForConversation(threadId: Long): RealmResults - fun savePart(id: Long): File? + fun savePart(id: Long): Uri? /** * Retrieves the list of messages which should be shown in the notification diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index d7711f3b..26bb39fe 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -20,6 +20,7 @@ package com.moez.QKSMS.util import android.content.Context import android.content.SharedPreferences +import android.net.Uri import android.os.Build import android.provider.Settings import com.f2prateek.rx.preferences2.Preference @@ -84,6 +85,8 @@ class Preferences @Inject constructor( val canUseSubId = rxPrefs.getBoolean("canUseSubId", true) val version = rxPrefs.getInteger("version", context.versionCode) val changelogVersion = rxPrefs.getInteger("changelogVersion", context.versionCode) + val hasAskedForNotificationPermission = rxPrefs.getBoolean("hasAskedForNotificationPermission", false) + val backupDirectory = rxPrefs.getObject("backupDirectory", Uri.EMPTY, UriPreferenceConverter()) @Deprecated("This should only be accessed when migrating to @blockingManager") val sia = rxPrefs.getBoolean("sia", false) diff --git a/domain/src/main/java/com/moez/QKSMS/util/UriPreferenceConverter.kt b/domain/src/main/java/com/moez/QKSMS/util/UriPreferenceConverter.kt new file mode 100644 index 00000000..34142595 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/util/UriPreferenceConverter.kt @@ -0,0 +1,16 @@ +package com.moez.QKSMS.util + +import android.net.Uri +import com.f2prateek.rx.preferences2.Preference.Converter + +class UriPreferenceConverter : Converter { + + override fun deserialize(serialized: String): Uri { + return Uri.parse(serialized) + } + + override fun serialize(value: Uri): String { + return value.toString() + } + +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b9cec46..345d3af5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 7dee8d3c..ea25a379 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -23,16 +23,15 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 33 flavorDimensions "analytics" defaultConfig { applicationId "com.moez.QKSMS" - minSdkVersion 21 - targetSdkVersion 29 - versionCode 2218 - versionName "3.9.4" + minSdkVersion 23 + targetSdkVersion 33 + versionCode 2220 + versionName "3.10.1" setProperty("archivesBaseName", "QKSMS-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -61,14 +60,15 @@ android { jvmTarget = "1.8" } - lintOptions { - abortOnError false - } productFlavors { withAnalytics { dimension "analytics" } noAnalytics { dimension "analytics" } } + lint { + abortOnError false + } + namespace 'com.moez.QKSMS' if (System.getenv("CI") == "true") { signingConfigs.release.storeFile = file("../keystore") diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 796dc6a3..6f6767e6 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -17,20 +17,21 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + + + @@ -48,6 +49,7 @@ @@ -59,6 +61,7 @@ @@ -118,12 +121,16 @@ - + - + @@ -131,6 +138,7 @@ @@ -138,6 +146,7 @@ @@ -161,13 +170,18 @@ - + + - + @@ -184,6 +198,7 @@ + @@ -201,8 +216,10 @@ + @@ -229,4 +246,12 @@ - \ No newline at end of file + + + + + + + + + diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index b0659c99..4a74630f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -260,27 +260,33 @@ class Navigator @Inject constructor( startActivityExternal(intent) } - fun viewFile(file: File) { - val data = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file) - val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.name.split(".").last()) + fun viewFile(uri: Uri, mimeType: String) { val intent = Intent(Intent.ACTION_VIEW) - .setDataAndType(data, type) + .setDataAndType(uri, mimeType.lowercase()) .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + .let { Intent.createChooser(it, null) } startActivityExternal(intent) } - fun shareFile(file: File) { - val data = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file) - val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.name.split(".").last()) + fun shareFile(uri: Uri, mimeType: String) { val intent = Intent(Intent.ACTION_SEND) - .setType(type) - .putExtra(Intent.EXTRA_STREAM, data) + .setType(mimeType.lowercase()) + .putExtra(Intent.EXTRA_STREAM, uri) .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + .let { Intent.createChooser(it, null) } startActivityExternal(intent) } + fun showPermissions() { + val intent = Intent() + intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS + intent.data = Uri.fromParts("package", context.packageName, null) + + startActivity(intent) + } + fun showNotificationSettings(threadId: Long = 0) { val intent = Intent(context, NotificationPrefsActivity::class.java) intent.putExtra("threadId", threadId) @@ -301,4 +307,12 @@ class Navigator @Inject constructor( } } + fun showExactAlarmsSettings() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + val intent = Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM) + .setData(Uri.parse("package:${context.packageName}")) + startActivity(intent) + } + } + } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index f94eb3d3..dbe9c85a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -57,6 +57,7 @@ import com.moez.QKSMS.util.GlideApp import com.moez.QKSMS.util.PhoneNumberUtils import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.tryOrNull +import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton @@ -94,6 +95,11 @@ class NotificationManagerImpl @Inject constructor( return } + if (!permissions.hasNotifications()) { + Timber.w("Cannot update notification because we don't have the notification permission") + return + } + val messages = messageRepo.getUnreadUnseenMessages(threadId) // If there are no messages to be displayed, make sure that the notification is dismissed @@ -114,11 +120,11 @@ class NotificationManagerImpl @Inject constructor( val taskStackBuilder = TaskStackBuilder.create(context) .addParentStack(ComposeActivity::class.java) .addNextIntent(contentIntent) - val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT) + val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId) val seenPI = PendingIntent.getBroadcast(context, threadId.toInt(), seenIntent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) // We can't store a null preference, so map it to a null Uri if the pref string is empty val ringtone = prefs.ringtone(threadId).get() @@ -233,7 +239,7 @@ class NotificationManagerImpl @Inject constructor( Preferences.NOTIFICATION_ACTION_ARCHIVE -> { val intent = Intent(context, MarkArchivedReceiver::class.java).putExtra("threadId", threadId) val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) NotificationCompat.Action.Builder(R.drawable.ic_archive_white_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_ARCHIVE).build() } @@ -244,7 +250,7 @@ class NotificationManagerImpl @Inject constructor( .putExtra("threadId", threadId) .putExtra("messageIds", messageIds) val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) NotificationCompat.Action.Builder(R.drawable.ic_delete_white_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_DELETE).build() } @@ -252,7 +258,7 @@ class NotificationManagerImpl @Inject constructor( Preferences.NOTIFICATION_ACTION_BLOCK -> { val intent = Intent(context, BlockThreadReceiver::class.java).putExtra("threadId", threadId) val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) NotificationCompat.Action.Builder(R.drawable.ic_block_white_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE).build() } @@ -260,7 +266,7 @@ class NotificationManagerImpl @Inject constructor( Preferences.NOTIFICATION_ACTION_READ -> { val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId) val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build() } @@ -271,7 +277,7 @@ class NotificationManagerImpl @Inject constructor( } else { val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId) val pi = PendingIntent.getActivity(context, threadId.toInt(), intent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) NotificationCompat.Action .Builder(R.drawable.ic_reply_white_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY).build() @@ -283,7 +289,7 @@ class NotificationManagerImpl @Inject constructor( val intentAction = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL val intent = Intent(intentAction, Uri.parse("tel:$address")) val pi = PendingIntent.getActivity(context, threadId.toInt(), intent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) NotificationCompat.Action.Builder(R.drawable.ic_call_white_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_CALL).build() } @@ -337,7 +343,7 @@ class NotificationManagerImpl @Inject constructor( val taskStackBuilder = TaskStackBuilder.create(context) .addParentStack(ComposeActivity::class.java) .addNextIntent(contentIntent) - val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT) + val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId)) .setContentTitle(context.getString(R.string.notification_message_failed_title)) @@ -357,7 +363,7 @@ class NotificationManagerImpl @Inject constructor( private fun getReplyAction(threadId: Long): NotificationCompat.Action { val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId) val replyPI = PendingIntent.getBroadcast(context, threadId.toInt(), replyIntent, - PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE) val title = context.resources.getStringArray(R.array.notification_actions)[ Preferences.NOTIFICATION_ACTION_REPLY] diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkActivityResultContracts.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkActivityResultContracts.kt new file mode 100644 index 00000000..f5018c5f --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/QkActivityResultContracts.kt @@ -0,0 +1,40 @@ +package com.moez.QKSMS.common.util + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.os.Build +import android.provider.DocumentsContract +import androidx.activity.result.contract.ActivityResultContract + +class QkActivityResultContracts { + + data class OpenDocumentParams( + val mimeTypes: List, + val initialUri: Uri? = null + ) + + class OpenDocument : ActivityResultContract() { + override fun createIntent(context: Context, input: OpenDocumentParams): Intent { + val intent = Intent(Intent.ACTION_OPEN_DOCUMENT) + .putExtra(Intent.EXTRA_MIME_TYPES, input.mimeTypes.toTypedArray()) + .setType("*/*") + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, input.initialUri) + } + + return intent + } + + override fun parseResult(resultCode: Int, intent: Intent?): Uri? { + if (intent == null || resultCode != Activity.RESULT_OK) { + return null + } + + return intent.data + } + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt index 13cd86b0..84e141bf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt @@ -35,7 +35,6 @@ import com.moez.QKSMS.util.GlideApp import com.moez.QKSMS.util.tryOrNull import javax.inject.Inject -@RequiresApi(Build.VERSION_CODES.M) class QkChooserTargetService : ChooserTargetService() { @Inject lateinit var conversationRepo: ConversationRepository diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt index cf8eff10..78e36667 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt @@ -32,4 +32,12 @@ fun AlertDialog.Builder.setNegativeButton(@StringRes textId: Int, subject: Subje fun AlertDialog.Builder.setNeutralButton(@StringRes textId: Int, subject: Subject): AlertDialog.Builder { return setNeutralButton(textId) { _, _ -> subject.onNext(Unit) } -} \ No newline at end of file +} + +fun AlertDialog.setShowing(show: Boolean) { + if (isShowing && !show) { + dismiss() + } else if (!isShowing && show) { + show() + } +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt index f2bf92d1..862f27b3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt @@ -63,9 +63,6 @@ fun ProgressBar.setTint(color: Int) { fun View.setBackgroundTint(color: Int) { // API 21 doesn't support this - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - background?.setColorFilter(color, PorterDuff.Mode.SRC_IN) - } backgroundTintList = ColorStateList.valueOf(color) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt deleted file mode 100644 index 038295dc..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package com.moez.QKSMS.feature.backup - -import android.content.Context -import android.text.format.Formatter -import android.view.LayoutInflater -import android.view.ViewGroup -import com.moez.QKSMS.R -import com.moez.QKSMS.common.base.FlowableAdapter -import com.moez.QKSMS.common.base.QkViewHolder -import com.moez.QKSMS.common.util.DateFormatter -import com.moez.QKSMS.model.BackupFile -import io.reactivex.subjects.PublishSubject -import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.backup_list_item.* -import javax.inject.Inject - -class BackupAdapter @Inject constructor( - private val context: Context, - private val dateFormatter: DateFormatter -) : FlowableAdapter() { - - val backupSelected: Subject = PublishSubject.create() - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.backup_list_item, parent, false) - - return QkViewHolder(view).apply { - view.setOnClickListener { backupSelected.onNext(getItem(adapterPosition)) } - } - } - - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { - val backup = getItem(position) - - val count = backup.messages - - holder.title.text = dateFormatter.getDetailedTimestamp(backup.date) - holder.messages.text = context.resources.getQuantityString(R.plurals.backup_message_count, count, count) - holder.size.text = Formatter.formatFileSize(context, backup.size) - } - -} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt index 1439f5f4..d27257bc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt @@ -18,78 +18,113 @@ */ package com.moez.QKSMS.feature.backup -import android.Manifest -import android.app.Activity +import android.content.Context import android.content.res.ColorStateList import android.graphics.Typeface +import android.net.Uri import android.view.View +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog -import androidx.core.app.ActivityCompat import androidx.core.view.children import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkController -import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.QkActivityResultContracts import com.moez.QKSMS.common.util.extensions.getLabel import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setNegativeButton import com.moez.QKSMS.common.util.extensions.setPositiveButton +import com.moez.QKSMS.common.util.extensions.setShowing import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.injection.appComponent -import com.moez.QKSMS.model.BackupFile import com.moez.QKSMS.repository.BackupRepository import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.backup_controller.* -import kotlinx.android.synthetic.main.backup_list_dialog.view.* import kotlinx.android.synthetic.main.preference_view.view.* import javax.inject.Inject class BackupController : QkController(), BackupView { - @Inject lateinit var adapter: BackupAdapter - @Inject lateinit var dateFormatter: DateFormatter @Inject override lateinit var presenter: BackupPresenter - private val activityVisibleSubject: Subject = PublishSubject.create() - private val confirmRestoreSubject: Subject = PublishSubject.create() - private val stopRestoreSubject: Subject = PublishSubject.create() + private val selectFolderCancelSubject: Subject = PublishSubject.create() + private val selectFolderConfirmSubject: Subject = PublishSubject.create() - private val backupFilesDialog by lazy { - val view = View.inflate(activity, R.layout.backup_list_dialog, null) - .apply { files.adapter = adapter.apply { emptyView = empty } } + private val restoreErrorConfirmSubject: Subject = PublishSubject.create() - AlertDialog.Builder(activity!!) - .setView(view) - .setCancelable(true) - .create() - } + private val confirmRestoreCancelSubject: Subject = PublishSubject.create() + private val confirmRestoreConfirmSubject: Subject = PublishSubject.create() - private val confirmRestoreDialog by lazy { - AlertDialog.Builder(activity!!) - .setTitle(R.string.backup_restore_confirm_title) - .setMessage(R.string.backup_restore_confirm_message) - .setPositiveButton(R.string.backup_restore_title, confirmRestoreSubject) - .setNegativeButton(R.string.button_cancel, null) - .create() - } + private val stopRestoreConfirmSubject: Subject = PublishSubject.create() + private val stopRestoreCancelSubject: Subject = PublishSubject.create() + + private val documentTreeSelectedSubject: Subject = PublishSubject.create() + private val documentSelectedSubject: Subject = PublishSubject.create() private val stopRestoreDialog by lazy { AlertDialog.Builder(activity!!) .setTitle(R.string.backup_restore_stop_title) .setMessage(R.string.backup_restore_stop_message) - .setPositiveButton(R.string.button_stop, stopRestoreSubject) - .setNegativeButton(R.string.button_cancel, null) + .setPositiveButton(R.string.button_stop, stopRestoreConfirmSubject) + .setNegativeButton(R.string.button_cancel, stopRestoreCancelSubject) + .setCancelable(false) .create() } + private val selectLocationRationaleDialog by lazy { + AlertDialog.Builder(activity!!) + .setTitle(R.string.backup_select_location_rationale_title) + .setMessage(R.string.backup_select_location_rationale_message) + .setPositiveButton(R.string.button_continue, selectFolderConfirmSubject) + .setNegativeButton(R.string.button_cancel, selectFolderCancelSubject) + .setCancelable(false) + .create() + } + + private val selectedBackupErrorDialog by lazy { + AlertDialog.Builder(activity!!) + .setTitle(R.string.backup_selected_backup_error_title) + .setMessage(R.string.backup_selected_backup_error_message) + .setPositiveButton(R.string.button_continue, restoreErrorConfirmSubject) + .setCancelable(false) + .create() + } + + private val selectedBackupDetailsDialog by lazy { + AlertDialog.Builder(activity!!) + .setTitle(R.string.backup_selected_backup_details_title) + .setPositiveButton(R.string.backup_restore_title, confirmRestoreConfirmSubject) + .setNegativeButton(R.string.button_cancel, confirmRestoreCancelSubject) + .setCancelable(false) + .create() + } + + private lateinit var openDirectory: ActivityResultLauncher + private lateinit var openDocument: ActivityResultLauncher + init { appComponent.inject(this) layoutRes = R.layout.backup_controller } + override fun onContextAvailable(context: Context) { + // Init activity result contracts + openDirectory = themedActivity!! + .registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri -> + uri?.let(documentTreeSelectedSubject::onNext) + } + + openDocument = themedActivity!! + .registerForActivityResult(QkActivityResultContracts.OpenDocument()) { uri -> + uri?.let(documentSelectedSubject::onNext) + } + } + override fun onAttach(view: View) { super.onAttach(view) presenter.bindIntents(this) @@ -115,11 +150,6 @@ class BackupController : QkController( .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } } - override fun onActivityResumed(activity: Activity) { - super.onActivityResumed(activity) - activityVisibleSubject.onNext(Unit) - } - override fun render(state: BackupState) { when { state.backupProgress.running -> { @@ -158,9 +188,14 @@ class BackupController : QkController( } } - backup.summary = state.lastBackup + selectLocationRationaleDialog.setShowing(state.showLocationRationale) - adapter.data = state.backups + selectedBackupErrorDialog.setShowing(state.showSelectedBackupError) + + selectedBackupDetailsDialog.setMessage(state.selectedBackupDetails) + selectedBackupDetailsDialog.setShowing(state.selectedBackupDetails != null) + + stopRestoreDialog.setShowing(state.showStopRestoreDialog) fabIcon.setImageResource(when (state.upgraded) { true -> R.drawable.ic_file_upload_black_24dp @@ -173,29 +208,40 @@ class BackupController : QkController( }) } - override fun activityVisible(): Observable<*> = activityVisibleSubject + override fun setBackupLocationClicks(): Observable<*> = location.clicks() override fun restoreClicks(): Observable<*> = restore.clicks() - override fun restoreFileSelected(): Observable = adapter.backupSelected - .doOnNext { backupFilesDialog.dismiss() } + override fun locationRationaleConfirmClicks(): Observable<*> = selectFolderConfirmSubject - override fun restoreConfirmed(): Observable<*> = confirmRestoreSubject + override fun locationRationaleCancelClicks(): Observable<*> = selectFolderCancelSubject + + override fun selectedBackupErrorClicks(): Observable<*> = restoreErrorConfirmSubject + + override fun confirmRestoreBackupConfirmClicks(): Observable<*> = confirmRestoreConfirmSubject + + override fun confirmRestoreBackupCancelClicks(): Observable<*> = confirmRestoreCancelSubject override fun stopRestoreClicks(): Observable<*> = progressCancel.clicks() - override fun stopRestoreConfirmed(): Observable<*> = stopRestoreSubject + override fun stopRestoreConfirmed(): Observable<*> = stopRestoreConfirmSubject - override fun fabClicks(): Observable<*> = fab.clicks() + override fun stopRestoreCancel(): Observable<*> = stopRestoreCancelSubject - override fun requestStoragePermission() { - ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0) + override fun backupClicks(): Observable<*> = fab.clicks() + + override fun documentTreeSelected(): Observable = documentTreeSelectedSubject + + override fun documentSelected(): Observable = documentSelectedSubject + + override fun selectFolder(initialUri: Uri) { + openDirectory.launch(initialUri) } - override fun selectFile() = backupFilesDialog.show() + override fun selectFile(initialUri: Uri) { + openDocument.launch(QkActivityResultContracts.OpenDocumentParams( + mimeTypes = listOf("application/json", "application/octet-stream"), + initialUri = initialUri)) + } - override fun confirmRestore() = confirmRestoreDialog.show() - - override fun stopRestore() = stopRestoreDialog.show() - -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index b547ec30..9f394bdd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -19,6 +19,7 @@ package com.moez.QKSMS.feature.backup import android.content.Context +import androidx.core.net.toUri import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter @@ -26,14 +27,14 @@ import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.interactor.PerformBackup import com.moez.QKSMS.manager.BillingManager -import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.repository.BackupRepository import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable +import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom -import io.reactivex.subjects.BehaviorSubject -import io.reactivex.subjects.Subject +import io.reactivex.schedulers.Schedulers +import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -43,12 +44,9 @@ class BackupPresenter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter, private val navigator: Navigator, - private val performBackup: PerformBackup, - private val permissionManager: PermissionManager + private val performBackup: PerformBackup ) : QkPresenter(BackupState()) { - private val storagePermissionSubject: Subject = BehaviorSubject.createDefault(permissionManager.hasStorage()) - init { disposables += backupRepo.getBackupProgress() .sample(16, TimeUnit.MILLISECONDS) @@ -60,20 +58,6 @@ class BackupPresenter @Inject constructor( .distinctUntilChanged() .subscribe { progress -> newState { copy(restoreProgress = progress) } } - disposables += storagePermissionSubject - .distinctUntilChanged() - .switchMap { backupRepo.getBackups() } - .doOnNext { backups -> newState { copy(backups = backups) } } - .map { backups -> backups.map { it.date }.max() ?: 0L } - .map { lastBackup -> - when (lastBackup) { - 0L -> context.getString(R.string.backup_never) - else -> dateFormatter.getDetailedTimestamp(lastBackup) - } - } - .startWith(context.getString(R.string.backup_loading)) - .subscribe { lastBackup -> newState { copy(lastBackup = lastBackup) } } - disposables += billingManager.upgradeStatus .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } } @@ -81,10 +65,10 @@ class BackupPresenter @Inject constructor( override fun bindIntents(view: BackupView) { super.bindIntents(view) - view.activityVisible() - .map { permissionManager.hasStorage() } + view.setBackupLocationClicks() + .observeOn(AndroidSchedulers.mainThread()) .autoDisposable(view.scope()) - .subscribe(storagePermissionSubject) + .subscribe { view.selectFolder(backupRepo.getBackupPathUriForPicker()) } view.restoreClicks() .withLatestFrom( @@ -96,40 +80,80 @@ class BackupPresenter @Inject constructor( !upgraded -> context.makeToast(R.string.backup_restore_error_plus) backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup) restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore) - !permissionManager.hasStorage() -> view.requestStoragePermission() - else -> view.selectFile() + else -> view.selectFile(backupRepo.getBackupPathUriForPicker()) } } .autoDisposable(view.scope()) .subscribe() - view.restoreFileSelected() - .autoDisposable(view.scope()) - .subscribe { view.confirmRestore() } - - view.restoreConfirmed() - .withLatestFrom(view.restoreFileSelected()) { _, backup -> backup } - .autoDisposable(view.scope()) - .subscribe { backup -> RestoreBackupService.start(context, backup.path) } - - view.stopRestoreClicks() - .autoDisposable(view.scope()) - .subscribe { view.stopRestore() } - - view.stopRestoreConfirmed() - .autoDisposable(view.scope()) - .subscribe { backupRepo.stopRestore() } - - view.fabClicks() + view.backupClicks() .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded } .autoDisposable(view.scope()) .subscribe { upgraded -> when { + backupRepo.getBackupDocumentTree() == null -> { + newState { copy(showLocationRationale = true) } + } !upgraded -> navigator.showQksmsPlusActivity("backup_fab") - !permissionManager.hasStorage() -> view.requestStoragePermission() upgraded -> performBackup.execute(Unit) } } + + view.locationRationaleConfirmClicks() + .doOnNext { newState { copy(showLocationRationale = false) } } + .autoDisposable(view.scope()) + .subscribe { view.selectFolder(backupRepo.getBackupPathUriForPicker()) } + + view.locationRationaleCancelClicks() + .doOnNext { newState { copy(showLocationRationale = false) } } + .autoDisposable(view.scope()) + .subscribe() + + view.selectedBackupErrorClicks() + .autoDisposable(view.scope()) + .subscribe { newState { copy(showSelectedBackupError = false) } } + + view.confirmRestoreBackupConfirmClicks() + .doOnNext { newState { copy(selectedBackupDetails = null) } } + .withLatestFrom(view.documentSelected()) { _, backup -> backup } + .autoDisposable(view.scope()) + .subscribe { backup -> RestoreBackupService.start(context, backup) } + + view.confirmRestoreBackupCancelClicks() + .doOnNext { newState { copy(selectedBackupDetails = null) } } + .autoDisposable(view.scope()) + .subscribe() + + view.stopRestoreClicks() + .autoDisposable(view.scope()) + .subscribe { newState { copy(showStopRestoreDialog = true) } } + + view.stopRestoreConfirmed() + .doOnNext { newState { copy(showStopRestoreDialog = false) } } + .autoDisposable(view.scope()) + .subscribe { backupRepo.stopRestore() } + + view.stopRestoreCancel() + .autoDisposable(view.scope()) + .subscribe { newState { copy(showStopRestoreDialog = false) } } + + view.documentTreeSelected() + .autoDisposable(view.scope()) + .subscribe { uri -> backupRepo.persistBackupDirectory(uri) } + + view.documentSelected() + .observeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe { uri -> + try { + val backupFile = backupRepo.parseBackup(uri) + val date = dateFormatter.getDetailedTimestamp(backupFile.date) + val details = context.getString(R.string.backup_details, date, backupFile.messages) + newState { copy(selectedBackupDetails = details) } + } catch (e: Exception) { + newState { copy(showSelectedBackupError = true) } + } + } } } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt index b6585810..c64a1afd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt @@ -18,13 +18,16 @@ */ package com.moez.QKSMS.feature.backup -import com.moez.QKSMS.model.BackupFile import com.moez.QKSMS.repository.BackupRepository data class BackupState( val backupProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(), val restoreProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(), - val lastBackup: String = "", - val backups: List = listOf(), + + val showLocationRationale: Boolean = false, + val showSelectedBackupError: Boolean = false, + val selectedBackupDetails: String? = null, + val showStopRestoreDialog: Boolean = false, + val upgraded: Boolean = false -) \ No newline at end of file +) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt index abef9b0e..b19ddf57 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt @@ -18,23 +18,31 @@ */ package com.moez.QKSMS.feature.backup +import android.net.Uri import com.moez.QKSMS.common.base.QkViewContract -import com.moez.QKSMS.model.BackupFile import io.reactivex.Observable interface BackupView : QkViewContract { - - fun activityVisible(): Observable<*> + fun setBackupLocationClicks(): Observable<*> fun restoreClicks(): Observable<*> - fun restoreFileSelected(): Observable - fun restoreConfirmed(): Observable<*> + + fun backupClicks(): Observable<*> + + fun locationRationaleConfirmClicks(): Observable<*> + fun locationRationaleCancelClicks(): Observable<*> + + fun selectedBackupErrorClicks(): Observable<*> + + fun confirmRestoreBackupConfirmClicks(): Observable<*> + fun confirmRestoreBackupCancelClicks(): Observable<*> + fun stopRestoreClicks(): Observable<*> fun stopRestoreConfirmed(): Observable<*> - fun fabClicks(): Observable<*> + fun stopRestoreCancel(): Observable<*> - fun requestStoragePermission() - fun selectFile() - fun confirmRestore() - fun stopRestore() + fun documentTreeSelected(): Observable + fun documentSelected(): Observable -} \ No newline at end of file + fun selectFolder(initialUri: Uri) + fun selectFile(initialUri: Uri) +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt index 49527ef0..a7d059e5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.app.Service import android.content.Context import android.content.Intent +import android.net.Uri import android.os.IBinder import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat @@ -43,12 +44,12 @@ class RestoreBackupService : Service() { private const val ACTION_START = "com.moez.QKSMS.ACTION_START" private const val ACTION_STOP = "com.moez.QKSMS.ACTION_STOP" - private const val EXTRA_FILE_PATH = "com.moez.QKSMS.EXTRA_FILE_PATH" + private const val EXTRA_FILE_URI = "com.moez.QKSMS.EXTRA_FILE_URI" - fun start(context: Context, filePath: String) { + fun start(context: Context, backupFile: Uri) { val intent = Intent(context, RestoreBackupService::class.java) .setAction(ACTION_START) - .putExtra(EXTRA_FILE_PATH, filePath) + .putExtra(EXTRA_FILE_URI, backupFile.toString()) ContextCompat.startForegroundService(context, intent) } @@ -100,7 +101,7 @@ class RestoreBackupService : Service() { // Start the restore Observable.just(intent) - .map { it.getStringExtra(EXTRA_FILE_PATH) } + .map { Uri.parse(it.getStringExtra(EXTRA_FILE_URI)) } .map(backupRepo::performRestore) .subscribeOn(Schedulers.io()) .subscribe({}, Timber::w) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 0ceff0d3..2d3b29ef 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -156,11 +156,6 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .subscribe() window.callback = ComposeWindowCallback(window.callback, this) - - // These theme attributes don't apply themselves on API 21 - if (Build.VERSION.SDK_INT <= 22) { - messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) - } } override fun onStart() { @@ -403,8 +398,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { super.onSaveInstanceState(outState) } - override fun onRestoreInstanceState(savedInstanceState: Bundle?) { - cameraDestination = savedInstanceState?.getParcelable(CameraDestinationKey) + override fun onRestoreInstanceState(savedInstanceState: Bundle) { + cameraDestination = savedInstanceState.getParcelable(CameraDestinationKey) super.onRestoreInstanceState(savedInstanceState) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 96047191..e94cb0de 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -433,7 +433,7 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { part -> if (permissionManager.hasStorage()) { - messageRepo.savePart(part.id)?.let(navigator::viewFile) + messageRepo.savePart(part.id)?.let { navigator.viewFile(it, part.type) } } else { view.requestStoragePermission() } @@ -634,23 +634,36 @@ class ComposeViewModel @Inject constructor( // Send a message when the send button is clicked, and disable editing mode if it's enabled view.sendIntent - .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } } - .filter { permissionManager.hasSendSms().also { if (!it) view.requestSmsPermission() } } - .withLatestFrom(view.textChangedIntent) { _, body -> body } - .map { body -> body.toString() } + .withLatestFrom(view.textChangedIntent) { _, body -> body.toString() } .withLatestFrom(state, attachments, conversation, selectedChips) { body, state, attachments, conversation, chips -> - val subId = state.subscription?.subscriptionId ?: -1 - val addresses = when (conversation.recipients.isNotEmpty()) { - true -> conversation.recipients.map { it.address } - false -> chips.map { chip -> chip.address } + if (!permissionManager.isDefaultSms()) { + view.requestDefaultSms() + return@withLatestFrom } + + if (!permissionManager.hasSendSms()) { + view.requestSmsPermission() + return@withLatestFrom + } + val delay = when (prefs.sendDelay.get()) { Preferences.SEND_DELAY_SHORT -> 3000 Preferences.SEND_DELAY_MEDIUM -> 5000 Preferences.SEND_DELAY_LONG -> 10000 else -> 0 } + + if ((delay != 0 || state.scheduled != 0L) && !permissionManager.hasExactAlarms()) { + navigator.showExactAlarmsSettings() + return@withLatestFrom + } + + val subId = state.subscription?.subscriptionId ?: -1 + val addresses = when (conversation.recipients.isNotEmpty()) { + true -> conversation.recipients.map { it.address } + false -> chips.map { chip -> chip.address } + } val sendAsGroup = !state.editingMode || state.sendAsGroup when { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt index 0ea9eab7..494b6e5b 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt @@ -83,7 +83,7 @@ class ComposeWindowCallback( return localCallback.onCreatePanelMenu(i, menu) } - override fun onPreparePanel(i: Int, view: View, menu: Menu): Boolean { + override fun onPreparePanel(i: Int, view: View?, menu: Menu): Boolean { return localCallback.onPreparePanel(i, view, menu) } @@ -123,7 +123,6 @@ class ComposeWindowCallback( return localCallback.onSearchRequested() } - @RequiresApi(api = Build.VERSION_CODES.M) override fun onSearchRequested(searchEvent: SearchEvent): Boolean { return localCallback.onSearchRequested(searchEvent) } @@ -132,7 +131,6 @@ class ComposeWindowCallback( return localCallback.onWindowStartingActionMode(callback) } - @RequiresApi(api = Build.VERSION_CODES.M) override fun onWindowStartingActionMode(callback: ActionMode.Callback, i: Int): ActionMode? { return localCallback.onWindowStartingActionMode(callback, i) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index d892224b..5576352f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -152,9 +152,7 @@ class MessagesAdapter @Inject constructor( view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false) } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - view.body.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE - } + view.body.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE val partsAdapter = partsAdapterProvider.get() partsAdapter.clicks.subscribe(partClicks) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index b415d32f..b81a1a98 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -44,11 +44,6 @@ class ChipsAdapter @Inject constructor() : QkAdapter() { val inflater = LayoutInflater.from(parent.context) val view = inflater.inflate(R.layout.contact_chip, parent, false) return QkViewHolder(view).apply { - // These theme attributes don't apply themselves on API 21 - if (Build.VERSION.SDK_INT <= 22) { - content.setBackgroundTint(view.context.resolveThemeColor(R.attr.bubbleColor)) - } - view.setOnClickListener { val chip = getItem(adapterPosition) showDetailedChip(view.context, chip) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index f5ca9f71..58f1db08 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt @@ -88,11 +88,6 @@ class ContactsActivity : QkThemedActivity(), ContactsContract { viewModel.bindView(this) contacts.adapter = contactsAdapter - - // These theme attributes don't apply themselves on API 21 - if (Build.VERSION.SDK_INT <= 22) { - search.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) - } } override fun render(state: ContactsState) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index d660d6ce..7d453721 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt @@ -81,9 +81,11 @@ class GalleryViewModel @Inject constructor( view.optionsItemSelected() .filter { itemId -> itemId == R.id.share } .filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } } - .withLatestFrom(view.pageChanged()) { _, part -> part.id } + .withLatestFrom(view.pageChanged()) { _, part -> part } .autoDisposable(view.scope()) - .subscribe { partId -> messageRepo.savePart(partId)?.let(navigator::shareFile) } + .subscribe { part -> + messageRepo.savePart(part.id)?.let { navigator.shareFile(it, part.type) } + } } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 362f66a6..695f38b3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -185,11 +185,6 @@ class MainActivity : QkThemedActivity(), MainView { // Set the FAB compose icon color compose.setTint(theme.textPrimary) } - - // These theme attributes don't apply themselves on API 21 - if (Build.VERSION.SDK_INT <= 22) { - toolbarSearch.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) - } } override fun onNewIntent(intent: Intent?) { @@ -294,7 +289,7 @@ class MainActivity : QkThemedActivity(), MainView { when (state.syncing) { is SyncRepository.SyncProgress.Idle -> { syncing.isVisible = false - snackbar.isVisible = !state.defaultSms || !state.smsPermission || !state.contactPermission + snackbar.isVisible = !state.defaultSms || !state.smsPermission || !state.contactPermission || !state.notificationPermission } is SyncRepository.SyncProgress.Running -> { @@ -324,6 +319,12 @@ class MainActivity : QkThemedActivity(), MainView { snackbarMessage?.setText(R.string.main_permission_contacts) snackbarButton?.setText(R.string.main_permission_allow) } + + !state.notificationPermission -> { + snackbarTitle?.setText(R.string.main_permission_required) + snackbarMessage?.setText(R.string.main_permission_notifications) + snackbarButton?.setText(R.string.main_permission_allow) + } } } @@ -355,10 +356,17 @@ class MainActivity : QkThemedActivity(), MainView { } override fun requestPermissions() { - ActivityCompat.requestPermissions(this, arrayOf( - Manifest.permission.READ_SMS, - Manifest.permission.SEND_SMS, - Manifest.permission.READ_CONTACTS), 0) + val permissions = mutableListOf( + Manifest.permission.READ_SMS, + Manifest.permission.SEND_SMS, + Manifest.permission.READ_CONTACTS + ) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + permissions += Manifest.permission.POST_NOTIFICATIONS + } + + ActivityCompat.requestPermissions(this, permissions.toTypedArray(), 0) } override fun clearSearch() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt index 01697633..9d66069b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt @@ -32,7 +32,8 @@ data class MainState( val syncing: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle, val defaultSms: Boolean = true, val smsPermission: Boolean = true, - val contactPermission: Boolean = true + val contactPermission: Boolean = true, + val notificationPermission: Boolean = true, ) sealed class MainPage diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 8e3b7cd8..73442796 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -18,6 +18,9 @@ */ package com.moez.QKSMS.feature.main +import android.content.Intent +import android.net.Uri +import android.provider.Settings import androidx.recyclerview.widget.ItemTouchHelper import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator @@ -135,28 +138,56 @@ class MainViewModel @Inject constructor( !permissionManager.hasReadSms() || !permissionManager.hasContacts() -> view.requestPermissions() } - val permissions = view.activityResumedIntent - .filter { resumed -> resumed } - .observeOn(Schedulers.io()) - .map { Triple(permissionManager.isDefaultSms(), permissionManager.hasReadSms(), permissionManager.hasContacts()) } - .distinctUntilChanged() - .share() + // If the default SMS state changes, reflect it in the State + view.activityResumedIntent + .filter { resumed -> resumed } + .observeOn(Schedulers.io()) + .map { permissionManager.isDefaultSms() } + .distinctUntilChanged() + .doOnNext { defaultSms -> newState { copy(defaultSms = defaultSms) } } + .autoDisposable(view.scope()) + .subscribe() - // If the default SMS state or permission states change, update the ViewState - permissions - .doOnNext { (defaultSms, smsPermission, contactPermission) -> - newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) } - } - .autoDisposable(view.scope()) - .subscribe() + // If the SMS Permission state changes, reflect it in the State + view.activityResumedIntent + .filter { resumed -> resumed } + .observeOn(Schedulers.io()) + .map { permissionManager.hasReadSms() } + .distinctUntilChanged() + .doOnNext { smsPermission -> newState { copy(smsPermission = smsPermission) } } + .autoDisposable(view.scope()) + .subscribe() - // If we go from not having all permissions to having them, sync messages - permissions - .skip(1) - .filter { it.first && it.second && it.third } - .take(1) - .autoDisposable(view.scope()) - .subscribe { syncMessages.execute(Unit) } + // If the Contacts Permission state changes, reflect it in the State + view.activityResumedIntent + .filter { resumed -> resumed } + .observeOn(Schedulers.io()) + .map { permissionManager.hasContacts() } + .distinctUntilChanged() + .doOnNext { contactPermission -> newState { copy(contactPermission = contactPermission) } } + .autoDisposable(view.scope()) + .subscribe() + + // If the Notifications Permission state changes, reflect it in the State + view.activityResumedIntent + .filter { resumed -> resumed } + .observeOn(Schedulers.io()) + .map { permissionManager.hasNotifications() } + .distinctUntilChanged() + .doOnNext { notificationPermission -> newState { copy(notificationPermission = notificationPermission) } } + .autoDisposable(view.scope()) + .subscribe() + + // If we go from not having all SMS permissions to having them, sync messages + view.activityResumedIntent + .filter { resumed -> resumed } + .observeOn(Schedulers.io()) + .map { permissionManager.isDefaultSms() && permissionManager.hasReadSms() && permissionManager.hasContacts() } + .distinctUntilChanged() + .skip(1) + .filter { hasAllPermissions -> hasAllPermissions } + .autoDisposable(view.scope()) + .subscribe { syncMessages.execute(Unit) } // Launch screen from intent view.onNewIntentIntent @@ -408,6 +439,8 @@ class MainViewModel @Inject constructor( val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected) newState { copy(page = page) } } + + is Searching -> {} // Ignore } } .autoDisposable(view.scope()) @@ -446,6 +479,14 @@ class MainViewModel @Inject constructor( !state.defaultSms -> view.requestDefaultSms() !state.smsPermission -> view.requestPermissions() !state.contactPermission -> view.requestPermissions() + !state.notificationPermission -> { + if (prefs.hasAskedForNotificationPermission.get()) { + navigator.showPermissions() + } else { + prefs.hasAskedForNotificationPermission.set(true) + view.requestPermissions() + } + } } } .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt index c954a559..e5727c0c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class UpgradeButtonExperiment @Inject constructor( context: Context, analytics: AnalyticsManager -) : Experiment<@StringRes Int>(context, analytics) { +) : Experiment(context, analytics) { override val key: String = "Upgrade Button" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index 392196d4..f8fec2ae 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt @@ -74,15 +74,6 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() { override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1) }) - - // These theme attributes don't apply themselves on API 21 - if (Build.VERSION.SDK_INT <= 22) { - toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary)) - background.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground)) - messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) - composeBackgroundGradient.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground)) - composeBackgroundSolid.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground)) - } } override fun render(state: QkReplyState) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index 696823f1..bfa0525b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -140,17 +140,17 @@ class WidgetProvider : AppWidgetProvider() { // Main intent val mainIntent = Intent(context, MainActivity::class.java) - val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) remoteViews.setOnClickPendingIntent(R.id.title, mainPI) // Compose intent val composeIntent = Intent(context, ComposeActivity::class.java) - val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) remoteViews.setOnClickPendingIntent(R.id.compose, composePI) // Conversation intent val startActivityIntent = Intent(context, MainActivity::class.java) - val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent) AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews) diff --git a/presentation/src/main/res/drawable/ic_baseline_folder_24.xml b/presentation/src/main/res/drawable/ic_baseline_folder_24.xml new file mode 100644 index 00000000..5e930a2f --- /dev/null +++ b/presentation/src/main/res/drawable/ic_baseline_folder_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml index 88983dbc..692ec037 100644 --- a/presentation/src/main/res/layout/backup_controller.xml +++ b/presentation/src/main/res/layout/backup_controller.xml @@ -119,12 +119,12 @@ + app:icon="@drawable/ic_baseline_folder_24" + app:title="@string/backup_location_title" + app:summary="@string/backup_location_summary" /> الإذن مطلوب QKSMS يحتاج إلى إذن لإرسال وعرض الرسائل النصية QKSMS يحتاج إلى إذن لعرض جهات الاتصال لديك + QKSMS needs permission to display notifications سماح صندوق الوارد المؤرشفة @@ -149,28 +150,26 @@ النسخ الاحتياطي والاستعادة النسخ الاحتياطي للرسائل استعادة من النسخة الاحتياطية - آخر نسخ احتياطي تحميل… أبداً + Backup location + Set folder استعادة اختر نسخة احتياطية يرجى إلغاء تأمين QKSMS+ للتمكن من استخدام النسخ الاحتياطي والاستعادة النسخ الاحتياطي قيد التقدم… الاستعادة قيد التقدُّم… الاستعادة من النسخ الاحتياطي - هل أنت متأكد من رغبتك استرجاع رسائلك من هذه النسخة الاحتياطية؟ إيقاف الاستعادة الرسائل التي تمت استعادتها ستبقى في جهازك + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details النسخ الاحتياطية لا توجد أي نسخة احتياطية - - لا رسائل - رسالة - رسالتان - %d رسائل - %d رسائل - %d رسائل - النسخ الاحتياطي والاستعادة متاحة الآن فقط للرسائل النصّية. دعم رسائل الوسائط والرسائل المجدولة قادم قريباً! النسخ الاحتياطي الآن توزيع النسخ الاحتياطي… @@ -248,9 +247,9 @@ عدد الايام لا نهائيا مسح الرسائل القديمة تلقائيا؟ - If you proceed, %1$d messages will be deleted now + إذا قمت بالمتابعة، سيتم حذف %1$d رسالة الآن - بعد يوم واحد + بعد 1 يوم After 1 day After %d days After %d days @@ -258,7 +257,7 @@ After %d days ارسل الرسائل الطويلة كرسائل الوسائط المتعددة - If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply + اذا فشلت رسالتك النصية الطويلة, او ارسلت بلترتيب الخاطئ, يمكنك ارسالها كرسالة MMS بدلا من ذلك, سوف يتم احتساب رسوم اضافية الضغط التلقائي لمرفقات رسائل الوسائط مزامنة الرسائل إعادة مزامنة رسائلك مع قاعدة البيانات الأصلية للرسائل في النظام @@ -268,11 +267,11 @@ تسجيل التصحيح معطَّل أدخل المدة (ثوان) المحظورات - Drop messages + مسح الرسائل Drop incoming messages from blocked senders instead of hiding them المحادثات المحظورة مدير المحظورات - QKSMS + كيو كي اس ام اس Built-in blocking functionality in QKSMS Block spam messages, numbers & unknown calls with blacklist & Schedule Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers @@ -321,7 +320,7 @@ افتح + التبرع ل %1$s%2$s شكراً لكم على دعم QKSMS! جميع ميزات QKSMS+ متاحة لك الآن - An error has occurred, please try again + حدث خطا, يرجى اعادة المحاولة QKSMS+ مجاني لمستخدمي متجر ف-درويد! لا تتردد في التبرع إن كنت ترغب دعم تطوير هذا التطبيق. التبرع عن طريق بي بال قريباً diff --git a/presentation/src/main/res/values-bn/strings.xml b/presentation/src/main/res/values-bn/strings.xml index 6ec13816..fc072538 100644 --- a/presentation/src/main/res/values-bn/strings.xml +++ b/presentation/src/main/res/values-bn/strings.xml @@ -61,6 +61,7 @@ অনুমতি প্রয়োজন QKSMS-এর এসএমএস বার্তাগুলো পাঠানোর এবং দেখার অনুমতি প্রয়োজন QKSMS-এর তোমার পরিচিতিগুলি দেখার জন্য অনুমতি প্রয়োজন + QKSMS needs permission to display notifications মঞ্জুর করো ইনবক্স আর্কাইভকৃত @@ -145,24 +146,26 @@ ব্যাকআপ ও পুনরুদ্ধার মেসেজ ব্যাকআপ হচ্ছে ব্যাকআপ হতে পুনরুদ্ধার হচ্ছে - সর্বশেষ ব্যাকআপ লোড হচ্ছে… কখনই না + Backup location + Set folder পুনরুদ্ধার ব্যাকআপ নির্বাচন করুন ব্যাকআপ এবং পুনরুদ্ধার ব্যবহার করতে দয়া করে QKSMS + আনলক করুন ব্যাক-আপ চলছে… পুনরুদ্ধার চলছে… ব্যাক-আপ থেকে পুনরুদ্ধার করুন - আপনি কি নিশ্চিত যে আপনি এই ব্যাকআপ থেকে আপনার বার্তাগুলি পুনরুদ্ধার করতে চান? পুনরুদ্ধার থামান ইতিমধ্যে পুনরুদ্ধার করা বার্তাগুলি আপনার ডিভাইসে থাকবে + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details ব্যাকআপ গুলো কোন ব্যাকআপ পাওয়া যায়নি - - %d মেসেজ - %dটি মেসেজ - এইমুহুর্তে, ব্যাকআপ এবং পুনরুদ্ধার শুধুমাত্র এসএমএস এ করতে পারবেন । এমএমএস সাপর্ট ও শিডিউল ব্যাকআপ শীঘ্রই আসছে! ব্যাকআপ করুন ব্যাক-আপ পার্স করা হচ্ছে… @@ -235,15 +238,15 @@ বহির্গামী এসএমএস বার্তার অক্ষর থেকে কথার টান সরিয়ে নাও(accent) শুধু মোবাইল নম্বর বার্তা লিখার করার সময়, শুধুমাত্র মোবাইল নম্বর দেখাও - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + পুরান বার্তা স্বয়ংক্রিয়ভাবে মুছে দাও + নির্দিষ্ট দিন পরে বার্তাগুলো মুছে যাবে + দিন সংখ্যা + কখনো না + স্বয়ংক্রিয়ভাবে পুরান বার্তা মুছো? + যদি আগাও, %1$dটি বার্তা মুছে যাবে এখনই - After 1 day - After %d days + ১ দিন পরে + %d দিন পরে দীর্ঘ বার্তা এমএমএস হিসেবে পাঠাও যদি তোমার দীর্ঘ বার্তা পাঠানো ব্যর্থ হয় বা ভুল ক্রমানুসারে পাঠানো হয় তবে তুমি তার পরিবর্তে বার্তাগুলো এমএমএস বার্তা হিসাবে প্রেরণ করতে পারো। অতিরিক্ত চার্জ প্রযোজ্য হতে পারে @@ -262,7 +265,7 @@ অবরুদ্ধকরণ ব্যবস্থাপক QKSMS QKSMS-এর অন্তর্ভুক্ত অবরোধী সক্ষমতা(blocking) - Block spam messages, numbers & unknown calls with blacklist & Schedule + স্প্যাম বার্তা, নম্বর & অজানা কল অবরোধ তালিকা দিয়ে থামাও & সময়সূচী তোমার কল আর বার্তা একটাই সুবিধাজনক জায়গা থেকে ফিল্টার করো বা ছাঁকো! Community IQ™ দিয়ে অবাঞ্ছিত বার্তা আটকানো যায় সমাজে পরিচিত স্প্যামারদের থেকে স্বয়ংক্রিয়ভাবে \"Should I Answer\"(আমার কি উত্তর দেয়া উচিত?) অ্যাপ্লিকেশন ব্যবহার করে অযাচিত নম্বর-এর বার্তাগুলি ফিল্টার করো অবরুদ্ধ নম্বরগুলো অনুলিপি করো @@ -301,7 +304,7 @@ %1$s %2$s দান করুন, + আনলক করুন QKSMS সমর্থনের জন্য আপনাকে ধন্যবাদ! আপনি এখন QKSMS+-এর সব বৈশিষ্ট্যেের সুবিধা পাচ্ছেন - An error has occurred, please try again + একটি ত্রুটি আছে, আবার চেষ্টা করো। F-Droid ব্যবহারকারীরা QKSMS+ বিনামূল্যে ব্যবহার করতে পারবেন! যদি আপনি উন্নয়ন সমর্থন করতে মুক্ত মনে অনুদান করুন। পেপাল এর মাধ্যমে দান করুন শীঘ্রই আসছে @@ -317,7 +320,7 @@ তোমার বার্তা পাঠানোর আগে কয়েক সেকেন্ড অপেক্ষা করো স্বয়ংক্রিয় রাত্রি মোড দিন সময় উপর ভিত্তি করে নাইট মোড সক্ষম করুন - উন্নীত আনব্লক করা + উন্নীত ব্লককরণ সেই সব বার্তা ব্লক(অবরোধ) করো যা কোন শব্দ বা নমুনার সাথে মিলে সক্রিয়ভাবে সামনে পাঠান নির্দিষ্ট প্রেরকের বার্তাগুলো স্বয়ংক্রিয়ভাবে সামনে পাঠাও(ফরওয়ার্ড) diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml index 44b23678..c56cd6e0 100644 --- a/presentation/src/main/res/values-cs/strings.xml +++ b/presentation/src/main/res/values-cs/strings.xml @@ -61,6 +61,7 @@ Vyžadováno oprávnění QKSMS potřebuje oprávnění pro odesílání a zobrazení SMS zpráv QKSMS potřebuje oprávnění pro zobrazení vašich kontaktů + QKSMS needs permission to display notifications Povolit Příchozí zprávy Archivováno @@ -147,26 +148,26 @@ Záloha a obnovení Zálohování zpráv Obnovení ze zálohy - Poslední záloha Načítání… Nikdy + Backup location + Set folder Obnovit Vybrat zálohu Odemkněte QKSMS+ pro použití funkce zálohování a obnovení Zálohování… Probíhá obnova… Obnovit ze zálohy - Opravdu chcete obnovit všechny vaše zprávy z této zálohy? Zastavit obnovu Dříve obnovené zprávy zůstanou ve vašem zařízení + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Zálohy Nenalezeny žádné zálohy - - %d zpráva - %d zpráv - %d zprávy - %d zprávy - Momentálně jsou pro zálohování a obnovení podporovány pouze SMS. MMS podpora a plánované zálohy budou přidány již brzy! Zálohovat nyní Analyzování zálohy… diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml index 94272bea..d35b0254 100644 --- a/presentation/src/main/res/values-da/strings.xml +++ b/presentation/src/main/res/values-da/strings.xml @@ -18,16 +18,16 @@ ~ along with QKSMS. If not, see . --> - Åbn samtale + Ny samtale Skriv Genvej deaktiveret Arkiveret Indstillinger Notifikationer Tema - Søg i Indbakke… + Søg indbakke… Angiv et navn eller nummer - Overspring + Spring over Fortsæt Tilføj person Opkald @@ -61,6 +61,7 @@ Tilladelse nødvendig QKSMS behøver tilladelse til at sende og vise SMS\'er QKSMS behøver tilladelse til at se dine kontakter + QKSMS behøver tilladelse til at vise notifikationer Tillad Indbakke Arkiveret @@ -145,24 +146,26 @@ Sikkerhedskopiering og gendannelse Sikkerhedskopierer beskeder Gendanner fra sikkerhedskopi - Seneste sikkerhedskopi Indlæser… Aldrig + Placering af sikkerhedskopi + Indstil mappe Gendanne Vælg en sikkerhedskopi Oplås QKSMS+ for at benytte sikkerhedskopiering og gendannelse Sikkerhedskopiering i gang… Gendannelse i gang… Genskab fra sikkerhedskopi - Er du sikker på at du vil gendanne dine beskeder fra denne sikkerhedskopi? Stop gendannelsen Beskeder som allerede er genskabt vil forblive på din enhed + Vælg placering af sikkerhedskopi + Vælg en mappe til lagring af sikkerhedskopier + %1$s\n%2$d beskeder + Fejl + Kunne ikke læse sikkerhedskopifil + Sikkerhedskopioplysninger Sikkerhedskopier Ingen sikkerhedskopier fundet - - %d besked - %d beskeder - I øjeblikket understøtter Sikkerhedskopiering og Gendannelse kun SMS. MMS-understøttelse og planlagte sikkerhedskopieringer kommer snart! Sikkerhedskopiér nu Analyserer sikkerhedskopi… @@ -262,9 +265,9 @@ Blokeringshåndtering QKSMS Indbygget blokeringsfunktionalitet i QKSMS - Block spam messages, numbers & unknown calls with blacklist & Schedule - Filtrér automatisk dine opkald og beskeder på ét praktisk sted! Community IQ ™ giver dig mulighed for at forhindre uønskede beskeder fra spammere kendt af fællesskabet - Filtrér automatisk beskeder fra uopfordrede numre vha. \"Bør jeg besvare\"-app\'en + Blokér spambeskeder, numre & ukendte opkald med sortliste & tidsplan + Filtrér automatisk dine opkald og beskeder på ét praktisk sted! Community IQ™ giver dig mulighed for at forhindre uønskede beskeder fra spammere kendt af fællesskabet + Filtrér automatisk beskeder fra uopfordrede numre vha. \"Should I Answer?\" app\'en Kopiér blokerede numre Fortsæt til %s og kopiér dine blokerede nummer dertil Blokerede numre @@ -301,7 +304,7 @@ Oplås + donér for %1$s %2$s Tak for din støtte til QKSMS! Du har nu adgang til alle QKSMS+-funktioner - An error has occurred, please try again + Der opstod en fejl, prøv igen QKSMS+ er gratis for F-Droid-brugere! Ønsker du at støtte udviklingen, er du velkommen til at donere. Donér via PayPal Kommer snart diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml index f24e229e..ac639f37 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -61,6 +61,7 @@ Berechtigung erforderlich QKSMS benötigt die Berechtigung zum Senden und Anzeigen von SMS-Nachrichten QKSMS benötigt die Berechtigung zum Zugreifen auf die Kontakte + QKSMS benötigt die Berechtigung, um Benachrichtigungen anzuzeigen Zulassen Posteingang Archiviert @@ -145,24 +146,26 @@ Sichern und Wiederherstellen Sichere Nachrichten Aus Sicherung wiederherstellen - Letzte Sicherung Lade… Niemals + Sicherungsort + Ordner festlegen Wiederherstellen Sicherung auswählen Bitte QKSMS+ freischalten, um die Sicherung und Wiederherstellung zu nutzen Sicherung wird durchgeführt… Wiederherstellung wird durchgeführt… Aus einer Sicherung wiederherstellen - Sicher, dass die Nachrichten aus dieser Sicherung wiederhergestellt werden sollen? Wiederherstellung abbrechen Nachrichten, die bereits wiederhergestellt wurden, werden auf Ihrem Gerät bleiben + Sicherungsort auswählen + Bitte wählen Sie einen Ordner in dem Sie Ihre Sicherungen speichern möchten + %1$s\n%2$d Nachrichten + Fehler + Sicherungsdatei konnte nicht gelesen werden + Sicherungsdetails Sicherungen Keine Sicherungen gefunden - - %d Nachricht - %d Nachrichten - Derzeit wird nur das Sichern und Wiederherstellen von SMS unterstützt. Die Unterstützung für MMS und geplante Sicherungen folgen demnächst! Jetzt sichern Analysiere Sicherung… diff --git a/presentation/src/main/res/values-el/strings.xml b/presentation/src/main/res/values-el/strings.xml index 71b1bc8c..d4a9e7f7 100644 --- a/presentation/src/main/res/values-el/strings.xml +++ b/presentation/src/main/res/values-el/strings.xml @@ -61,6 +61,7 @@ Απαιτείται άδεια Το QKSMS απαιτεί την άδεια αποστολής και ανάγνωσης μηνυμάτων SMS Το QKSMS απαιτεί την άδεια ανάγνωσης των επαφών σας + QKSMS needs permission to display notifications Να επιτραπεί Εισερχόμενα Αρχείο @@ -145,24 +146,26 @@ Αντίγραφα ασφαλείας και επαναφορά Δημιουργία αντιγράφου ασφαλείας μηνυμάτων Επαναφορά αντιγράφου ασφαλείας μηνυμάτων - Τελευταίο αντίγραφο ασφαλείας Φόρτωση… Ποτέ + Backup location + Set folder Επαναφορά Επιλέξτε ένα αντίγραφο ασφαλείας Παρακαλώ ξεκλειδώστε το QKSMS+ για τη δημιουργία και επαναφορά αντιγράφων ασφαλείας Δημιουργία αντιγράφου ασφαλείας… Επαναφορά αντιγράφου ασφαλείας… Επαναφορά αντιγράφου ασφαλείας - Σίγουρα επιθυμείτε να επαναφέρετε τα μηνύματα σας από αυτό το αντίγραφο ασφαλείας; Διακοπή επαναφοράς Τα μηνύματα που έχουν ήδη ανακτηθεί θα παραμείνουν στη συσκευή σας + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Αντίγραφα ασφαλείας Δεν βρέθηκαν αντίγραφα ασφαλείας - - %d message - %d μηνύματα - Προς το παρόν, μπορούν να δημιουργηθούν αντίγραφα ασφαλείας μόνο για SMS. Η υποστήριξη MMS και ο προγραμματισμός αντιγράφων ασφαλείας θα προστεθούν σύντομα! Δημιουργία αντιγράφου τώρα Ανάγνωση αντιγράφου ασφαλείας… diff --git a/presentation/src/main/res/values-es/strings.xml b/presentation/src/main/res/values-es/strings.xml index 781d2510..f8bff52f 100644 --- a/presentation/src/main/res/values-es/strings.xml +++ b/presentation/src/main/res/values-es/strings.xml @@ -61,6 +61,7 @@ Se requiere permiso QKSMS necesita permiso para enviar y ver mensajes SMS QKSMS necesita permiso para ver sus contactos + QKSMS needs permission to display notifications Permitir Recibidos Archivar @@ -145,24 +146,26 @@ Copia de seguridad y restauración Respaldando mensajes Restaurar desde copia de seguridad - Última copia de seguridad Cargando… Nunca + Backup location + Set folder Restaurar Seleccione una copia de seguridad Por favor desbloquee QKSMS+ para usar copia de seguridad y restauración Copia de seguridad en progreso… Restauración en progreso… Restaurar desde copia de seguridad - ¿Está seguro de que desea restaurar sus mensajes desde esta copia de seguridad? Detener restauración Los mensajes que ya han sido restaurados permanecerán en su dispositivo + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Copias de seguridad No se encontraron copias de seguridad - - %dNuevo mensaje - %dMensajes nuevos - Actualmente, sólo los SMS son soportados por la copia de seguridad y restauración. ¡El soporte para MMS y las copias de seguridad programadas se realizarán pronto! Copiar ahora Analizando copia de seguridad… @@ -235,15 +238,15 @@ Quitar acentos de caracteres en los mensajes SMS salientes Sólo números móviles Al componer un mensaje, sólo mostrar números móviles - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + Eliminar mensajes antiguos automáticamente + Los mensajes se eliminarán después del número especificado de días + Número de días + Nunca + ¿Eliminar mensajes antiguos automáticamente? + Si sigues, se eliminarán %1$d mensajes ahora - After 1 day - After %d days + Después de 1 día + Después de %d días Enviar mensajes largos como MMS Si sus mensajes de texto largos no se están enviando o enviando en el orden incorrecto, puede enviarlos como mensajes MMS en su lugar. Se pueden aplicar cargos adicionales @@ -301,7 +304,7 @@ Desbloquear + donación %1$s %2$s Gracias por apoyar a QKSMS! Ahora tienes acceso a todas las funciones de QKSMS + - An error has occurred, please try again + Se ha producido un error. Por favor, inténtalo de nuevo. QKSMS+ es gratis para los usuarios de F-Droid! Si desea apoyar el desarrollo, no dude en hacer una donación. Donar con PayPal Próximamente diff --git a/presentation/src/main/res/values-fa/strings.xml b/presentation/src/main/res/values-fa/strings.xml index 8cd0b8e7..ca895955 100644 --- a/presentation/src/main/res/values-fa/strings.xml +++ b/presentation/src/main/res/values-fa/strings.xml @@ -61,6 +61,7 @@ نیاز به اجازه QKSMS برای ارسال و مشاهده پیام‌ها نیاز به اجازه دارد QKSMS نیاز به اجازه برای مشاهده مخاطبین شما دارد + QKSMS needs permission to display notifications اجازه صندوق ورودی بایگانی شده @@ -145,24 +146,26 @@ پشتیبان‌گیری و بازیابی پشتیبان‌گیری از پیام‌ها بازگرداندن پشتیبان - اخرین پشیبان گیری در حال بارگذاری… هرگز + Backup location + Set folder بازگردانی یک پشتیبان را برگزینید لطفاً QKSMS + را باز کنید تا از امکانات پشتیبان و بازیابی بهره ببرید پشتیبان‌گیری در حال انجام است… بازگردانی در حال انجام است… بازگردانی از نسخه پشتیبان - آیا مطمئن هسیتد که می‌خواهید پیام‌هایتان را از این پشتيبان بازگردانی کنید؟ بازگردانی را متوقف کن پیام‌هایی که قبلا بازگردانی شده‌اند در دستگاه شما باقی خواهند ماند + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details پشتیبان‌ها نسخه پشتیبانی یافت نشد - - %d پیام - %d پیام - در حال حاضر ، فقط پشتیبان‌گیری و بازگردانی پیامک پشتیبانی می شود. پشتیبان‌گیری و برنامه‌ریزی برای پشتیبان‌گیری از MMS به زودی ارائه می شود! اکنون پشتیبان‌گیری کن در حال تجزیه پشتیبان… @@ -262,7 +265,7 @@ مدیریت انسداد QKSMS عملکرد مسدود کننده داخلی در QKSMS - Block spam messages, numbers & unknown calls with blacklist & Schedule + مسدود کردن پیام های هرزنامه، شماره ها و تماس های ناشناخته توسط لیست سیاه و جدول زمان بندی تماس ها و پیام های خود را بطور خودکار فیلتر کنید! IQ Community به شما اجازه می دهد تا از پیام های ناخواسته توسط اسپمرهای شناخته شده در جامعه جلوگیری کنید با استفاده از برنامه «آیا باید جواب بدم»، پیام‌ها را از شماره های ناخواسته به طور خودکار فیلتر کنید کپی شماره های مسدود شده @@ -301,7 +304,7 @@ نسخه پیشرفته و حمایت به‌ازای %1$s %2$s سپاس از شما برای حمایت از QKSMS! حال شما به همه امکانات QKSMS+ دسترسی دارید - An error has occurred, please try again + خطایی رخ داده است، لطفاً دوباره امتحان کنید QKSMS+ برای کاربران F-Droid رایگان است! اگر می‌خواهید از توسعه حمایت کنید، از کمک مالی بسیار قدردانی می‌شود. از طریق PayPal کمک مالی کنید به زودی diff --git a/presentation/src/main/res/values-fi/strings.xml b/presentation/src/main/res/values-fi/strings.xml index feb834ae..a5b80325 100644 --- a/presentation/src/main/res/values-fi/strings.xml +++ b/presentation/src/main/res/values-fi/strings.xml @@ -61,6 +61,7 @@ Käyttöoikeus tarvitaan QKSMS tarvitsee oikeuden tekstiviestien lähettämiseen ja tarkastelemiseen QKSMS tarvitsee oikeuden yhteystietojesi tarkatelemiseen + QKSMS needs permission to display notifications Salli Saapuneet Arkistoidut @@ -145,24 +146,26 @@ Varmuuskopioi ja palauta Viestejä varmuuskopioidaan Viestejä palautetaan - Viimeisin varmuuskopio Ladataan… Ei koskaan + Backup location + Set folder Palauta Valitse varmuuskopio Ole hyvä ja avaa QKSMS+ käyttääksesi varmuuskopiointia ja palautusta Varmuuskopiointi käynnissä… Palautus käynnissä… Palauta varmuuskopiosta - Oletko varma, että haluat palauttaa viestisi tästä varmuuskopiosta? Pysäytä palautus Aiemmin palautetut viestit pysyvät laitteellasi + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Varmuuskopiot Varmuuskopioita ei löytynyt - - %d viesti - %d viestiä - Vain tekstiviestejä voidaan varmuuskopioita ja palauttaa tällä hetkellä. Tuki multimediaviesteille ja varmuuskopiointien ajastus tulevat pian! Varmuuskopioi nyt Varmuuskopiota jäsennetään… diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml index a6e0db82..fb36de83 100644 --- a/presentation/src/main/res/values-fr/strings.xml +++ b/presentation/src/main/res/values-fr/strings.xml @@ -61,6 +61,7 @@ Autorisation requise QKSMS a besoin de l\'autorisation d’envoyer et de consulter des messages SMS QKSMS a besoin de l\'autorisation d\'accéder aux contacts + QKSMS needs permission to display notifications Autoriser Boite de réception Archivées @@ -145,24 +146,26 @@ Sauvegarde et restauration Sauvegarde des messages Restaurer à partir d\'une sauvegarde - Dernière sauvegarde Chargement… Jamais + Backup location + Set folder Restauration Sélectionner une sauvegarde Déverrouillez QKSMS+ pour utiliser la sauvegarde et la restauration Sauvegarde en cours… Restauration en cours… Restaurer à partir d’une sauvegarde - Êtes-vous sûr de vouloir restaurer vos messages à partir de cette sauvegarde ? Arrêter la restauration Les messages qui ont déjà été restaurés resteront sur votre appareil + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Sauvegardes Aucune sauvegarde trouvée - - %d message - %d messages - Actuellement, seulement la sauvegarde et la restauration des SMS sont pris en charge. Les MMS et les sauvegardes planifiées arriveront bientôt ! Sauvegarder maintenant Analyse de la sauvegarde… @@ -262,7 +265,7 @@ Gestionnaire de blocage QKSMS Fonction de blocage intégrée dans QKSMS - Block spam messages, numbers & unknown calls with blacklist & Schedule + Bloquer les spams, les numéros & les appels inconnus avec une liste noire & Planifier Filtrez automatiquement vos appels et vos messages dans un seul endroit pratique ! La communauté IQ™ vous permet d\'éviter les messages indésirables des spammeurs connus de celle-ci Filtrer automatiquement les messages de numéros non sollicités à l’aide de l’application « Devrais-je répondre » Copier les numéros bloqués @@ -278,11 +281,11 @@ Bloquer Débloquer - Continuer avec %s et bloquer ce numéro + Continuer à %s et bloquer ce numéro Continuer à %s et bloquer ces numéros - Continuer avec %s et autoriser ce numéro + Continuer à %s et autoriser ce numéro Continuer à %s et autoriser ces numéros À propos @@ -301,7 +304,7 @@ Déverrouiller + faire un don pour %1$s %2$s Merci de soutenir QKSMS ! Vous avez maintenant accès à toutes les fonctionnalités de QKSMS+ - An error has occurred, please try again + Une erreur s\'est produite. Merci de réessayer. QKSMS + est gratuit pour les utilisateurs de F-Droid ! Si vous souhaitez soutenir le développement, n’hésitez pas à faire un don. Faire un don avec PayPal Prochainement diff --git a/presentation/src/main/res/values-gd/strings.xml b/presentation/src/main/res/values-gd/strings.xml new file mode 100644 index 00000000..ea600139 --- /dev/null +++ b/presentation/src/main/res/values-gd/strings.xml @@ -0,0 +1,426 @@ + + + + New conversation + Compose + Shortcut disabled + Archived + Settings + Notifications + Theme + Search inbox… + Type a name or number + Skip + Continue + Add person + Call + Details + Save to gallery + Share + Open navigation drawer + %d selected + Clear + Archive + Unarchive + Delete + Add to contacts + Pin to top + Unpin + Mark read + Mark unread + Block + Syncing messages… + You: %s + Draft + Results in messages + %d messages + Your conversations will appear here + No results + Your archived conversations will appear here + Start new conversation + Love texting again + Make QKSMS your default SMS app + Change + Permission required + QKSMS needs permission to send and view SMS messages + QKSMS needs permission to view your contacts + QKSMS needs permission to display notifications + Allow + Inbox + Archived + Scheduled + Blocking + More + Settings + Help & feedback + Invite friends + Unlock amazing new features, and support development + Enjoying QKSMS? + Share some love and rate us on Google Play! + OKAY! + DISMISS + Delete + + Are you sure you would like to delete this conversation? + Are you sure you would like to delete %d conversations? + Are you sure you would like to delete %d conversations? + Are you sure you would like to delete %d conversations? + + + Copy text + Forward + Delete + + Choose a phone number + %s ∙ Default + Just once + Always + %d selected + %1$d of %2$d results + Send as group message + Recipients and replies will be visible to everyone + This is the start of your conversation. Say something nice! + Contact card + Scheduled for + Selected time must be in the future! + You must unlock QKSMS+ to use scheduled messaging + Added to scheduled messages + Write a message… + Copy text + Forward + Delete + Previous + Next + Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d + Add an attachment + Attach a photo + Take a photo + Schedule message + Attach a contact + Error reading contact + + SIM %1$d (%2$s) selected + %s selected, change SIM card + Send message + Sending… + Delivered %s + Failed to send. Tap to try again + Details + Address copied + Conversation title + Notifications + Theme + Archive + Unarchive + Block + Unblock + Delete conversation + Couldn\'t load media + Saved to gallery + Backup and restore + Backing up messages + Restoring from backup + Loading… + Never + Backup location + Set folder + Restore + Select a backup + Please unlock QKSMS+ to use backup and restore + Backup in progress… + Restore in progress… + Restore from backup + Stop restore + Messages that have already been restored will remain on your device + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details + Backups + No backups found + Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon! + Backup now + Parsing backup… + %d/%d messages + Saving backup… + Syncing messages… + Finished! + Backup and restore + Scheduled + Automatically send a message, at the exact moment you\'d like + Hey! When was your birthday again? + It\'s on December 23rd + Happy birthday! Look at what a great friend I am, remembering your birthday + + Sending on December 23rd  + Schedule a message + Scheduled message + + Send now + Copy text + Delete + + Appearance + General + QK Reply + Theme + Night mode + Pure black night mode + Start time + End time + Automatic contact colors + Font size + Use system font + Automatic emoji + Notifications + Tap to customize + Actions + Button 1 + Button 2 + Button 3 + Notification previews + Wake screen + Vibration + Sound + None + QK Reply + Popup for new messages + Tap to dismiss + Tap outside of the popup to close it + Delayed sending + Swipe actions + Configure swipe actions for conversations + Right swipe + Left swipe + CHANGE + + None + Archive + Delete + Block + Call + Mark read + Mark unread + + Delivery confirmations + Confirm that messages were sent successfully + Signature + Add a signature to the end of your messages + Strip accents + Remove accents from characters in outgoing SMS messages + Mobile numbers only + When composing a message, only show mobile numbers + Delete old messages automatically + Messages will be deleted after the specified number of days + Number of days + Never + Delete old messages automatically? + If you proceed, %1$d messages will be deleted now + + After 1 day + After %d days + After %d days + After %d days + + Send long messages as MMS + If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply + Auto-compress MMS attachments + Sync messages + Re-sync your messages with the native Android SMS database + About QKSMS + Version %s + Debug logging enabled + Debug logging disabled + Enter duration (seconds) + Blocking + Drop messages + Drop incoming messages from blocked senders instead of hiding them + Blocked conversations + Blocking Manager + QKSMS + Built-in blocking functionality in QKSMS + Block spam messages, numbers & unknown calls with blacklist & Schedule + Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers + Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app + Copy blocked numbers + Continue to %s and copy over your existing blocked numbers + Blocked numbers + Your blocked numbers will appear here + Block a new number + Block texts from + Phone number + Block + Blocked messages + Your blocked messages will appear here + Block + Unblock + + Continue to %s and block this number + Continue to %s and block these numbers + Continue to %s and block these numbers + Continue to %s and block these numbers + + + Continue to %s and allow this number + Continue to %s and allow these numbers + Continue to %s and allow these numbers + Continue to %s and allow these numbers + + About + Version + Developer + Source code + Changelog + Contact + License + Copyright + Support development, unlock everything + You can save a starving developer for just %s + + Lifetime upgrade for %1$s %2$s + + Unlock + donate for %1$s %2$s + Thank you for supporting QKSMS! + You now have access to all QKSMS+ features + An error has occurred, please try again + QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated. + Donate via PayPal + Coming soon + Premium themes + Unlock beautiful theme colors not available on the Material Design palette + Custom auto-emoji + Create custom auto-emoji shortcuts + Message backup + Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost + Scheduled messages + Schedule messages to automatically be sent at a specific time and date + Delayed sending + Wait a few seconds before sending your message + Automatic night mode + Enable night mode based on the time of day + Advanced blocking + Block messages that contain keywords or match patterns + Auto-forward + Automatically forward messages from certain senders + Auto-respond + Automatically respond to incoming messages with a preset response + More + QKSMS is under active development, and your purchase will include all future QKSMS+ features! + Loading… + View more conversations + Mark read + Call + Delete + Show more + Show less + Open conversation + Material + HEX + Apply + + None + Archive + Delete + Block + Call + Mark read + Reply + + Yes + Continue + Cancel + Delete + Save + Stop + More + Set + Undo + Copied + Archived conversation + You must unlock QKSMS+ to use this + + New message + %s new messages + %s new messages + %s new messages + + Message not sent + The message to %s failed to send + + System + Disabled + Always on + Automatic + + + Show name and message + Show name + Hide contents + + + Small + Normal + Large + Larger + + + No delay + 3 seconds + 5 seconds + 10 seconds + + + Automatic + 100KB + 200KB + 300KB + 600KB + 1000KB + 2000KB + No compression + + + Okay + Give me a moment + On my way + Thanks + Sounds good + What\'s up? + Agreed + No + Love you + Sorry + LOL + That\'s okay + + diff --git a/presentation/src/main/res/values-hi/strings.xml b/presentation/src/main/res/values-hi/strings.xml index 3ffa4570..7091372a 100644 --- a/presentation/src/main/res/values-hi/strings.xml +++ b/presentation/src/main/res/values-hi/strings.xml @@ -29,26 +29,26 @@ रचना छोड़ जारी रखें - Add person + व्यक्ति जोड़ें कॉल विवरण गैलरी में सहेजें - Share + साझा करें खुला नेविगेशन दराज %d चयनित साफ करें संग्रह असंग्रहित हटाएँ - Add to contacts + संपर्कों में जोड़ें शीर्ष पर पिन करें अनपिन - Mark read - Mark unread + पढ़ा गया मार्क करें + अपठित चिह्नित करें ब्लॉक संदेशों को सिंक्रनाइज़ कर रहा है.. । आप: %s - Draft + प्रारूप संदेशों में परिणाम %d संदेश आपकी बातचीत यहां दिखाई देगी @@ -61,6 +61,7 @@ अनुमति आवश्यक QKSMS भेजने और एसएमएस संदेश देखने के लिए अनुमति की जरूरत है QKSMS अपने संपर्कों को देखने के लिए अनुमति की जरूरत है + QKSMS needs permission to display notifications अनुमति दे इनबॉक्स संग्रहीत @@ -85,10 +86,10 @@ अग्रेषित करें मिटाएँ - Choose a phone number - %s ∙ Default - Just once - Always + फ़ोन नंबर चुनें + %s ∙ चूक + सिर्फ एक बार + हमेशा %d चयनित %1$d के %2$d परिणाम समूह संदेश के रूप में भेजें @@ -117,52 +118,54 @@ प्राप्त: %s वितरित: %s त्रुटि संकेत: %d - Add an attachment + एक अटैचमेंट संलग्न करें चित्र संलग्न करें चित्र खिंचे संदेश अनुसूचित करें - Attach a contact - Error reading contact + एक संपर्क संलग्न करें + संपर्क पढ़ने में त्रुटि - SIM %1$d (%2$s) selected - %s selected, change SIM card + सिम %1$d (%2$s) चयनित + %s चयनित, सिम कार्ड बदलें संदेश भेजें भेज रहा है… %s वितरित भेजने में असफल। पुनः प्रयास करें विवरण - Address copied - Conversation title + पता कॉपी किया गया + वार्तालाप शीर्षक अधिसूचनाएँ थीम संग्रह - Unarchive + संग्रह से निकालें अवरुदध करें - Unblock + अनब्लॉक करें वार्तालाप मिटाऐं - Couldn\'t load media + मीडिया लोड नहीं हो सका गैलरी मैं सेव किया गया है - Backup and restore - Backing up messages - Restoring from backup - पिछला बेकप + बैकअप और पुनर्स्थापना + संदेशों का बैकअप लेना + बैकअप से रीस्टोर करें लोड हो रहा है... कभी नहीं - Restore + Backup location + Set folder + पुनर्स्थापित किसी बैकअप का चयन करें - Please unlock QKSMS+ to use backup and restore + बैकअप का उपयोग करने और पुनर्स्थापित करने के लिए कृपया QKSMS+ अनलॉक करें Backup in progress… - Restore in progress… - Restore from backup - Are you sure you would like to restore your messages from this backup? - Stop restore - Messages that have already been restored will remain on your device + पुनःस्थापन प्रगति में… + बैकअप से रीस्टोर करें + पुनर्स्थापना बंद करो + संदेश जो पहले ही बहाल हो चुके हैं वे आपके डिवाइस पर बने रहेंगे + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details बैकअप कोई बैकअप नहीं मिला - - %d संदेश - %d संदेशें - वर्तमान में, केवल एसएमएस बैकअप और बहाल द्वारा समर्थित है| एमएमएस समर्थन और अनुसूचित बैकअप जल्द ही आ रहा है! अभी बैकअप लें बैकअप पदच्छेद हो रहा है... @@ -182,8 +185,8 @@ निर्धारित संदेश अभी भेजें - Copy text - Delete + टेक्स्ट कॉपी करें + मिटाएँ दिखावट सामान्य @@ -193,12 +196,12 @@ शुद्ध काली रात अंदाज़ शुरुआत समय अंत समय - Automatic contact colors + स्वचालित संपर्क रंग लिखाई का आकर यंत्र ध्वनियां उपयोग करें - Automatic emoji + स्वचालित इमोजी सूचनाएं - Tap to customize + अनुकूलित करने के लिए टैप करें कार्रवाई बटन एक बटन दो @@ -209,59 +212,59 @@ ध्वनियाँ कुछ नहीं QK जवाब - Popup for new messages - Tap to dismiss - Tap outside of the popup to close it - Delayed sending - Swipe actions - Configure swipe actions for conversations + नए संदेशों के लिए पॉपअप + खारिज करने के लिए टैप करें + पॉपअप को बंद करने के लिए उसके बाहर टैप करें + विलंबित भेजें + स्वाइप क्रिया + बातचीत के लिए स्वाइप कार्रवाइयां कॉन्फ़िगर करें दाहिने तरफ से खींचे बायें तरफ से खींचे बदलें - None + कोई नहीं संग्रह मिटायें - Block - Call - Mark read - Mark unread + अवरुदध करें + कॉल + पढ़ा गया मार्क करें + अपठित चिह्नित करें वितरण पुष्टि - Confirm that messages were sent successfully - Signature - Add a signature to the end of your messages + पुष्टि करें कि संदेश सफलतापूर्वक भेजे गए थे + हस्ताक्षर + अपने संदेशों के अंत में एक हस्ताक्षर जोड़ें Strip accents - Remove accents from characters in outgoing SMS messages - Mobile numbers only - When composing a message, only show mobile numbers - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + आउटगोइंग एसएमएस संदेशों में वर्णों से उच्चारण हटाएं + केवल मोबाइल नंबर + संदेश लिखते समय केवल मोबाइल नंबर दिखाएं + पुराने संदेशों को स्वचालित रूप से हटाएं + निर्दिष्ट दिनों के बाद संदेश हटा दिए जाएंगे + दिनों की संख्या + कभी नहीं + पुराने संदेशों को स्वचालित रूप से हटाएं? + अगर आप आगे बढ़ते हैं, तो %1$d संदेशों को अभी हटा दिया जाएगा - After 1 day - After %d days + 1 दिन के बाद + %d दिनों के बाद - Send long messages as MMS - If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply - Auto-compress MMS attachments - Sync messages - Re-sync your messages with the native Android SMS database - About QKSMS + एमएमएस के रूप में लंबे संदेश भेजें + यदि आपके लंबे टेक्स्ट संदेश गलत क्रम में भेजने या भेजने में विफल हो रहे हैं, तो आप उन्हें इसके बजाय एमएमएस संदेशों के रूप में भेज सकते हैं। अतिरिक्त शुल्क लागू हो सकते हैं + एमएमएस अनुलग्नकों को स्व-संपीड़ित करें + संदेशों को समन्वयित करें + अपने संदेशों को मूल एंड्रॉइड एसएमएस डेटाबेस के साथ पुन: समन्वयित करें + QKSMS के बारे में संस्करण %s Debug logging enabled Debug logging disabled - Enter duration (seconds) - Blocking - Drop messages - Drop incoming messages from blocked senders instead of hiding them - Blocked conversations - Blocking Manager + अवधि दर्ज करें (सेकंड) + अवरुद्ध + संदेश छोड़ें + आने वाले संदेशों को छिपाने के बजाय अवरुद्ध प्रेषकों से ड्रॉप करें + अवरुद्ध बातचीत + अवरोध प्रबंधक QKSMS - Built-in blocking functionality in QKSMS + QKSMS में अंतर्निहित अवरोधन कार्यक्षमता Block spam messages, numbers & unknown calls with blacklist & Schedule Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app @@ -271,12 +274,12 @@ Your blocked numbers will appear here Block a new number Block texts from - Phone number - Block - Blocked messages - Your blocked messages will appear here - Block - Unblock + फ़ोन नंबर + अवरुदध करें + अवरुद्ध संदेश + आपके अवरुद्ध संदेश यहां दिखाई देंगे + अवरुदध करें + अनब्लॉक करें Continue to %s and block this number Continue to %s and block these numbers @@ -285,15 +288,15 @@ Continue to %s and allow this number Continue to %s and allow these numbers - About + जानकारी संस्करण - Developer + विकासक श्रोत कोड बदलाव संपर्क लाइसेंस - Copyright - Support development, unlock everything + कॉपीराइट + विकास का समर्थन करें, सब कुछ अनलॉक करें You can save a starving developer for just %s Lifetime upgrade for %1$s %2$s @@ -301,73 +304,73 @@ Unlock + donate for %1$s %2$s Thank you for supporting QKSMS! You now have access to all QKSMS+ features - An error has occurred, please try again - QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated. - Donate via PayPal + एक त्रूटि हुई: कृपया फिर से कोशिश करें + QKSMS+ F-Droid उपयोगकर्ताओं के लिए निःशुल्क है! यदि आप विकास का समर्थन करना चाहते हैं, तो दान की अत्यधिक सराहना की जाएगी। + पेपैल के माध्यम से दान करें जल्द आ रहा है - Premium themes - Unlock beautiful theme colors not available on the Material Design palette - Custom auto-emoji - Create custom auto-emoji shortcuts - Message backup - Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost - Scheduled messages - Schedule messages to automatically be sent at a specific time and date + प्रीमियम थीम + मटीरियल डिज़ाइन पैलेट पर उपलब्ध नहीं होने वाले सुंदर थीम रंगों को अनलॉक करें + कस्टम ऑटो-इमोजी + कस्टम ऑटो-इमोजी शॉर्टकट बनाएं + संदेश बैकअप + अपने संदेशों का स्वचालित रूप से बैकअप लें। यदि आप फ़ोन बदलते हैं या आपका फ़ोन खो जाता है, तो अपना इतिहास खोने के बारे में फिर कभी चिंता न करें + अनुसूचित संदेश + संदेशों को एक विशिष्ट समय और तिथि पर स्वचालित रूप से भेजे जाने के लिए अनुसूचित करें Delayed sending - Wait a few seconds before sending your message - Automatic night mode - Enable night mode based on the time of day - Advanced blocking - Block messages that contain keywords or match patterns - Auto-forward - Automatically forward messages from certain senders - Auto-respond - Automatically respond to incoming messages with a preset response + अपना संदेश भेजने से पहले कुछ सेकंड प्रतीक्षा करें + स्वचालित रात मोड + दिन के समय के आधार पर रात्रि मोड सक्षम करें + उन्नत अवरोधन + कीवर्ड या मिलान पैटर्न वाले संदेशों को ब्लॉक करें + स्व-फ़ॉरवर्ड + कुछ प्रेषकों के संदेशों को स्वचालित रूप से अग्रेषित करें + स्व-प्रतिक्रिया + पूर्व निर्धारित प्रतिक्रिया के साथ आने वाले संदेशों का स्वचालित रूप से जवाब दें अधिक - QKSMS is under active development, and your purchase will include all future QKSMS+ features! + QKSMS सक्रिय विकास के अधीन है, और आपकी खरीदारी में भविष्य की सभी QKSMS+ सुविधाएँ शामिल होंगी! तैयार हो रहा है… अधिक वार्तालाप देखें - Mark read + पढ़ा हुआ चिह्नित करें कॉल मिटायें अधिक दिखाएं कम दिखाएं वार्तालाप खोलें - Material - HEX + सामग्री + हेक्स रंग लागू करें - None - Archive - Delete - Block - Call - Mark read - Reply + कोई नहीं + संग्रह + मिटायें + अवरुदध करें + कॉल + पढ़ा हुआ चिह्नित करें + जवाब दे - Yes - Continue - Cancel - Delete - Save - Stop - More - Set - Undo - Copied - Archived conversation - You must unlock QKSMS+ to use this + हाँ + जारी रखें + रद्द करें + मिटायें + सहेजें + बंद करें + अधिक + सेट करें + पूर्ववत करें + प्रतिलिपि बनाई गई हैं। + संग्रहीत बातचीत + इसका उपयोग करने के लिए आपको QKSMS+ को अनलॉक करना होगा - New message - %s new messages + नई संदेश + %s नए संदेश संदेश नही भेजा गया %s को संदेश भेजने में असफल - System - Disabled - Always on - Automatic + प्रणाली + अक्षम करें + हमेशा चालू + स्वचालित नाम व संदेश दिखाएं @@ -382,32 +385,32 @@ कोइ विलम्ब नही - 3 seconds - 5 seconds - 10 seconds + 3 सेकंड + 5 सेकंड + 10 सेकंड - Automatic - 100KB - 200KB - 300KB - 600KB - 1000KB - 2000KB - No compression + स्वचालित + 100केबी + 200केबी + 300केबी + 600केबी + 1000केबी + 2000केबी + कोई संपीड़न नहीं ठीक एक क्षण दें - On my way + रास्ते में हूं शुक्रिया सही है नया क्या है - Agreed + सहमत हूँ नहीं - Love you + सप्रेम मुझे खेद है - LOL + लोल ठीक है diff --git a/presentation/src/main/res/values-hr/strings.xml b/presentation/src/main/res/values-hr/strings.xml index d0098405..defb28ed 100644 --- a/presentation/src/main/res/values-hr/strings.xml +++ b/presentation/src/main/res/values-hr/strings.xml @@ -18,9 +18,9 @@ ~ along with QKSMS. If not, see . --> - New conversation - Compose - Shortcut disabled + Novi razgovor + Sastavi + Prečac onemogućen Arhivirano Postavke Obavijesti @@ -29,163 +29,165 @@ Unesite ime ili broj Preskoči Nastavi - Add person + Dodaj osobu Nazovi Detalji - Save to gallery - Share - Open navigation drawer + Spremi u galeriju + Podijeli + Otvori navigacijsku ladicu %d odabrano Očisti Arhiviraj Dearhiviraj Izbriši - Add to contacts - Pin to top - Unpin - Mark read - Mark unread + Dodaj kontaktima + Prikvači na vrh + Otkvači + Označi kao pročitano + Označi kao nepročitano Blokiraj - Syncing messages… + Sinkronizacija poruka… Vi: %s - Draft - Results in messages - %d messages - Vaši razgovori će se pojaviti ovdje + Skica + Rezultati u porukama + %d poruka + Vaši razgovori pojavit će se ovdje Nema rezultata Vaši arhivirani razgovori će se pojaviti ovdje Započni novi razgovor - Love texting again - Make QKSMS your default SMS app - Change - Permission required - QKSMS needs permission to send and view SMS messages - QKSMS needs permission to view your contacts - Allow + Ponovno zavolite poruke + Postavite QKSMS kao zadanu aplikaciju za SMS-ove + Promijeni + Potrebne su dozvole + QKSMS treba dozvolu za slanje i pregledavanje SMS poruka + QKSMS treba dozvolu za pregledavanje vaših kontakata + QKSMS needs permission to display notifications + Dopusti Poruke Arhivirano Zakazano - Blocking + Blokiranje  Više Postavke Pomoć i povratne informacije - Invite friends - Unlock amazing new features, and support development + Pozovi prijatelje + Otključajte čudesne nove značajke i podržite razvoj Uživate u QKSMS? Podijelite malo ljubavi i ocijenite nas na Google Playu! U REDU! ODBACI Izbriši - Are you sure you would like to delete this conversation? - Are you sure you would like to delete %d conversations? - Are you sure you would like to delete %d conversations? + Sigurno želite izbrisati ovaj razgovor? + Sigurno želite izbrisati %d razgovora? + Sigurno želite izbrisati %d razgovora? Kopiraj tekst Proslijedi Izbriši - Choose a phone number - %s ∙ Default - Just once - Always + Odaberite telefonski broj + %s ∙ zadano + Samo jednom + Uvijek %d odabrano - %1$d of %2$d results - Send as group message - Recipients and replies will be visible to everyone + Rezultat %1$d od %2$d + Pošalji kao grupnu poruku + Primatelji i odgovori bit će vidljivi svima Ovo je početak vašeg razgovora. Recite nešto lijepo! - Contact card - Scheduled for - Selected time must be in the future! - You must unlock QKSMS+ to use scheduled messaging - Added to scheduled messages + Kartica kontakta + Zakazano za + Odabrano vrijeme mora biti u budućnosti! + Morate otključati QKSMS+ za zakazivanje poruke + Dodano u zakazane poruke Napiši poruku… Kopiraj tekst Proslijedi Izbriši - Previous - Next - Clear - Message details - Type: %s - From: %s - To: %s - Subject: %s - Priority: %s - Size: %s - Sent: %s - Received: %s - Delivered: %s - Error code: %d + Prethodno + Sljedeće + Očisti + Detalji poruke + Vrsta: %s + Od: %s + Za: %s + Predmet: %s + Prioritet: %s + Veličina: %s + Poslano: %s + Primljeno: %s + Dostavljeno: %s + Kod greške: %d Dodaj privitak Priloži fotografiju - Uslikaj fotografiju - Schedule message - Attach a contact - Error reading contact + Snimi fotografiju + Zakaži poruku + Priloži kontakt + Greška kod čitanja kontakta - SIM %1$d (%2$s) selected - %s selected, change SIM card + SIM %1$d (%2$s) odabran + %s odabrano, promijeni SIM karticu Pošalji poruku Slanje… Isporučeno %s Slanje nije uspjelo. Dodirnite da biste pokušali ponovno Detalji - Address copied - Conversation title + Adresa kopirana + Naslov razgovora Obavijesti Tema - Arhiva + Arhiviraj Dearhiviraj Blokiraj Deblokiraj Izbriši razgovor - Couldn\'t load media - Saved to gallery - Backup and restore - Backing up messages - Restoring from backup - Last backup - Loading… - Never - Restore - Select a backup - Please unlock QKSMS+ to use backup and restore - Backup in progress… - Restore in progress… - Restore from backup - Are you sure you would like to restore your messages from this backup? - Stop restore - Messages that have already been restored will remain on your device - Backups - No backups found - - %d message - %d messages - %d messages - - Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon! - Backup now - Parsing backup… - %d/%d messages - Saving backup… - Syncing messages… - Finished! - Backup and restore - Scheduled - Automatically send a message, at the exact moment you\'d like - Hey! When was your birthday again? - It\'s on December 23rd - Happy birthday! Look at what a great friend I am, remembering your birthday + Nije moguće učitati medijske datoteke + Spremljeno u galeriju + Sigurnosno kopiranje i vraćanje + Sigurnosno kopiranje poruka + Vraćanje podataka iz sig. kopije + Učitavanje… + Nikad + Backup location + Set folder + Vraćanje + Odaberite sig. kopiju + Otključajte QKSMS+ za korištenje sig. kopiranja i vraćanja podataka + Sigurno kopiranje u tijeku… + Vraćanje podataka u tijeku… + Vrati iz sigurnosne kopije + Zaustavi vraćanje + Poruke koje su već vraćene ostat će na vašem uređaju + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details + Sigurnosne kopije + Nisu pronađene sigurnosne kopije + Trenutno je samo SMS podržan u sigurnosnom kopiranju i vraćanju. Podrška za MMS i zakazane sigurnosne kopije dolazi uskoro! + Sig. kopiraj sada + Analiziranje sig. kopije… + %d/%d poruka + Spremanje sigurnosne kopije… + Sinkronizacija poruka… + Dovršeno! + Sig. kopiranje i vraćanje + Zakazano + Automatski šaljite poruku u točno određeno vrijeme + Bok! Kad ti je bio rođendan? + 23. prosinca + Sretan rođendan! Vidi kako sam dobra prijateljica, zapamtila tvoj rođendan - Sending on December 23rd  - Schedule a message - Scheduled message + Slanje 23. prosinca + Zakaži poruku + Zakazana poruka - Send now - Copy text - Delete + Pošalji sada + Kopiraj tekst + Izbriši Izgled Općenito @@ -195,119 +197,119 @@ Potpuno crni noćni način Vrijeme početka Vrijeme završetka - Automatic contact colors + Automatske boje kontakata Veličina fonta - Koristi sustavski font - Automatsk emoji + Koristi font sustava + Automatski emoji Obavijesti - Tap to customize - Actions - Button 1 - Button 2 - Button 3 + Dodirnite za prilagođavanje + Radnje + Tipka 1 + Tipka 2 + Tipka 3 Pregledi obavijesti - Wake screen + Uključi zaslon Vibracija Zvuk - None + Nema QK odgovor Skočni prozor za nove poruke Dodirnite za odbacivanje Dodirnite izvan skočnog prozora za zatvaranje - Delayed sending - Swipe actions - Configure swipe actions for conversations - Right swipe - Left swipe - CHANGE + Odgođeno slanje + Radnje poteza + Konfigurirajte radnje poteza za razgovore + Desni potez + Lijevi potez + PROMIJENI - None - Archive - Delete - Block - Call - Mark read - Mark unread + Nema + Arhiviraj + Izbriši + Blokiraj + Nazovi + Označi kao pročitano + Označi kao nepročitano Potvrde o dostavi Budite sigurni da su se poruke uspješno poslale - Signature - Add a signature to the end of your messages - Strip naglasci + Potpis + Dodajte potpis na kraj vaših poruka + Uklanjanje naglasaka Uklonite naglaske sa znakova u odlaznim SMS porukama - Mobile numbers only - When composing a message, only show mobile numbers - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + Samo mobilni brojevi + Kod sastavljanja poruke, prikaži samo mobilne brojeve + Izbriši stare poruke automatski + Poruke bit će izbrisane nakon odabranog broja dana + Broj dana + Nikad + Brisati stare poruke automatski? + Ako nastavite, sada će biti izbrisan sljedeći broj poruka: %1$d - After 1 day - After %d days - After %d days + Nakon 1 dana + Nakon %d dana + Nakon %d dana - Send long messages as MMS - If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply - Auto-compress MMS attachments + Šalji duge poruke kao MMS + Ako imate probleme sa slanjem dužih poruka ili ako se šalju krivim redoslijedom, možete ih poslati kao MMS poruke. Možda će doći do dodatnih troškova + Automatski kompresiraj MMS priloge Uskladi poruke - Ponovno uskladite svoje poruke sa nativnom Android SMS bazom podataka - O aplikaciji + Ponovno uskladite svoje poruke s Androidovom nativnom bazom SMS-ova + O QKSMS-u Verzija %s - Debug logging enabled - Debug logging disabled - Enter duration (seconds) - Blocking - Drop messages - Drop incoming messages from blocked senders instead of hiding them - Blocked conversations - Blocking Manager + Omogućen zapisnik za ispravljanje grešaka + Onemogućen zapisnik za ispravljanje grešaka + Unesite trajanje (sekunde) + Blokiranje + Odbaci poruke + Odbacite dolazne poruke od blokiranih pošiljatelja umjesto da ih samo sakrivate + Blokirani razgovori + Upravitelj za blokiranje QKSMS - Built-in blocking functionality in QKSMS - Block spam messages, numbers & unknown calls with blacklist & Schedule - Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers - Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app - Copy blocked numbers - Continue to %s and copy over your existing blocked numbers - Blocked numbers - Your blocked numbers will appear here - Block a new number - Block texts from - Phone number - Block - Blocked messages - Your blocked messages will appear here - Block - Unblock + Ugrađena funkcionalnost blokiranja u QKSMS-u + Blokirajte neželjene poruke, brojeve i nepoznate pozive pomoću crne liste i zakazivanja + Automatski filtrirajte svoje pozive i poruke na jednom mjestu! Community IQ™ omogućuje vam filtriranje neželjenih poruka od spammera poznatih zajednici + Automatski filtrirajte poruke od neželjenih brojeva pomoću aplikacije \"Should I Answer\" + Kopiraj blokirane brojeve + Nastavite na %s i kopirajte svoje postojeće blokirane brojeve + Blokirani brojevi + Vaši blokirani brojevi pojavit će se ovdje + Blokiraj novi broj + Blokiraj poruke od + Telefonski broj + Blokiraj + Blokirane poruke + Vaše blokirane poruke pojavit će se ovdje + Blokiraj + Odblokiraj - Continue to %s and block this number - Continue to %s and block these numbers - Continue to %s and block these numbers + Nastavi na %s i blokiraj ovaj broj + Nastavi na %s i blokiraj ove brojeve + Nastavi na %s i blokiraj ove brojeve - Continue to %s and allow this number - Continue to %s and allow these numbers - Continue to %s and allow these numbers + Nastavi na %s i dopusti ovaj broj + Nastavi na %s i dopusti ove brojeve + Nastavi na %s i dopusti ove brojeve O aplikaciji Verzija - Autor + Razvijatelj Izvorni kod Popis promjena Kontakt - Licenca + Licencija Autorska prava Podržite razvoj, otključajte sve Možete spasiti izgladnjelog programera za samo %s Doživotna nadogradnja za %1$s %2$s - Otključajte + za %1$s %2$s + Otključajte + donirajte za %1$s %2$s Hvala vam za podržavanje QKSMS! Sada imate pristup svim QKSMS+ značajkama - An error has occurred, please try again - QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated. + Dogodila se greška, pokušajte ponovno + QKSMS+ ke besplatan za korisnike F-Droida! Ako želite podržati razvoj, vrlo smo zahvalni na donacijama. Donirajte putem PayPala Uskoro dolazi Premium teme @@ -317,7 +319,7 @@ Sigurnosno kopiranje poruka Automatski sigurnosno kopirajte svoje poruke. Nikad više nemojte brinuti zbog gubitka povijesti ako promijenite telefon ili ga izgubite Zakazane poruke - Schedule messages to automatically be sent at a specific time and date + Zakažite poruke za automatsko slanje u specificirano vrijeme Odgođeno slanje Pričekajte nekoliko sekundi prije slanja poruke Automatski noćni način @@ -329,91 +331,91 @@ Automatsko odgovaranje Automatski odgovorite na poruke sa prilagođenim odgovorima  Više - QKSMS is under active development, and your purchase will include all future QKSMS+ features! + QKSMS aktivno se razvija i vaša kupnja sadržat će sve buduće QKSMS+ značajke! Učitavanje… - View more conversations - Mark read - Call - Delete - Show more - Show less - Open conversation + Prikaži više razgovora + Označi kao pročitano + Nazovi + Izbriši + Prikaži više + Prikaži manje + Otvori razgovor Materijalna HEX - Apply + Primijeni - None - Archive - Delete - Block - Call - Mark read - Reply + Nema + Arhiviraj + Izbriši + Blokiraj + Nazovi + Označi kao pročitano + Odgovori - Yes - Continue + Da + Nastavi Odustani Izbriši - Save - Stop + Spremi + Zaustavi  Više - Set + Postavi Poništi Kopirano Razgovor je arhiviran Morate otključati QKSMS+ za korištenje ovog - New message - %s new messages - %s new messages + Nova poruka + %s nove poruke + %s novih poruka Poruka nije poslana - Poruku %s se nije uspjela poslati + Poruka za %s nije se uspjela poslati - System - Disabled - Always on - Automatic + Sustav + Onemogućeno + Uvijek uključeno + Automatski - Show name and message - Show name - Hide contents + Prikaži ime i poruku + Prikaži ime + Sakrij sadržaj - Small - Normal - Large - Larger + Malo + Normalno + Veliko + Veće - No delay - 3 seconds - 5 seconds - 10 seconds + Bez odgode + 3 sekunde + 5 sekundi + 10 sekundi - Automatic + Automatski 100KB 200KB 300KB 600KB 1000KB 2000KB - No compression + Bez kompresije - Okay - Give me a moment - On my way - Thanks - Sounds good - What\'s up? - Agreed - No - Love you - Sorry + U redu + Samo trenutak + Na putu sam + Hvala + Zvuči dobro + Što ima? + Slažem se + Ne + Volim te + Oprosti LOL - That\'s okay + U redu je diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml index 99c29c24..6fafb51b 100644 --- a/presentation/src/main/res/values-hu/strings.xml +++ b/presentation/src/main/res/values-hu/strings.xml @@ -43,8 +43,8 @@ Hozzáadás az ismerősökhöz Rögzítés a tetejére Rögzítés törlése - Mark read - Mark unread + Megjelölés olvasottként + Megjelölés olvasatlanként Tiltás Üzenetek szinkronizálása… Te: %s @@ -61,6 +61,7 @@ Engedély szükséges A QKSMS-nek engedélyt kell kapnia az SMS üzenetek küldésére és megtekintésére A QKSMS-nek engedélyt kell kapnia a telefonkönyv megtekintésére + QKSMS needs permission to display notifications Engedélyez Bejövő üzenetek Archivált @@ -124,7 +125,7 @@ Személy hozzáadása Hiba a személy olvasása közben - SIM %1$d (%2$s) selected + SIM %1$d (%2$s) kiválasztva %s kiválasztva, cserélj SIM kártyát Üzenet küldése Küldés… @@ -145,24 +146,26 @@ Mentés és visszaállítás Üzenetek mentése Üzenetek visszaállítása mentésből - Utolsó mentés Betöltés… Soha + Backup location + Set folder Visszaállítás Válassz egy mentést Oldd fel a QKSMS+-t a mentés és visszaállítás használatához Mentés folyamatban… Visszaállítás folyamatban… Visszaállítás mentésből - Biztos vagy benne hogy vissza akarod állítani a mentésből a üzeneteket? Visszaállítás megállítása A már visszaállított üzenetek a készülékeden maradnak + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Mentések Nincsenek mentések - - %d üzenet - %d üzenet - Jelenleg a mentés csak az SMS üzeneteket menti. Az MMS támogatás és az időzített mentések hamarosan jönnek! Mentés most Mentés elemzése… @@ -222,10 +225,10 @@ Nincs Archiválás Törlés - Block - Call - Mark read - Mark unread + Blokkolás + Hívás + Megjelölés olvasottként + Megjelölés olvasatlanként Elküldés megerősítése Megerősíti, hogy az üzenetek sikeresen el lettek-e küldve @@ -235,15 +238,15 @@ A kimenő SMS-üzenetek ékezetes karaktereinek átalakítása Csak mobilszámok Üzenet írásánál csak a mobilszámokat mutassa - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + Régi üzenetek automatikus törlése + Az üzenetek törlődnek pár nap múlva + Napok száma + Soha + Szeretné törölni a régi üzeneteket automatikusan? + Ha folytatod, %1$d üzenet törlődik - After 1 day - After %d days + 1 nap múlva + %d nap múlva A hosszú üzenetek MMS-ként küldése Ha a hosszabb üzenetek küldése sikertelen, vagy rossz sorrendben érkeznek akkor lehet őket MMS-ként küldeni, de ez díjköteles lehet @@ -262,7 +265,7 @@ Tiltáskezelő QKSMS A QKSMS beépített tiltási funkciója - Block spam messages, numbers & unknown calls with blacklist & Schedule + Spam üzenetek blokkolása, számok & ismeretlek hívások feketelistával & Ütemezés Egy kényelmesen kezelhető helyen a hívások és üzenetek szűrése! A Community IQ™ megakadályozza a közösség által ismert spammerek üzeneteit Automatikusan szűrheti az üzeneteket a nem kívánt számok alapján a \"Should I Answer\" alkalmazás használatával Tiltott számok másolása @@ -301,7 +304,7 @@ Minden funkció engedélyezése + adomány %1$s %2$s Köszönjük, hogy támogatot a QKSMS-t! MOst hozzáférsz minden QKSMS+ funkcióhoz - An error has occurred, please try again + Hiba történt, kérjük próbáld újra A QKSMS+ minden F-Droid felhasználónak ingyenes. Ha támogatni szeretnéd a fejlesztést az alábbi módon megteheted. Támogatás PayPalon keresztül Hamarosan @@ -327,7 +330,7 @@ A QKSMS folyamatos fejlesztés alatt áll és a vásárlásod a jövőbeni QKSMS+ funkciókat is tartalmazza! Betöltés… További társalgások megtekintése - Mark read + Megjelölés olvasottként Hívás Törlés Több megjelenítése @@ -338,12 +341,12 @@ Alkalmaz Nincs - Archive - Delete - Block - Call - Mark read - Reply + Arhiválás + Törlés + Blokkolás + Hívás + Megjelölés olvasottként + Válasz Igen Folytatás @@ -382,19 +385,19 @@ Nincs késleltetés - 3 seconds - 5 seconds - 10 seconds + 3 másodperc + 5 másodperc + 10 másodperc - Automatic - 100KB + Automatikus + 100 KB 200KB 300KB 600KB 1000KB 2000KB - No compression + Nincs tömörítés Oké diff --git a/presentation/src/main/res/values-in/strings.xml b/presentation/src/main/res/values-in/strings.xml index 6bab7845..b6565b36 100644 --- a/presentation/src/main/res/values-in/strings.xml +++ b/presentation/src/main/res/values-in/strings.xml @@ -61,6 +61,7 @@ Membutuhkan izin QKSMS membutuhkan izin untuk mengirim dan membaca pesan SMS QKSMS membutuhkan izin untuk membaca kontak anda + QKSMS needs permission to display notifications Izinkan Kotak masuk Diarsipkan @@ -144,23 +145,26 @@ Cadangan dan pemulihan Mencadangankan pesan Memulihkan cadangan pesan - Cadangan terakhir Memuat… Tidak pernah + Backup location + Set folder Pulihkan Pilih cadangan Silakan buka akses QKSMS+ untuk menggunakan fitur cadangan dan pemulihan Pencadangan sedang berlangsung… Pemulihan sedang berlangsung… Pulihkan dari cadangan - Apakah anda yakin ingin memulihkan pesan anda dari cadangan ini? Setop pemulihan Pesan yang telah dipulihkan akan tetap berada di perangkat anda + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Cadangan Cadangan tidak ditemukan - - %d pesan - Saat ini, Cadangan dan Pemulihan hanya mendukung pesan SMS. Dukungan MMS dan cadangan terjadwal akan segera datang! Cadangkan sekarang Membaca cadangan… @@ -259,7 +263,7 @@ Pengelola Pemblokiran QKSMS Fitur pemblokiran pesan di dalam QKSMS - Block spam messages, numbers & unknown calls with blacklist & Schedule + Blokir pesan spam, nomor & panggilan tak dikenal dengan daftar hitam & Jadwal Otomatis menyaring panggilan dan pesan di dalam satu tempat! Community IQ™ memungkinkan anda memblokir pesan yang tidak diinginkan dari daftar spammer Secara otomatis menyaring pesan dari nomor yang tidak diinginkan menggunakan aplikasi \"Should I Answer\" Salin nomor yang diblokir @@ -296,7 +300,7 @@ Unlock + donate for %1$s %2$s Terima kasih telah mendukung QKSMS! Anda sekarang bisa mengakses semua fitur QKSMS+ - An error has occurred, please try again + Telah terjadi kesalahan, silakan coba kembali QKSMS+ selalu gratis untuk pengguna F-Droid! Jika anda ingin mendukung pengembangan, jangan ragu untuk donasi. Donasi via PayPal Segera hadir diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml index 14fd3ba3..a89d2857 100644 --- a/presentation/src/main/res/values-it/strings.xml +++ b/presentation/src/main/res/values-it/strings.xml @@ -61,6 +61,7 @@ Autorizzazione necessaria QKSMS ha bisogno dell\'autorizzazione per inviare e visualizzare gli SMS QKSMS ha bisogno dell\'autorizzazione per visualizzare i tuoi contatti + QKSMS needs permission to display notifications Consenti Ricevuti Archiviati @@ -145,24 +146,26 @@ Backup e ripristino Backup dei messaggi Ripristino da backup - Ultimo backup Caricamento… Mai + Backup location + Set folder Ripristino Selezionare un backup Si prega di sbloccare QKSMS + per utilizzare backup e ripristino Backup in corso… Ripristino in corso… Ripristino da backup - Sei sicuro che desideri ripristinare i messaggi da questo backup? Interrompi il ripristino I messaggi che sono già stati ripristinati rimarranno sul tuo dispositivo + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Backups Nessun backup trovato - - %d messaggio - %d messaggi - Attualmente Backup e Restore supportano solo gli SMS. Il supporto per gli MMS ed i backup schedulati arriverà presto! Backup adesso L\'analisi del backup… diff --git a/presentation/src/main/res/values-iw/strings.xml b/presentation/src/main/res/values-iw/strings.xml index ad00c610..c11f6025 100644 --- a/presentation/src/main/res/values-iw/strings.xml +++ b/presentation/src/main/res/values-iw/strings.xml @@ -61,6 +61,7 @@ נדרשת הרשאה ל־QKSMS נדרשות הרשאות כדי לשלוח ולצפות במסרונים ל־QKSMS נדרשות הרשאות כדי לצפות באנשי הקשר שלך + ל־QKSMS דרושות הרשאות כדי להציג התראות אפשר דואר נכנס בארכיון @@ -147,26 +148,26 @@ גיבוי ושחזור מגבה הודעות משחזר מגיבוי - גיבוי אחרון טוען… לעולם לא + מיקום הגיבוי + הגדרת תיקייה שחזור בחר גיבוי נא לשחרר את QKSMS+‎ כדי להשתמש בגיבוי ובשחזור מתבצע גיבוי… מתבצע שחזור… שחזר מגיבוי - אתה בטוח שברצונך לשחזר את ההודעות שלך מגיבוי זה? עצור שחזור הודעות שכבר שוחזרו יישארו במכשיר שלך + בחירת מיקום לשמירת הגיבוי + נא לבחור תיקייה אלייה יישמרו הגיבויים שלך + %1$s\n%2$d הודעות + שגיאה + לא ניתן לקרוא את קובץ הגיבוי + פרטי גיבוי גיבויים לא נמצאו גיבויים - - הודעה %d - %d הודעות - %d הודעות - %d הודעות - נכון לעכשיו, קיימת תמיכה בהודעות מסוג SMS בתכונת הגיבוי והשחזור. תמיכה ב־MMS וגיבויים מתוזמנים יגיעו בעתיד הקרוב! גבה כעת הגיבוי מפוענח… diff --git a/presentation/src/main/res/values-ja/strings.xml b/presentation/src/main/res/values-ja/strings.xml index 0bd3df74..997b14ab 100644 --- a/presentation/src/main/res/values-ja/strings.xml +++ b/presentation/src/main/res/values-ja/strings.xml @@ -19,65 +19,66 @@ --> 新しい会話 - メッセージを書く - 無効にするショートカット - アーカイブ済 + 新規作成 + ショートカットが無効です + アーカイブ済み 設定 通知 テーマ 受信トレイを検索… - 作成 + 名前または電話番号を入力 スキップ 続行 - 人を追加 + 人物を追加 通話 詳細 ギャラリーに保存 共有 - ナビゲーション引き出しを開く - %d 選択された - 消去しました + ナビゲーションドロワーを開く + %d 件を選択中 + 消去 アーカイブ - アーカイブしない + アーカイブ解除 削除 連絡先に追加 - 上部に固定します。 - 固定を解除します。 + 上部に固定 + 固定を解除 既読にする 未読にする ブロック - 同期メッセージ… + メッセージを同期しています... あなた: %s - ドラフト - メッセージの結果 - %d メッセージ + 下書き + メッセージ内の検索結果 + %d 件のメッセージ 会話がここに表示されます - 結果はありません + 検索結果がありません 保存した会話がここに表示されます - 新しい会話を開始します。 - もう一度テキストメッセージが大好き - QKSMS を既定の SMS アプリに設定する + 新しい会話を開始 + もう一度テキストメッセージが好きになる + QKSMS を既定の SMS アプリに設定 変更 - 必要なアクセス許可 - QKSMSはSMSメッセージを送信および表示する権限を必要とします - QKSMSはあなたの連絡先を閲覧する許可を必要とします - 許可する + アクセス権限を許可してください + QKSMS は SMS メッセージを送信および表示する権限を必要とします + QKSMS はあなたの連絡先を閲覧する権限を必要とします + QKSMS は通知を表示する権限を必要とします + 許可 受信トレイ - アーカイブ済 - スケジュール済 + アーカイブ済み + 送信予約済み ブロック もっと 設定 ヘルプとフィードバック - 友達を招待する - 驚くべき新機能のロックを解除し、開発をサポート - QKSMS をお楽みいただいていますか? - Google Play で愛を共有して私たちを評価してください! - OK! - 免じる + 友達を招待 + 素敵な新機能を解放して、開発をサポート + QKSMS をお楽みいただいていますか? + Google Play で愛を共有して私たちを評価してください! + OK! + 非表示 削除 - %d の会話を削除するよろしいですか。 + 本当に %d 件の会話を削除しますか? テキストをコピー @@ -86,20 +87,20 @@ 電話番号を選択 %s ∙ デフォルト - 一回だけ + 1 回だけ 常に - %d件を選択中 - %2$d 結果の %1$d - グループ メッセージとして送信します。 - 受信者と返信は全員に表示されます - これが会話の始まりです。 何か素敵なことを言ってください! + %d 件を選択中 + %2$d 件中 %1$d 件の結果 + グループ メッセージとして送信 + 宛先と返信は全員に表示されます + これが会話の始まりです。何か素敵なことを言ってください! 連絡先カード - 予定されている - 選択した時間は、将来的にする必要があります! - あなたのロックを解除する必要があります QKSMS + スケジュールされたメッセージングを使用するには - スケジュールされたメッセージに追加 - メッセージを書く… - テキストのコピー + 送信予約 + 今より先の時間を選択してください! + メッセージの送信予約には、QKSMS+ のロックを解除する必要があります + 送信予約メッセージに追加されました + メッセージを書いてください… + テキストをコピー 転送 削除 前へ @@ -107,25 +108,25 @@ 消去 メッセージの詳細 タイプ: %s - 宛先: %s + 差出人: %s 宛先:%s 件名: %s - 優先順位: %s + 優先度: %s サイズ: %s - 送られた: %s - 受け取った: %s - 配達: %s - エラーコード:%d - 添付ファイルを追加する - 写真を添付する + 送信: %s + 受信: %s + 配信: %s + エラーコード: %d + 添付ファイルを追加 + 写真を添付 写真を撮る - スケジュールメッセージ - 連絡先を添付する + メッセージの送信を予約 + 連絡先を添付 連絡先の読み取りエラー SIM %1$d (%2$s) を選択しました - %s 選択、SIMカードを交換 - メッセージを送る + %s 選択、SIM カードを変更 + メッセージを送信 送信中… %s を配信しました 送信に失敗しました。タップすると、もう一度やり直します @@ -137,47 +138,50 @@ アーカイブ アーカイブ解除 ブロック - ブロックを解除 + ブロック解除 会話を削除 メディアを読み込めませんでした ギャラリーに保存 バックアップと復元 - メッセージをバックアップする - バックアップからの復元 - 最後のバックアップ - ロード中... - 決して - リストア + メッセージをバックアップしています + バックアップから復元 + 読み込み中... + なし + バックアップの場所 + フォルダーを設定 + 復元 バックアップを選択 - バックアップと復元を使用するにはQKSMS+のロックを解除してください + バックアップと復元を使用するには QKSMS+ のロックを解除してください バックアップ中… 復元中… バックアップから復元 - このバックアップからメッセージを復元してもよろしいですか? - 復元を停止する + 復元を停止 既に復元されたメッセージはあなたのデバイスに残ります + バックアップの場所を選択 + バックアップを保存するフォルダーを選択してください + %1$s\n%2$d メッセージ + エラー + バックアップファイルを読み込めませんでした + バックアップの詳細 バックアップ バックアップが見つかりません - - %d メッセージ - - 現在、SMSのみがバックアップと復元でサポートされています。 MMSのサポートと定期的なバックアップは近日中に開始されます。 + 現在、SMS のみバックアップと復元に対応しています。 MMS 対応と定期バックアップは近日中に公開されます! 今すぐバックアップ - バックアップの解析中... - %d/%dすべてのメッセージ + バックアップを解析中... + %d 件/%d 件のメッセージ バックアップを保存しています... メッセージを同期しています... - 終了しました。 + 終了しました! バックアップと復元 - 予定 - 希望する瞬間に自動的にメッセージを送信する + 予約 + 希望する瞬間に自動的にメッセージを送信 ちょっと!あなたの誕生日はいつでしたか? - 12月23日です - お誕生日おめでとうございます! 私はあなたの誕生日を思い出して、何という素晴らしい友達なのか見て + 12 月 23 日です + お誕生日おめでとうございます! 私はあなたの誕生日を覚えている、素敵な友達でしょ? - 12月23日に発送 - メッセージをスケジュールする - スケジュールされたメッセージ + 12 月 23 日に送信 + メッセージを送信予約 + 送信予約されたメッセージ 今すぐ送る テキストをコピー @@ -185,7 +189,7 @@ 外観 全般 - QK 返信 + QK Reply テーマ 夜間モード ピュアブラック夜間モード @@ -196,28 +200,28 @@ システムフォントを使用する 自動絵文字 通知 - カスタマイズするためにタップ + タップしてカスタマイズ アクション ボタン 1 ボタン 2 ボタン 3 通知プレビュー - ウェイクスクリーン - 振動 - サウンド - 無し - QK 返信 - 新しいメッセージのポップアップ + 画面を点灯 + バイブレーション + 音 + なし + QK Reply + 新しいメッセージをポップアップ タップして閉じる ポップアップの外側をタップすると閉じます 遅延送信 スワイプアクション - 会話のスワイプアクションを設定する + 会話のスワイプアクションを設定 右スワイプ 左スワイプ 変更 - 無し + なし アーカイブ 削除 ブロック @@ -242,15 +246,15 @@ %d 日後 - 長いメッセージをMMSとして送信する - 長いテキストメッセージの送信が失敗する場合、または間違った順序で送信される場合は、代わりにMMSメッセージとして送信できます。 追加料金が適用される場合があります - MMS添付ファイルの自動圧縮 + 長いメッセージを MMS として送信 + 長いテキストメッセージの送信が失敗する場合、または間違った順序で送信される場合は、代わりに MMS メッセージとして送信できます。 追加料金が適用される場合があります + MMS 添付ファイルの自動圧縮 メッセージを同期 メッセージをネイティブの Android SMS データベースと再同期します QKSMS について バージョン %s デバッグログが有効 - デバッグログを無効にする + デバッグログが無効 期間を入力してください (秒) ブロック メッセージをドロップ @@ -259,11 +263,11 @@ ブロッキングマネージャー QKSMS QKSMS の内蔵ブロック機能 - ブラックリストとスケジュールにより迷惑メッセージ、番号、不明な通話をブロック - 一か所で便利に通話とメッセージを自動的にフィルタリングします! Community IQ™を使用すると、コミュニティで知られているスパマーからの不要なメッセージを防ぐことができます - \"Should I Answer\" アプリを使用して、迷惑な番号からのメッセージを自動的にフィルタします + ブラックリストにより迷惑メッセージ、番号、不明な通話をブロック + 1 か所で便利に通話とメッセージを自動的にフィルタリングします! Community IQ™を使用すると、コミュニティで知られているスパマーからの不要なメッセージを防ぐことができます + \"Should I Answer\" アプリを使用して、迷惑な番号からのメッセージを自動的にフィルターします ブロックした番号をコピー - 既存のブロックした番号のコピーを %s まで続けます + %s で継続して既存のブロックした番号をコピー ブロックした番号 ブロックした番号がここに表示されます 新しい番号をブロック @@ -275,10 +279,10 @@ ブロック ブロック解除 - %s まで続けてこの番号をブロック + %s で継続してこの番号をブロック - %s まで続けてこの番号を許可 + %s で継続してこの番号を許可 このアプリについて バージョン @@ -288,51 +292,51 @@ お問い合わせ ライセンス 著作権 - 開発をサポートして、すべてのロックを解除します - ちょうど %s 人の飢えている開発者を助けることができます + 開発をサポートして、すべての機能のロックを解除 + %s だけ飢えている開発者を助けることができます - %1$s %2$s のライフタイムのアップグレード + %1$s %2$s で買い切りのアップグレード - %1$s %2$s のロック解除と寄付 - QKSMS を支援いただきありがとうございます! + %1$s %2$s でロック解除と寄付 + QKSMS を支援いただきありがとうございます! QKSMS+ のすべての機能にアクセスできます エラーが発生しました。もう一度やり直してください - QKSMS+ は F-Droid ユーザーは無料です! 開発をサポートしたい場合は、気軽に寄付をしてください。 - PayPal で寄付する + QKSMS+ は F-Droid ユーザーには無料です!開発をサポートしたい場合は、気軽に寄付をしてください。 + PayPal で寄付 近日登場 プレミアムテーマ マテリアルデザインパレットで利用できない美しいテーマカラーのロックを解除します カスタム自動絵文字 カスタム自動絵文字のショートカットを作成します メッセージのバックアップ - メッセージを自動的にバックアップします。携帯電話を変更したり、お使いの携帯電話をなくしても、もう二度と履歴がなくなる心配はいりません。 - スケジュールされたメッセージ - 特定の日時に自動的に送信されるようにメッセージをスケジュールする - 送信を遅らせる + メッセージを自動的にバックアップします。携帯電話を変更したり、お使いの携帯電話をなくしても、もう二度と履歴がなくなる心配はいりません + 送信予約メッセージ + メッセージが特定の日時に自動的に送信されるように予約する + 遅延送信 メッセージを送信する前に、数秒間待ちます 自動夜間モード 時間に基づいて夜間モードを有効にします 高度なブロック キーワードを含む、またはパターンに一致するメッセージをブロックします 自動転送 - 特定の送信者からのメッセージを自動的に転送します + 特定の差出人からのメッセージを自動的に転送します 自動応答 あらかじめ設定された応答で、受信したメッセージに自動的に返信します - さらに - QKMSは活発に開発中です、そして、あなたの購入はすべての将来のQKMS+機能を含みます! - ロード中... + その他 + QKSMS は活発に開発中で、購入にはすべての将来の QKSMS+ 機能が含まれます! + 読み込み中... さらに会話を表示 既読にする - 電話する + 通話 削除 - もっと見せる - 少なく表示 + 表示を増やす + 表示を減らす 会話を開く マテリアル 16 進数 適用 - 無し + なし アーカイブ 削除 ブロック @@ -344,23 +348,23 @@ 続行 キャンセル 削除 - 保存する + 保存 やめる さらに - 据える + 設定 元に戻す コピーしました 会話をアーカイブしました - これを使用するには QKSMS+ のロックを解除する必要があります + 使用するには QKSMS+ のロックを解除する必要があります - %s 新着メッセージ + %s 件の新着メッセージ メッセージは送信されませんでした %s へのメッセージの送信に失敗しました システム 無効 - 常にON + 常に ON 自動 @@ -369,16 +373,16 @@ コンテンツを隠す - 小さい - 普通の - 大き - 大きい + 小 + 標準 + 大 + 最大 遅延なし - 3秒 - 5秒 - 10秒 + 3 秒 + 5 秒 + 10 秒 自動 @@ -392,16 +396,16 @@ OK - しばらくお待ちください + ちょっと待って 今、途中です ありがとう - 良さそうですね - 最近どうですか? + いいですね + 最近どうですか? 了解 いいえ 好きです ごめんなさい - 大爆笑です - いいんだよ + 爆笑 + 大丈夫 diff --git a/presentation/src/main/res/values-ko/strings.xml b/presentation/src/main/res/values-ko/strings.xml index 0a70241e..462472ef 100644 --- a/presentation/src/main/res/values-ko/strings.xml +++ b/presentation/src/main/res/values-ko/strings.xml @@ -61,6 +61,7 @@ 권한을 부여해 주세요 QKSMS 앱은 메시지를 보내고 읽을 수 있는 권한이 필요합니다 QKSMS 앱은 연락처를 읽을 수 있는 권한이 필요합니다 + QKSMS needs permission to display notifications 허용 수신함 보관됨 @@ -144,23 +145,26 @@ 백업과 복원 메시지 백업하기 복원하기 - 최근 백업 로딩 중... 사용 안 함 + Backup location + Set folder 복원 백업 선택하기 QKSMS+을 구입하여 백업과 복원기능을 사용하세요 백업 중... 복원 중... 복원을 할까요? - 이 백업 파일로부터 복원하시겠어요? 복원 중지 이미 저장된 메시지들은 내 기기에 남아있습니다. + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details 백업 백업을 찾지 못했어요 - - %d 개의 새로운 메시지 - 아직 SMS만 백업과 복원기능이 지원됩니다. MMS지원과 백업 스케줄 기능은 곧 찾아옵니다! 지금 백업하기 분석 중... diff --git a/presentation/src/main/res/values-lt/strings.xml b/presentation/src/main/res/values-lt/strings.xml index f739bb27..d6013bb8 100644 --- a/presentation/src/main/res/values-lt/strings.xml +++ b/presentation/src/main/res/values-lt/strings.xml @@ -61,6 +61,7 @@ Permission required QKSMS needs permission to send and view SMS messages QKSMS needs permission to view your contacts + QKSMS needs permission to display notifications Allow Žinutės Archyvas @@ -147,26 +148,26 @@ Backup and restore Backing up messages Restoring from backup - Last backup Loading… Never + Backup location + Set folder Restore Select a backup Please unlock QKSMS+ to use backup and restore Backup in progress… Restore in progress… Restore from backup - Are you sure you would like to restore your messages from this backup? Stop restore Messages that have already been restored will remain on your device + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Backups No backups found - - %d message - %d messages - %d messages - %d messages - Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon! Backup now Parsing backup… @@ -400,12 +401,12 @@ Automatic - 100KB - 200KB - 300KB - 600KB - 1000KB - 2000KB + 100 kB + 200 kB + 300 kB + 600 kB + 1000 kB + 2000 kB No compression diff --git a/presentation/src/main/res/values-nb/strings.xml b/presentation/src/main/res/values-nb/strings.xml index 5725c06e..a7e0e67e 100644 --- a/presentation/src/main/res/values-nb/strings.xml +++ b/presentation/src/main/res/values-nb/strings.xml @@ -61,6 +61,7 @@ Tillatelse kreves QKSMS trenger tillatelse til å sende og vise tekstmeldinger QKSMS trenger tillatelse til å lese kontaktene dine + QKSMS needs permission to display notifications Tillat Innboks Arkivert @@ -145,24 +146,26 @@ Sikret Sikkerhetskopierer meldinger Gjenoppretter fra sikkerhetskopi - Siste sikkerhetskopi Henter … Aldri + Backup location + Set folder Gjenopprett Velg en sikkerhetskopi Vennligst aktiver QKSMS+ for å bruke sikkerhetskopiering og gjenoppretting Sikkerhetskopiering pågår … Gjenoppretting pågår … Gjenopprett fra sikkerhetskopi - Er du sikker på at du vil gjenopprette meldinger fra denne sikkerhetskopien? Avbryt gjenoppretting Meldinger som allerede er gjenopprettet vil forbli på din enhet + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Sikkerhetskopier Fant ingen sikkerhetskopier - - %d melding - %d meldinger - Per idag er bare mulig å sikkerhetskopiere SMS. MMS og planlagte sikkerhetskopier kommer snart. Sikkerhetskopier nå Ser gjennom sikkerhetskopien … diff --git a/presentation/src/main/res/values-ne/strings.xml b/presentation/src/main/res/values-ne/strings.xml index 98a76c06..d0a8ca2f 100644 --- a/presentation/src/main/res/values-ne/strings.xml +++ b/presentation/src/main/res/values-ne/strings.xml @@ -61,6 +61,7 @@ Permission required QKSMS needs permission to send and view SMS messages QKSMS needs permission to view your contacts + QKSMS needs permission to display notifications Allow Inbox Archived @@ -145,24 +146,26 @@ Backup and restore Backing up messages Restoring from backup - Last backup Loading… Never + Backup location + Set folder Restore Select a backup Please unlock QKSMS+ to use backup and restore Backup in progress… Restore in progress… Restore from backup - Are you sure you would like to restore your messages from this backup? Stop restore Messages that have already been restored will remain on your device + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Backups No backups found - - %d message - %d messages - Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon! Backup now Parsing backup… diff --git a/presentation/src/main/res/values-night-v23/themes.xml b/presentation/src/main/res/values-night-v23/themes.xml deleted file mode 100644 index 3adbc7c0..00000000 --- a/presentation/src/main/res/values-night-v23/themes.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml index b26faa8b..51338feb 100644 --- a/presentation/src/main/res/values-night/themes.xml +++ b/presentation/src/main/res/values-night/themes.xml @@ -19,7 +19,9 @@ --> - - - diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml index 2c98a28d..a3a98621 100644 --- a/presentation/src/main/res/values-vi/strings.xml +++ b/presentation/src/main/res/values-vi/strings.xml @@ -34,8 +34,8 @@ Chi tiết Lưu vào bộ sưu tập Chia sẻ - Mở menu điều hướng - %d đã chọn + Mở ngăn điều hướng + Đã chọn %d Dọn sạch Lưu trữ Hủy lưu trữ @@ -55,12 +55,13 @@ Không có kết quả Các cuộc trò chuyện đã lưu trữ của bạn sẽ xuất hiện ở đây Bắt đầu cuộc trò chuyện - Yêu thích nhắn tin ở đây + Hãy yêu thích việc nhắn tin một lần nữa Đặt QKSMS là ứng dụng SMS mặc định Thay đổi Yêu cầu quyền truy cập QKSMS cần cấp quyền để gửi và xem tin nhắn SMS QKSMS cần cấp quyền để xem danh bạ + QKSMS needs permission to display notifications Cho phép Trò chuyện Lưu trữ @@ -144,23 +145,26 @@ Sao lưu và khôi phục Đang sao lưu tin nhắn Đang khôi phục từ bản sao lưu - Sao lưu lần cuối Đang tải… Chưa bao giờ + Backup location + Set folder Khôi phục Chọn một bản sao lưu Vui lòng mở khoá QKSMS+ để dùng tính năng sao lưu và khôi phục Đang sao lưu… Đang khôi phục… Khôi phục từ bản sao lưu này - Bạn chắc chắn muốn khôi phục tin nhắn từ bản sao lưu này chứ ? Dừng khôi phục Tin nhắn đã được khôi phục sẽ vẫn còn trên thiết bị của bạn + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Các bản sao lưu Không tìm thấy bản sao lưu nào - - %d tin nhắn - Hiện tại, tính năng sao lưu và khôi phục chỉ hỗ trợ SMS. Việc hỗ trợ MMS và tính năng sao lưu định kì sẽ có sớm! Sao lưu ngay Đang phân tích bản sao lưu… @@ -233,14 +237,14 @@ Bỏ dấu ký tự khi gửi SMS Lọc số di động Khi soạn tin mới, chỉ hiển thị liên hệ có số di động - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + Tự động xoá các tin nhắn cũ + Các tin nhắn sẽ bị xoá sau số ngày được chỉ định + Số ngày + Không bao giờ + Tự động xoá các tin nhắn cũ? + Nếu bạn tiếp tục, %1$d tin nhắn sẽ bị xoá ngay bây giờ - After %d days + Sau %d ngày Gửi đoạn tin nhắn dài như MMS Nếu đoạn tin nhắn dài bị lỗi khi gửi, hoặc gửi sai thứ tự, bạn có thể gửi chúng như tin nhắn MMS thay thế. Cước phí bổ sung có thể bị áp dụng @@ -259,7 +263,7 @@ Quản lý danh sách chặn QKSMS Chức năng chặn tích hợp sẵn trong QKSMS - Block spam messages, numbers & unknown calls with blacklist & Schedule + Chặn tin nhằn rác, số & cuộc gọi không xác định bằng danh sách đen & Lịch trình Tự động lọc các cuộc gọi và tin nhắn của bạn ở một nơi thuận tiện! Cộng đồng IQ™ cho phép bạn ngăn chặn các tin nhắn từ những kẻ gửi tin rác được đóng góp bởi cộng đồng Tự động lọc tin nhắn từ số điện thoại không mong muốn bằng cách sử dụng ứng dụng \"Should I Answer\" Sao chép số đã chặn @@ -296,7 +300,7 @@ Mở khoá và tài trợ với %1$s %2$s Cảm ơn bạn đã ủng hộ QKSMS! Bây giờ bạn có thể sử dụng tất cả các chức năng của QKSMS+ - An error has occurred, please try again + Đã xảy ra lỗi, vui lòng thử lại QKSMS+ miễn phí cho người sử dụng F-Droid! Bạn có thể trả phí nếu muốn hỗ trợ phát triển. Tài trợ bằng PayPal Sắp có diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml index 0bf3954f..2b9fa66d 100644 --- a/presentation/src/main/res/values-zh-rCN/strings.xml +++ b/presentation/src/main/res/values-zh-rCN/strings.xml @@ -61,6 +61,7 @@ 需要权限 QKSMS 需要权限来发送和查看短信 QKSMS 需要权限来查看联系人 + QKSMS needs permission to display notifications 允许 收件箱 已存档 @@ -144,23 +145,26 @@ 备份和还原 正在备份消息 正在从备份还原 - 上次备份 正在加载… 从未 + Backup location + Set folder 还原 选择备份 请解锁 QKSMS+ 以使用备份和还原 正在进行备份… 正在还原… 从备份还原 - 是否确实要从该备份还原消息? 停止还原 已还原的消息将保留在您的设备上 + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details 备份 找不到备份 - - %d 条消息 - 目前只有短信支持备份和恢复。彩信支持和定时备份将很快到来! 立即备份 正在分析备份… @@ -259,7 +263,7 @@ 屏蔽管理器 QKSMS QKSMS 中内建的屏蔽功能 - Block spam messages, numbers & unknown calls with blacklist & Schedule + 屏蔽垃圾信息、号码和未知来电以及黑名单和日程 自动在适当的位置过滤您的来电和信息!Community IQ™ 允许您阻止社区中已知的垃圾发件人所发送的垃圾信息 使用 \"Should I Answer\" 应用过滤未知号码的消息 复制屏蔽的号码 diff --git a/presentation/src/main/res/values-zh/strings.xml b/presentation/src/main/res/values-zh/strings.xml index ffcd5c23..7054b824 100644 --- a/presentation/src/main/res/values-zh/strings.xml +++ b/presentation/src/main/res/values-zh/strings.xml @@ -27,7 +27,7 @@ 主題 在收件箱中搜索... 編輯 - 跳过 + 跳過 繼續 增加傳送人 致電 @@ -46,7 +46,7 @@ 標示已讀 標示未讀 攔截 - 正在同步... + 正在同步… 您:%s 草稿 信息中的結果 @@ -61,6 +61,7 @@ 需要授權 需要允許QKSMS發送和查看SMS訊息 需要允許QKSMS查看您的連絡人 + QKSMS needs permission to display notifications 允許 收件箱 已存檔 @@ -98,7 +99,7 @@ 所選時間必須是未來時間 您必須解鎖 QKSMS+ 以使用排程簡訊 已新增至排程訊息 - 寫一條訊息... + 寫一條訊息… 複製文本 轉寄 刪除 @@ -126,7 +127,7 @@ 已選取%1$d (%2$s) SIM卡 %s 已選擇,變更 SIM 卡 發送訊息 - 正在發送... + 正在發送… 已傳遞 %s 發送失敗,點擊重試 詳細資訊 @@ -144,23 +145,26 @@ 備份和還原 正在備份訊息 正在從備份還原 - 上次備份 載入中… 從未備份 + Backup location + Set folder 還原 選擇備份 請解鎖 QKSMS+ 以使用備份和還原功能 正在進行備份… 正在進行還原… 從備份還原 - 您確定要從此備份還原訊息嗎? 停止還原 已還原的訊息將保留在您的裝置上 + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details 備份 未能找到備份 - - %d 條訊息 - 目前只有簡訊支援備份和還原,多媒體和排程簡訊備份將在不久後加入! 立即備份 正在解析備份… @@ -233,14 +237,14 @@ 刪除訊息中字母上的讀音符號 僅限手機號碼 撰寫訊息時,只顯示手機號碼 - Delete old messages automatically - Messages will be deleted after the specified number of days - Number of days - Never - Delete old messages automatically? - If you proceed, %1$d messages will be deleted now + 自動刪除舊訊息 + 會在指定的天數後刪除訊息 + 天數 + 永不 + 要自動刪除舊訊息嗎? + 如果繼續,現在會刪除 %1$d 條訊息 - After %d days + %d 天後 以MMS傳送長訊息 若您較長的訊息無法傳送或是以錯誤順序傳送,您可以改用MMS方式傳送訊息。(可能會有額外費用) @@ -259,7 +263,7 @@ 封鎖管理器 QKSMS QKSMS內建封鎖功能 - Block spam messages, numbers & unknown calls with blacklist & Schedule + 使用黑名單與排程封鎖垃圾訊息、號碼和未知來電 自動過濾來電與簡訊!群眾智慧Community IQ™能讓你遠離不想要的垃圾簡訊 使用\"Should I Answer\"應用過濾未知號碼的消息 複製封鎖號碼 @@ -296,7 +300,7 @@ 解鎖並捐贈只需 %1$s %2$s 感謝您對 QKSMS 的支持! 現在您可以使用 QKSMS+ 的全部功能! - An error has occurred, please try again + 發生錯誤,請再試一次 QKSMS+對F-Droid用戶免費!如果您想支持開發,可以隨意捐款。 使用PayPal捐贈 即將推出 @@ -320,7 +324,7 @@ 使用預設回應自動回覆傳入郵件 更多 QKSMS 正在積極開發中,您的購買將包含後續 QKSMS+ 的所有功能! - 載入中... + 載入中… 查看更多對話 標示已讀 致電 diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 8428d428..8d6f1f68 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -68,6 +68,7 @@ Permission required QKSMS needs permission to send and view SMS messages QKSMS needs permission to view your contacts + QKSMS needs permission to display notifications Allow Inbox @@ -167,26 +168,27 @@ Backup and restore Backing up messages Restoring from backup - Last backup Loading… Never + Backup location + Set folder Restore Select a backup Please unlock QKSMS+ to use backup and restore Backup in progress… Restore in progress… Restore from backup - Are you sure you would like to restore your messages from this backup? Stop restore Messages that have already been restored will remain on your device + Select backup location + Please select a folder to save your backups to + %1$s\n%2$d messages + Error + Couldn\'t read backup file + Backup details Backups /QKSMS/Backups No backups found - - No messages - %d message - %d messages - Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon! Backup now Parsing backup… diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 16db6916..2ced1618 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -31,7 +31,10 @@ @color/backgroundDark -