From 56a4714a3af6cd74b5946afdf245be97cfb56ba6 Mon Sep 17 00:00:00 2001 From: Renard Date: Thu, 29 Dec 2016 20:58:27 -0300 Subject: SSL Fix --- .idea/.name | 1 - .idea/gradle.xml | 3 ++- .idea/modules.xml | 2 +- app/build.gradle | 4 ++-- .../main/java/org/bienvenidoainternet/app/MainActivity.java | 10 +++------- .../java/org/bienvenidoainternet/app/ResponseActivity.java | 8 ++++---- .../java/org/bienvenidoainternet/app/ThreadListAdapter.java | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 9 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 170a3e9..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Bai Parser \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index fc132b2..c675af0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index c7df3fa..5cfcad4 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 11071a8..1707293 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.bienvenidoainternet.app" minSdkVersion 15 targetSdkVersion 23 - versionCode 11 - versionName "1.8" + versionCode 12 + versionName "1.9" } buildTypes { release { diff --git a/app/src/main/java/org/bienvenidoainternet/app/MainActivity.java b/app/src/main/java/org/bienvenidoainternet/app/MainActivity.java index 3a1890e..2244c23 100644 --- a/app/src/main/java/org/bienvenidoainternet/app/MainActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/app/MainActivity.java @@ -234,9 +234,6 @@ public class MainActivity extends AppCompatActivity refreshNavigator(); } - if (tm.isDarkTheme()){ -// navigationView.setBackgroundColor(0xFF888888); - } } @@ -424,7 +421,7 @@ public class MainActivity extends AppCompatActivity Menu menu = navigationView.getMenu(); final SubMenu sub = menu.addSubMenu("Lista de Boards"); Ion.with(getApplicationContext()) - .load("http://bienvenidoainternet.org/cgi/api/boards") + .load("https://bienvenidoainternet.org/cgi/api/boards") .asString() .setCallback(new FutureCallback() { @Override @@ -441,10 +438,9 @@ public class MainActivity extends AppCompatActivity sub.add(parsedBoard.getBoardName()); boardList.add(parsedBoard); } -// Board polka = new Board("Testing", "polka", 0, true); +// Board polka = new Board("TESTING", "polka", 0, true); +// sub.add(polka.getBoardName()); // boardList.add(polka); -// sub.add("Testing"); - }catch (JSONException e1) { Toast.makeText(getApplicationContext(), e1.getMessage(), Toast.LENGTH_LONG).show(); e1.printStackTrace(); diff --git a/app/src/main/java/org/bienvenidoainternet/app/ResponseActivity.java b/app/src/main/java/org/bienvenidoainternet/app/ResponseActivity.java index 3e74573..bcc75f6 100644 --- a/app/src/main/java/org/bienvenidoainternet/app/ResponseActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/app/ResponseActivity.java @@ -235,7 +235,7 @@ public class ResponseActivity extends AppCompatActivity { if (newthread){ if (selectedFile.isEmpty()){ Ion.with(getApplicationContext()) - .load("http://bienvenidoainternet.org/cgi/post") + .load("https://bienvenidoainternet.org/cgi/post") .setLogging("posting", Log.VERBOSE) .uploadProgressBar(progess) .setMultipartParameter("board", theReply.getParentBoard().getBoardDir()) @@ -269,7 +269,7 @@ public class ResponseActivity extends AppCompatActivity { }); }else{ Ion.with(getApplicationContext()) - .load("http://bienvenidoainternet.org/cgi/post") + .load("https://bienvenidoainternet.org/cgi/post") .uploadProgressBar(progess) .setMultipartParameter("board", theReply.getParentBoard().getBoardDir()) .setMultipartParameter("password", password) @@ -304,7 +304,7 @@ public class ResponseActivity extends AppCompatActivity { }else{ if (selectedFile.isEmpty()){ Ion.with(getApplicationContext()) - .load("http://bienvenidoainternet.org/cgi/post") + .load("https://bienvenidoainternet.org/cgi/post") .setLogging("posting", Log.VERBOSE) .uploadProgressBar(progess) .setMultipartParameter("board", theReply.getParentBoard().getBoardDir()) @@ -338,7 +338,7 @@ public class ResponseActivity extends AppCompatActivity { }); }else{ Ion.with(getApplicationContext()) - .load("http://bienvenidoainternet.org/cgi/post") + .load("https://bienvenidoainternet.org/cgi/post") .uploadProgressBar(progess) .setMultipartParameter("board", theReply.getParentBoard().getBoardDir()) .setMultipartParameter("parent", String.valueOf(parentId)) diff --git a/app/src/main/java/org/bienvenidoainternet/app/ThreadListAdapter.java b/app/src/main/java/org/bienvenidoainternet/app/ThreadListAdapter.java index 4e6e9cb..ba922a5 100644 --- a/app/src/main/java/org/bienvenidoainternet/app/ThreadListAdapter.java +++ b/app/src/main/java/org/bienvenidoainternet/app/ThreadListAdapter.java @@ -145,7 +145,7 @@ public class ThreadListAdapter extends ArrayAdapter{ if (boardItem.youtubeLink){ in = new Intent(Intent.ACTION_VIEW, Uri.parse(boardItem.youtubeURL)); }else{ - in = new Intent(Intent.ACTION_VIEW, Uri.parse("http://bienvenidoainternet.org/" + boardItem.getParentBoard().getBoardDir() + "/src/" + boardItem.getFile())); + in = new Intent(Intent.ACTION_VIEW, Uri.parse("https://bienvenidoainternet.org/" + boardItem.getParentBoard().getBoardDir() + "/src/" + boardItem.getFile())); } in.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); v.getContext().startActivity(in); diff --git a/build.gradle b/build.gradle index e0b366a..74b2ab0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.2.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e..d0adf08 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Sat Sep 24 01:15:45 CLT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip -- cgit v1.2.1-18-gbd029