Skip to content

yotta / pictogram

Go to a project
Commit 793d3111 by Fernando Martínez Santiago
Options

minor commit changes. Working on issue #811

parent fe7a35d9
Inline Side-by-side
Showing with 47 additions and 42 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/net/RestapiWrapper.java
...@@ -36,6 +36,7 @@ import javax.net.ssl.HttpsURLConnection; ...@@ -36,6 +36,7 @@ import javax.net.ssl.HttpsURLConnection;
public class RestapiWrapper { public class RestapiWrapper {
String server; String server;
String token; String token;
iSilentLogin silentLogin;
public static final int TIME_OUT=20000; public static final int TIME_OUT=20000;
private static final String SERVER_RESULT="result"; private static final String SERVER_RESULT="result";
private static final String SERVER_ERROR="error"; private static final String SERVER_ERROR="error";
...@@ -43,9 +44,10 @@ public class RestapiWrapper { ...@@ -43,9 +44,10 @@ public class RestapiWrapper {
// String constant for logs // String constant for logs
private final static String LOG_TAG = RestapiWrapper.class.getSimpleName(); // Or .getCanonicalName() private final static String LOG_TAG = RestapiWrapper.class.getSimpleName(); // Or .getCanonicalName()
public RestapiWrapper(String server, String token) { public RestapiWrapper(String server, String token,iSilentLogin silentLogin) {
this.server=server; this.server=server;
this.token=token; this.token=token;
this.silentLogin=silentLogin;
} }
public void setToken(String token) { public void setToken(String token) {
...@@ -275,7 +277,14 @@ public class RestapiWrapper { ...@@ -275,7 +277,14 @@ public class RestapiWrapper {
// onPostExecute displays the results of the AsyncTask. // onPostExecute displays the results of the AsyncTask.
@Override @Override
protected void onPostExecute(HttpAsyncTaskParams params) { protected void onPostExecute(HttpAsyncTaskParams params) {
if (params.error!=null) params.listener.error(params.error); if (params.error!=null) {
if (params.error.getCode()==401 && silentLogin!=null) {
// silentLogin.login();
Log.e(LOG_TAG,"Silent login executed because of invalid token:"+params.error.getMessage());
}
else
params.listener.error(params.error);
}
else { else {
Object jsonResult = params.result; Object jsonResult = params.result;
if (jsonResult instanceof JSONObject) { if (jsonResult instanceof JSONObject) {
...@@ -305,4 +314,10 @@ public class RestapiWrapper { ...@@ -305,4 +314,10 @@ public class RestapiWrapper {
void result(JSONObject result); void result(JSONObject result);
void error(HTTPException e); void error(HTTPException e);
} }
/*
Because of invalid token
*/
public interface iSilentLogin {
void login();
}
} }
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
...@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; ...@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
*/ */
public class NetService implements Runnable { public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
static final String ping_session="server/ping"; static final String ping_session="server/ping";
private boolean updated; private boolean updated;
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
...@@ -39,8 +39,8 @@ public final class PCBcontext { ...@@ -39,8 +39,8 @@ public final class PCBcontext {
context = c; context = c;
device = new Device(c, null, 1); device = new Device(c, null, 1);
SSLDummyContext.init(context.getResources().getBoolean(R.bool.ssl_connect)); SSLDummyContext.init(context.getResources().getBoolean(R.bool.ssl_connect));
wrapper = new RestapiWrapper(context.getResources().getString(R.string.server), null);
service = new NetService(context.getResources().getInteger(R.integer.netservice_timing),listener); service = new NetService(context.getResources().getInteger(R.integer.netservice_timing),listener);
wrapper = new RestapiWrapper(context.getResources().getString(R.string.server), null, service);
device.deleteDeprecatedImgs(); device.deleteDeprecatedImgs();
Log.i(PCBcontext.class.getCanonicalName(), "PCB context started. It's required" + Log.i(PCBcontext.class.getCanonicalName(), "PCB context started. It's required" +
"set_user method call"); "set_user method call");
......
android/Pictogram/commonlibrary/src/main/res/values/colors.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<item name="purple" type="color">#FFAA66CC</item> <item name="purple" type="color">#FFAA66CC</item>
<item name="green" type="color">#FF99CC00</item> <item name="green" type="color">#FF99CC00</item>
<item name="orange" type="color">#FFFFBB33</item> <item name="orange" type="color">#FFFFBB33</item>
<item name="red" type="color">#FFFF4444</item> <item name="red" type="color">#ff4444</item>
<item name="darkblue" type="color">#FF0099CC</item> <item name="darkblue" type="color">#FF0099CC</item>
<item name="darkpurple" type="color">#FF9933CC</item> <item name="darkpurple" type="color">#FF9933CC</item>
<item name="darkgreen" type="color">#669900</item> <item name="darkgreen" type="color">#669900</item>
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/StudentFragmentGrid.java
...@@ -201,8 +201,8 @@ public class StudentFragmentGrid extends Fragment{ ...@@ -201,8 +201,8 @@ public class StudentFragmentGrid extends Fragment{
private void download_students(int sup_id ) { private void download_students(int sup_id ) {
String token = getActivity().getIntent().getExtras().getString("token"); String token = getActivity().getIntent().getExtras().getString("token");
RestapiWrapper wrapper = new RestapiWrapper( RestapiWrapper wrapper = PCBcontext.getRestapiWrapper();
getActivity().getApplicationContext().getResources().getString(R.string.server), token); wrapper.setToken(token);
String operation = "sup/" + sup_id + "/students"; String operation = "sup/" + sup_id + "/students";
progressDialog= ProgressDialog.show(getActivity(), getString(R.string.userLoadingTxt), progressDialog= ProgressDialog.show(getActivity(), getString(R.string.userLoadingTxt),
getString(R.string.userLoadingTxt), false, false); getString(R.string.userLoadingTxt), false, false);
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_session.xml
...@@ -97,8 +97,7 @@ ...@@ -97,8 +97,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:textOff="REC" android:textOff="REC"
android:textOn="REC" android:textOn="REC" />
android:textColorLink="@color/darkgreen" />
</RelativeLayout> </RelativeLayout>
...@@ -143,12 +142,12 @@ ...@@ -143,12 +142,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<LinearLayout <LinearLayout
android:id="@+id/view_session_buttons" android:id="@+id/view_session_buttons"
android:layout_marginTop="20px"
android:layout_below="@+id/view_as2" android:layout_below="@+id/view_as2"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
...@@ -187,31 +186,21 @@ ...@@ -187,31 +186,21 @@
<ListView <ListView
android:id="@+id/session_serverlog" android:id="@+id/session_serverlog"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_toLeftOf="@+id/imageView3"
android:layout_toRightOf="@+id/view_session_buttons0" android:layout_toRightOf="@+id/view_session_buttons0"
android:layout_below="@+id/view_as2" android:layout_below="@+id/view_as2"
android:layout_alignBottom="@+id/imageView3"
android:layout_alignTop="@+id/imageView3"
android:fillViewport="true" android:fillViewport="true"
android:ems="12"
android:layout_weight="1" android:layout_weight="1"
android:transcriptMode="alwaysScroll" android:transcriptMode="alwaysScroll"
android:stackFromBottom="true" android:stackFromBottom="true"
android:background="@color/common_google_signin_btn_text_light_disabled" /> android:background="@color/common_google_signin_btn_text_light_disabled"
android:layout_marginBottom="10px"
<ImageView android:layout_marginEnd="10px"
android:layout_width="100dp" android:layout_marginRight="10px"
android:layout_height="100dp" android:layout_marginLeft="50px"
app:srcCompat="@drawable/pictogram_logo" android:layout_marginStart="10px"
android:id="@+id/imageView3" android:layout_marginTop="5px" />
android:maxLines = "100"
android:background="@drawable/pictogram_logo"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:layout_gravity="right"
android:layout_weight="1"
android:layout_below="@+id/view_as2"
android:layout_alignEnd="@+id/sessionFragmentLayout"
android:layout_marginEnd="21dp" />
</RelativeLayout> </RelativeLayout>
android/Pictogram/tabletlibrary/src/main/res/layout/list_logsessions.xml
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sessionLogEntry" android:id="@+id/sessionLogEntry"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="30px"
android:textAppearance="@android:style/TextAppearance.Material.Small" android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:gravity="left" /> android:gravity="left"
android:paddingLeft="10px" />
android/Pictogram/tabletlibrary/tabletlibrary.iml
...@@ -73,14 +73,6 @@ ...@@ -73,14 +73,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
...@@ -89,6 +81,14 @@ ...@@ -89,6 +81,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment