Commit 9cf4d38c by german callejas

Gradle issue and launcher icons fixed

parent 9d42f9ba
......@@ -20,7 +20,7 @@ import com.yottacode.net.RestapiWrapper;
import com.yottacode.pictogram.dao.User;
import com.yottacode.pictogram.net.ImgDownloader;
import com.yottacode.pictogram.supervisor.R;
import com.yottacode.pictogram.tabletlibrary.gui.communicator.VOCA;
import com.yottacode.pictogram.supervisor.gui.VOCAS;
import com.yottacode.pictogram.tools.Img;
import com.yottacode.pictogram.tools.PCBcontext;
import com.yottacode.tools.GUITools;
......@@ -92,7 +92,7 @@ public class StudentFragmentGrid extends Fragment {
Log.e(StudentFragmentGrid.this.getClass().getCanonicalName(), e.getMessage());
}
PCBcontext.set_user(currentUser, null, null);
Intent pictogramActivity = new Intent(getActivity(), VOCA.class);
Intent pictogramActivity = new Intent(getActivity(), VOCAS.class);
startActivity(pictogramActivity);
} else {
if (this.nameStudents[i].equals(getString(R.string.addStudent)))
......@@ -222,7 +222,7 @@ public class StudentFragmentGrid extends Fragment {
if (progressDialog != null && progressDialog.isShowing())
progressDialog.dismiss();
PCBcontext.getPcbdb().user_valid(license_valid);
Intent pictogramActivity = new Intent(getActivity(), VOCA.class);
Intent pictogramActivity = new Intent(getActivity(), VOCAS.class);
startActivity(pictogramActivity);
}
......
......@@ -46,6 +46,6 @@ public class MainActivity extends Activity {
private void login() {
final String username="faf0002";
final String password="faf0002";
new UserLogin().login(username,password,this, MainActivity.class,null);
new UserLogin().login(username,password,this, MainActivity.class);
}
}
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