kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Remove strings related to peer discovery and permissions

Browse Source
This commit is contained in:
Aditya-Sood 2019-07-15 14:50:36 +05:30
parent eca3cfc327
commit 531b184810
4 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -163,7 +163,8 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
@Override
public void onFailure(int reason) {
String errorMessage = getErrorMessage(reason);
showToast(LocalFileTransferActivity.this, LocalFileTransferActivity.this.getString(R.string.discovery_failed, errorMessage), Toast.LENGTH_SHORT);
Log.d(TAG, getString(R.string.discovery_failed) + ": " + errorMessage);
showToast(LocalFileTransferActivity.this, LocalFileTransferActivity.this.getString(R.string.discovery_failed), Toast.LENGTH_SHORT);
}
});
return true;
@ -197,11 +198,11 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
private String getErrorMessage(int reason) {
switch (reason) {
case WifiP2pManager.ERROR: return getString(R.string.wifi_p2p_internal_error);
case WifiP2pManager.BUSY: return getString(R.string.wifi_p2p_framework_busy);
case WifiP2pManager.P2P_UNSUPPORTED: return getString(R.string.wifi_p2p_unsupported);
case WifiP2pManager.ERROR: return "Internal error";
case WifiP2pManager.BUSY: return "Framework busy, unable to service request";
case WifiP2pManager.P2P_UNSUPPORTED: return "P2P unsupported on this device";
default: return (getString(R.string.wifi_p2p_unknown_error, reason));
default: return "Unknown error code - "+reason;
}
}
@ -233,7 +234,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
public void onChannelDisconnected() {
// Upon disconnection, retry one more time
if(manager != null && !retryChannel) {
showToast(this, R.string.channel_lost, Toast.LENGTH_LONG);
Log.d(TAG, "Channel lost, trying again");
resetData();
retryChannel = true;
manager.initialize(this, getMainLooper(), this);
@ -260,7 +261,8 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
@Override
public void onFailure(int reason) {
String errorMessage = getErrorMessage(reason);
showToast(LocalFileTransferActivity.this, getString(R.string.connection_failed, errorMessage), Toast.LENGTH_LONG);
Log.d(TAG, getString(R.string.connection_failed) + ": " + errorMessage);
showToast(LocalFileTransferActivity.this, getString(R.string.connection_failed), Toast.LENGTH_LONG);
}
});
}

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java
View File

@ -24,7 +24,7 @@ public class RequestEnableLocationServicesDialog extends DialogFragment {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.request_enable_location)
.setPositiveButton(R.string.open_location_settings, new DialogInterface.OnClickListener() {
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface paramDialogInterface, int paramInt) {
startActivityForResult(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS), LocalFileTransferActivity.REQUEST_ENABLE_LOCATION_SERVICES);

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java
View File

@ -24,7 +24,7 @@ public class RequestEnableWifiP2pServicesDialog extends DialogFragment {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.request_enable_wifi)
.setPositiveButton(R.string.open_wifi_settings, new DialogInterface.OnClickListener() {
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface paramDialogInterface, int paramInt) {
startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));

17
app/src/main/res/values/strings.xml
View File

@ -261,26 +261,17 @@
<string name="notes_deletion_none_found">No notes found for deletion</string>
<string name="notes_deletion_successful">Entire notes folder deleted</string>
<string name="notes_deletion_unsuccessful">Some files not deleted</string>
<string name="discovery_initiated">Discovery Initiated</string>
<string name="discovery_failed">Discovery Failed: %s</string>
<string name="wifi_p2p_internal_error">Internal error</string>
<string name="wifi_p2p_framework_busy">Framework busy, unable to service request</string>
<string name="wifi_p2p_unsupported">P2P unsupported on this device</string>
<string name="wifi_p2p_unknown_error">Unknown error code - %i</string>
<string name="channel_lost">Channel lost, trying again</string>
<string name="severe_loss_error">Severe! Try Disable/Re-enable WiFi P2P</string>
<string name="abort_connection">Aborting connection</string>
<string name="abort_failed">Connect abort request failed. Reason: %s</string>
<string name="connection_failed">Connection failed: %s</string>
<string name="discovery_initiated">Discovery initiated</string>
<string name="discovery_failed">Discovery failed</string>
<string name="severe_loss_error">Severe error! Try Disable/Re-enable WiFi P2P</string>
<string name="connection_failed">Connection failed</string>
<string name="permission_rationale_location">Location permission is required by Android to allow the app to detect peer devices</string>
<string name="permission_rationale_storage">Storage permissions required for accessing and storing ZIM files</string>
<string name="permission_refused_location">Cannot locate peer devices without location permissions</string>
<string name="permission_refused_storage">Cannot access zim files without storage permission</string>
<string name="request_enable_location">Enable location to allow detection of peers</string>
<string name="open_location_settings">Open Location Settings</string>
<string name="request_refused_location">Cannot discover peers without location services</string>
<string name="request_enable_wifi">Enable WiFi P2P from system settings</string>
<string name="open_wifi_settings">Open WiFi Settings</string>
<string name="request_refused_wifi">Cannot discover peers without WiFi ON</string>
<string name="transfer_to">Transfer files to %s?</string>
<string name="available">Available</string>