Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
673d1552
authored
Apr 18, 2017
by
Germán Callejas Alcántara
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Supervisor asociado a picto funcionando
parent
9817cfab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/PictoUploader.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/SerialActivity.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/PictoUploader.java
View file @
673d1552
...
@@ -165,6 +165,7 @@ public class PictoUploader {
...
@@ -165,6 +165,7 @@ public class PictoUploader {
Hashtable
<
String
,
String
>
params
=
new
Hashtable
<
String
,
String
>(
4
);
Hashtable
<
String
,
String
>
params
=
new
Hashtable
<
String
,
String
>(
4
);
try
{
try
{
JSONObject
json_attrs
=
new
JSONObject
().
put
(
"status"
,
picto
.
get_status
());
JSONObject
json_attrs
=
new
JSONObject
().
put
(
"status"
,
picto
.
get_status
());
json_attrs
.
put
(
"user_avatar"
,
picto
.
get_user_avatar
());
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
has_categories
())
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
has_categories
())
json_attrs
.
put
(
Picto
.
JSON_ATTTRS
.
CATEGORY
,
picto
.
get_category
())
json_attrs
.
put
(
Picto
.
JSON_ATTTRS
.
CATEGORY
,
picto
.
get_category
())
.
put
(
Picto
.
JSON_ATTTRS
.
COLUMN
,
picto
.
get_column
())
.
put
(
Picto
.
JSON_ATTTRS
.
COLUMN
,
picto
.
get_column
())
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/SerialActivity.java
View file @
673d1552
...
@@ -90,7 +90,7 @@ public class SerialActivity extends Activity {
...
@@ -90,7 +90,7 @@ public class SerialActivity extends Activity {
mSerialViewPass
.
requestFocus
();
mSerialViewPass
.
requestFocus
();
Toast
toast
=
Toast
.
makeText
(
PCBcontext
.
getContext
(),
R
.
string
.
insertPasswordLogin
,
Toast
.
LENGTH_SHORT
);
Toast
toast
=
Toast
.
makeText
(
PCBcontext
.
getContext
(),
R
.
string
.
insertPasswordLogin
,
Toast
.
LENGTH_SHORT
);
toast
.
show
();
toast
.
show
();
}
else
{
}
else
{
SharedPreferences
settings
=
getSharedPreferences
(
PREFS_NAME
,
0
);
SharedPreferences
settings
=
getSharedPreferences
(
PREFS_NAME
,
0
);
SharedPreferences
.
Editor
editor
=
settings
.
edit
();
SharedPreferences
.
Editor
editor
=
settings
.
edit
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment