diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/Config.java b/shell/android-studio/app/src/main/java/com/reicast/emulator/config/Config.java index b0166e26c..eb87f3b57 100644 --- a/shell/android-studio/app/src/main/java/com/reicast/emulator/config/Config.java +++ b/shell/android-studio/app/src/main/java/com/reicast/emulator/config/Config.java @@ -27,8 +27,6 @@ public class Config { public static String git_api = "https://api.github.com/repos/reicast/reicast-emulator/commits"; public static String git_issues = "https://github.com/reicast/reicast-emulator/issues/"; - public static String log_url = "http://loungekatt.sytes.net:3194/ReicastBot/report/submit.php"; - public static String report_url = "http://loungekatt.sytes.net:3194/ReicastBot/report/logs/"; public static boolean externalIntent = false; diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GenerateLogs.java b/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GenerateLogs.java index c5ade13a9..d30083c2c 100644 --- a/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GenerateLogs.java +++ b/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/GenerateLogs.java @@ -248,8 +248,12 @@ public class GenerateLogs extends AsyncTask { protected void onPostExecute(final String response) { if (response != null) { showToastMessage(mContext.getString(R.string.log_saved), Snackbar.LENGTH_LONG); - UploadLogs mUploadLogs = new UploadLogs(mContext, currentTime); - mUploadLogs.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, response); + android.content.ClipboardManager clipboard = (android.content.ClipboardManager) mContext + .getSystemService(Context.CLIPBOARD_SERVICE); + android.content.ClipData clip = android.content.ClipData.newPlainText("logcat", response); + clipboard.setPrimaryClip(clip); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(Config.git_issues)); + mContext.startActivity(browserIntent); } } diff --git a/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/UploadLogs.java b/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/UploadLogs.java deleted file mode 100644 index 21d0f6097..000000000 --- a/shell/android-studio/app/src/main/java/com/reicast/emulator/debug/UploadLogs.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.reicast.emulator.debug; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.AsyncTask; - -import com.reicast.emulator.config.Config; - -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLEncoder; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.List; - -import javax.net.ssl.HttpsURLConnection; - -/** - * Upload the specialized logcat to reicast issues - */ -public class UploadLogs extends AsyncTask { - - private String currentTime; - private String logUrl; - private Context mContext; - - /** - * @param mContext - * The context this method will be executed from - * @param currentTime - * The system time at which the log was made - */ - public UploadLogs(Context mContext, String currentTime) { - this.mContext = mContext; - this.currentTime = currentTime; - } - - private void RedirectSubmission(String header, String content) { - UploadLogs mUploadLogs = new UploadLogs(mContext, currentTime); - mUploadLogs.setPostUrl(header); - mUploadLogs.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, content); - } - - /** - * Set the URL for where the log will be uploaded - * - * @param logUrl - * The URL of the log upload server - */ - public void setPostUrl(String logUrl) { - this.logUrl = logUrl; - } - - @SuppressLint("NewApi") - protected void onPreExecute() { - if (logUrl == null || logUrl.equals(null)) { - logUrl = Config.log_url; - } - } - - private String getQuery(List params) - throws UnsupportedEncodingException { - StringBuilder result = new StringBuilder(); - boolean first = true; - - for (AbstractMap.SimpleEntry pair : params) { - if (first) - first = false; - else - result.append("&"); - - result.append(URLEncoder.encode((String) pair.getKey(), "UTF-8")); - result.append("="); - result.append(URLEncoder.encode((String) pair.getValue(), "UTF-8")); - } - return result.toString(); - } - - @Override - protected Object doInBackground(String... params) { - HttpURLConnection conn = null; - try { - conn = (HttpURLConnection) new URL(logUrl).openConnection(); - conn.setRequestMethod("POST"); - conn.setDoInput(true); - conn.setDoOutput(true); - - ArrayList mPairs = new ArrayList<>(); - mPairs.add(new AbstractMap.SimpleEntry("name", currentTime)); - mPairs.add(new AbstractMap.SimpleEntry("issue", params[0])); - - OutputStream os = conn.getOutputStream(); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8")); - writer.write(getQuery(mPairs)); - writer.flush(); - writer.close(); - os.close(); - - int responseCode = conn.getResponseCode(); - if (responseCode != HttpsURLConnection.HTTP_OK) { - String header = conn.getHeaderField("Location"); - if (header != null && header.length() != 0) { - RedirectSubmission(header, params[0]); - } else { - return null; - } - } else { - InputStream in = conn.getInputStream(); - BufferedReader streamReader = new BufferedReader( - new InputStreamReader(in, "UTF-8")); - StringBuilder responseStrBuilder = new StringBuilder(); - - String inputStr; - while ((inputStr = streamReader.readLine()) != null) - responseStrBuilder.append(inputStr); - - in.close(); - return responseStrBuilder.toString(); - } - } catch (MalformedURLException e) { - e.printStackTrace(); - if (conn != null) conn.disconnect(); - } catch (IOException e) { - e.printStackTrace(); - if (conn != null) conn.disconnect(); - } catch (Exception e) { - e.printStackTrace(); - if (conn != null) conn.disconnect(); - } - return null; - } - - @SuppressWarnings("deprecation") - @Override - protected void onPostExecute(Object response) { - if (response != null && !response.equals(null)) { - String logLink = Config.report_url + currentTime + ".txt"; - android.content.ClipboardManager clipboard = (android.content.ClipboardManager) mContext - .getSystemService(Context.CLIPBOARD_SERVICE); - android.content.ClipData clip = android.content.ClipData.newPlainText("logcat", logLink); - clipboard.setPrimaryClip(clip); - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(Config.git_issues)); - mContext.startActivity(browserIntent); - } - } -}