From ba8b96c22ed0f269a89bf602bafc2bd24880601e Mon Sep 17 00:00:00 2001
From: Przemek Grondek <github@nerull7.info>
Date: Wed, 20 Aug 2014 23:38:44 +0200
Subject: [PATCH] Revert "Showing connection error DO NOT MERGE"
It doesn't work right now. Work moved into error branch.
This reverts commit 5d635e4408cd71c4589dae91753410a1b9320aa6.
---
.../mysqlbrowser/db/AsyncDatabaseConnector.java | 12 +-----------
app/src/main/res/values/strings.xml | 1 -
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java b/app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java
index 3aceda8..8a8872f 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java
@@ -12,15 +12,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
-import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
-import info.nerull7.mysqlbrowser.R;
-
/**
* Created by nerull7 on 07.07.14.
* Database connector using Async calls
@@ -403,14 +400,7 @@ public class AsyncDatabaseConnector {
urlConnection.setReadTimeout(READ_TIMEOUT);
urlConnection.setConnectTimeout(CONNECTION_TIMEOUT);
urlConnection.setRequestMethod(CONNECTION_REQUEST_METHOD);
- try {
- urlConnection.connect();
- } catch (ConnectException e) {
-// errorMsg = e.getMessage();
- if (e.getCause().equals(CONNECTION_REQUEST_METHOD)) {
- errorMsg == R.string.error_connection_timeout; // FIXME
- }
- }
+ urlConnection.connect();
if(urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
try {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c1647e7..d7b1d0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,5 @@
<string name="save_credentials">Save credentials</string>
<string name="connector_url">Connector URL</string>
<string name="no_connection">No Internet Connection</string>
- <string name="error_connection_timeout">Connection timeout</string>
</resources>