lywsvip/gotify-android
1
0
Fork 0
mirror of https://github.com/gotify/android.git synced 2026-06-05 02:32:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

requested changes

Browse Source
This commit is contained in:
p1gp1g
2021-01-04 15:49:47 +01:00
parent 94045b4cd5
commit 39c43cb9b1
2 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/com/github/gotify/messages/MessagesActivity.java
View File

@@ -43,6 +43,7 @@ import com.github.gotify.Settings;
import com.github.gotify.Utils;
import com.github.gotify.api.Api;
import com.github.gotify.api.ApiException;
import com.github.gotify.api.Callback;
import com.github.gotify.api.ClientFactory;
import com.github.gotify.client.ApiClient;
import com.github.gotify.client.api.ApplicationApi;
@@ -578,54 +579,27 @@ public class MessagesActivity extends AppCompatActivity
if (item.getItemId() == R.id.action_delete_app) {
android.app.AlertDialog.Builder alert = new android.app.AlertDialog.Builder(this);
alert.setTitle(R.string.delete_app);
alert.setMessage("Are you sure?");
alert.setPositiveButton(
"YES",
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
deleteApp(appId);
}
});
alert.setNegativeButton(
"NO",
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {}
});
alert.setMessage(R.string.ack);
alert.setPositiveButton(R.string.yes, (dialog, which) -> deleteApp(appId));
alert.setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss());
alert.show();
}
return super.onContextItemSelected(item);
}
private void deleteApp(Long appId) {
Thread thread =
new Thread(
new Runnable() {
@Override
public void run() {
ApiClient client =
ClientFactory.clientToken(
settings.url(),
settings.sslSettings(),
settings.token());
try {
Log.i("Deleting app with appId=" + appId);
Api.execute(
client.createService(ApplicationApi.class)
.deleteApp(appId));
} catch (ApiException e) {
Log.e("Could not delete app.", e);
}
}
});
thread.start();
try {
thread.join();
} catch (InterruptedException e) {
e.printStackTrace();
}
refreshAll();
ApiClient client =
ClientFactory.clientToken(settings.url(), settings.sslSettings(), settings.token());
client.createService(ApplicationApi.class)
.deleteApp(appId)
.enqueue(
Callback.callInUI(
this,
(ignored) -> refreshAll(),
(e) ->
Utils.showSnackBar(
this, getString(R.string.error_delete_app))));
}
private class LoadMore extends AsyncTask<Long, Void, List<MessageWithImage>> {

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

@@ -26,6 +26,7 @@
<string name="grouped_message">Received %d messages while being disconnected</string>
<string name="delete_all">Delete all</string>
<string name="delete_app">Delete this application</string>
<string name="error_delete_app">Could not delete this app</string>
<string name="delete_logs">Delete logs</string>
<string name="copy_logs">Copy logs</string>
<string name="logs_copied">Logs copied</string>
@@ -49,6 +50,8 @@
<string name="refresh_all">Refresh all</string>
<string name="logout_confirm">Do you really want to logout?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="ack">Are you sure?</string>
<string name="missed_messages">Missed messages</string>
<string name="grouped_notification_text">New Messages</string>
<string name="websocket_listening">Listening to %s</string>