Commit for can do pull
This commit is contained in:
commit
1cb498c001
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.handmark.pulltorefresh.library"
|
||||
android:versionCode="2110"
|
||||
android:versionName="2.1.1" >
|
||||
|
||||
<uses-sdk android:minSdkVersion="4" />
|
||||
|
||||
<application />
|
||||
|
||||
</manifest>
|
@ -1,78 +0,0 @@
|
||||
int anim slide_in_from_bottom 0x7f040000
|
||||
int anim slide_in_from_top 0x7f040001
|
||||
int anim slide_out_to_bottom 0x7f040002
|
||||
int anim slide_out_to_top 0x7f040003
|
||||
int attr ptrAdapterViewBackground 0x7f010010
|
||||
int attr ptrAnimationStyle 0x7f01000c
|
||||
int attr ptrDrawable 0x7f010006
|
||||
int attr ptrDrawableBottom 0x7f010012
|
||||
int attr ptrDrawableEnd 0x7f010008
|
||||
int attr ptrDrawableStart 0x7f010007
|
||||
int attr ptrDrawableTop 0x7f010011
|
||||
int attr ptrHeaderBackground 0x7f010001
|
||||
int attr ptrHeaderSubTextColor 0x7f010003
|
||||
int attr ptrHeaderTextAppearance 0x7f01000a
|
||||
int attr ptrHeaderTextColor 0x7f010002
|
||||
int attr ptrListViewExtrasEnabled 0x7f01000e
|
||||
int attr ptrMode 0x7f010004
|
||||
int attr ptrOverScroll 0x7f010009
|
||||
int attr ptrRefreshableViewBackground 0x7f010000
|
||||
int attr ptrRotateDrawableWhilePulling 0x7f01000f
|
||||
int attr ptrScrollingWhileRefreshingEnabled 0x7f01000d
|
||||
int attr ptrShowIndicator 0x7f010005
|
||||
int attr ptrSubHeaderTextAppearance 0x7f01000b
|
||||
int dimen header_footer_left_right_padding 0x7f060003
|
||||
int dimen header_footer_top_bottom_padding 0x7f060004
|
||||
int dimen indicator_corner_radius 0x7f060001
|
||||
int dimen indicator_internal_padding 0x7f060002
|
||||
int dimen indicator_right_padding 0x7f060000
|
||||
int drawable default_ptr_flip 0x7f020000
|
||||
int drawable default_ptr_rotate 0x7f020001
|
||||
int drawable indicator_arrow 0x7f020002
|
||||
int drawable indicator_bg_bottom 0x7f020003
|
||||
int drawable indicator_bg_top 0x7f020004
|
||||
int id both 0x7f050003
|
||||
int id disabled 0x7f050000
|
||||
int id fl_inner 0x7f05000c
|
||||
int id flip 0x7f050008
|
||||
int id gridview 0x7f050009
|
||||
int id manualOnly 0x7f050004
|
||||
int id pullDownFromTop 0x7f050005
|
||||
int id pullFromEnd 0x7f050002
|
||||
int id pullFromStart 0x7f050001
|
||||
int id pullUpFromBottom 0x7f050006
|
||||
int id pull_to_refresh_image 0x7f05000d
|
||||
int id pull_to_refresh_progress 0x7f05000e
|
||||
int id pull_to_refresh_sub_text 0x7f050010
|
||||
int id pull_to_refresh_text 0x7f05000f
|
||||
int id rotate 0x7f050007
|
||||
int id scrollview 0x7f05000b
|
||||
int id webview 0x7f05000a
|
||||
int layout pull_to_refresh_header_horizontal 0x7f030000
|
||||
int layout pull_to_refresh_header_vertical 0x7f030001
|
||||
int string pull_to_refresh_from_bottom_pull_label 0x7f070003
|
||||
int string pull_to_refresh_from_bottom_refreshing_label 0x7f070005
|
||||
int string pull_to_refresh_from_bottom_release_label 0x7f070004
|
||||
int string pull_to_refresh_pull_label 0x7f070000
|
||||
int string pull_to_refresh_refreshing_label 0x7f070002
|
||||
int string pull_to_refresh_release_label 0x7f070001
|
||||
int[] styleable PullToRefresh { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005, 0x7f010006, 0x7f010007, 0x7f010008, 0x7f010009, 0x7f01000a, 0x7f01000b, 0x7f01000c, 0x7f01000d, 0x7f01000e, 0x7f01000f, 0x7f010010, 0x7f010011, 0x7f010012 }
|
||||
int styleable PullToRefresh_ptrAdapterViewBackground 16
|
||||
int styleable PullToRefresh_ptrAnimationStyle 12
|
||||
int styleable PullToRefresh_ptrDrawable 6
|
||||
int styleable PullToRefresh_ptrDrawableBottom 18
|
||||
int styleable PullToRefresh_ptrDrawableEnd 8
|
||||
int styleable PullToRefresh_ptrDrawableStart 7
|
||||
int styleable PullToRefresh_ptrDrawableTop 17
|
||||
int styleable PullToRefresh_ptrHeaderBackground 1
|
||||
int styleable PullToRefresh_ptrHeaderSubTextColor 3
|
||||
int styleable PullToRefresh_ptrHeaderTextAppearance 10
|
||||
int styleable PullToRefresh_ptrHeaderTextColor 2
|
||||
int styleable PullToRefresh_ptrListViewExtrasEnabled 14
|
||||
int styleable PullToRefresh_ptrMode 4
|
||||
int styleable PullToRefresh_ptrOverScroll 9
|
||||
int styleable PullToRefresh_ptrRefreshableViewBackground 0
|
||||
int styleable PullToRefresh_ptrRotateDrawableWhilePulling 15
|
||||
int styleable PullToRefresh_ptrScrollingWhileRefreshingEnabled 13
|
||||
int styleable PullToRefresh_ptrShowIndicator 5
|
||||
int styleable PullToRefresh_ptrSubHeaderTextAppearance 11
|
@ -110,16 +110,14 @@
|
||||
android:paddingRight="32dp"
|
||||
android:text="@string/action_sign_in_register" />
|
||||
|
||||
<Button
|
||||
<TextView
|
||||
android:id="@+id/why_password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/sign_in_button"
|
||||
android:layout_gravity="right"
|
||||
android:layout_marginTop="16dp"
|
||||
android:paddingLeft="32dp"
|
||||
android:paddingRight="32dp"
|
||||
android:text="@string/why_password" />
|
||||
android:text="@string/why_password"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="@color/blue" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lost_password"
|
||||
@ -130,8 +128,8 @@
|
||||
android:layout_alignLeft="@id/why_password"
|
||||
android:text="@string/lost_password"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@android:color/black" />
|
||||
android:textColor="@color/blue" />
|
||||
</RelativeLayout>
|
||||
</ScrollView>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
@ -48,6 +48,7 @@
|
||||
<color name="lightskyblue">#DDECF1</color>
|
||||
<color name="sgi_salmon">#C67171</color>
|
||||
<color name="white">#ffffff</color>
|
||||
<color name="blue">#0000ff</color>
|
||||
|
||||
|
||||
</resources>
|
@ -30,7 +30,9 @@ import android.content.Intent;
|
||||
import android.database.Cursor;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.text.SpannableString;
|
||||
import android.text.TextUtils;
|
||||
import android.text.style.UnderlineSpan;
|
||||
import android.util.Log;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.LayoutInflater;
|
||||
@ -41,7 +43,6 @@ import android.view.inputmethod.EditorInfo;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemSelectedListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ExpandableListView;
|
||||
import android.widget.ImageButton;
|
||||
@ -150,7 +151,8 @@ public class SWADMain extends MenuExpandableListActivity {
|
||||
private TextView mLoginStatusMessageView;
|
||||
private ImageButton mUpdateButton;
|
||||
private ProgressBar mProgressBar;
|
||||
private Button mWhyPasswordButton;
|
||||
private TextView mWhyPasswordText;
|
||||
private TextView mLostPasswordText;
|
||||
|
||||
/**
|
||||
* Gets the database helper
|
||||
@ -801,13 +803,23 @@ public class SWADMain extends MenuExpandableListActivity {
|
||||
mLoginFormView = findViewById(R.id.login_form);
|
||||
mLoginStatusView = findViewById(R.id.login_status);
|
||||
mProgressBar = (ProgressBar) this.findViewById(R.id.progress_refresh);
|
||||
mWhyPasswordButton = (Button) findViewById(R.id.why_password);
|
||||
mWhyPasswordText = (TextView) findViewById(R.id.why_password);
|
||||
mLostPasswordText = (TextView) findViewById(R.id.lost_password);
|
||||
|
||||
mWhyPasswordButton.setVisibility(View.GONE);
|
||||
SpannableString lostPasswordUnderline = new SpannableString(getString(R.string.lost_password));
|
||||
lostPasswordUnderline.setSpan(new UnderlineSpan(), 0, lostPasswordUnderline.length(), 0);
|
||||
mLostPasswordText.setText(lostPasswordUnderline);
|
||||
|
||||
SpannableString whyPasswordUnderline = new SpannableString(getString(R.string.why_password));
|
||||
whyPasswordUnderline.setSpan(new UnderlineSpan(), 0, whyPasswordUnderline.length(), 0);
|
||||
mWhyPasswordText.setText(whyPasswordUnderline);
|
||||
|
||||
|
||||
mWhyPasswordText.setVisibility(View.GONE);
|
||||
mUpdateButton.setVisibility(View.VISIBLE);
|
||||
mProgressBar.setVisibility(View.GONE);
|
||||
|
||||
mWhyPasswordButton.setOnClickListener(new OnClickListener() {
|
||||
mWhyPasswordText.setOnClickListener(new OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
@ -826,7 +838,7 @@ public class SWADMain extends MenuExpandableListActivity {
|
||||
mLoginFormView.setVisibility(show ? View.VISIBLE : View.GONE);
|
||||
|
||||
if (Preferences.getServer().equals(Constants.DEFAULT_SERVER)) {
|
||||
mWhyPasswordButton.setVisibility(show ? View.VISIBLE : View.GONE);
|
||||
mWhyPasswordText.setVisibility(show ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
setupLoginForm();
|
||||
|
@ -11,7 +11,6 @@ import android.view.View;
|
||||
import android.webkit.WebView;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import es.ugr.swad.swadroid.Constants;
|
||||
import es.ugr.swad.swadroid.R;
|
||||
import es.ugr.swad.swadroid.model.User;
|
||||
@ -20,219 +19,198 @@ import es.ugr.swad.swadroid.webservices.SOAPClient;
|
||||
|
||||
import org.ksoap2.serialization.SoapObject;
|
||||
|
||||
|
||||
public class Information extends Module {
|
||||
|
||||
public static final String TAG = Constants.APP_TAG + " Information";
|
||||
|
||||
|
||||
public static final String TAG = Constants.APP_TAG + " Information";
|
||||
|
||||
/**
|
||||
* Information Type. String with the type of information (none, HTML, plain text...)
|
||||
*/
|
||||
private String infoSrc;
|
||||
|
||||
/**
|
||||
* Information Content. String with the content of information.
|
||||
*/
|
||||
private String infoTxt;
|
||||
|
||||
/**
|
||||
* Request code to get course's information
|
||||
*/
|
||||
private String infoTypeToAdd;
|
||||
* Information Type. String with the type of information (none, HTML, plain
|
||||
* text...)
|
||||
*/
|
||||
private String infoSrc;
|
||||
|
||||
/**
|
||||
* Information Content. String with the content of information.
|
||||
*/
|
||||
private String infoTxt;
|
||||
|
||||
/**
|
||||
* Request code to get course's information
|
||||
*/
|
||||
private String infoTypeToAdd;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
||||
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.webview_information_screen_layout);
|
||||
//WebView webview = (WebView) this.findViewById(R.id.contentWebView);
|
||||
|
||||
ImageView moduleIcon;
|
||||
TextView moduleText;
|
||||
|
||||
this.findViewById(R.id.courseSelectedText).setVisibility(View.VISIBLE);
|
||||
|
||||
int requestCode = this.getIntent().getIntExtra("requestCode", 0);
|
||||
|
||||
TextView courseNameText = (TextView) this.findViewById(R.id.courseSelectedText);
|
||||
courseNameText.setText(Constants.getSelectedCourseShortName());
|
||||
|
||||
switch (requestCode) {
|
||||
|
||||
|
||||
case Constants.INTRODUCTION_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "introduction";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.introductionModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.FAQS_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "";/*falta en la funcion que obtiene la informacion de las asignaturas*/
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.faqsModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.BIBLIOGRAPHY_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "bibliography";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.bibliographyModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.PRACTICESPROGRAM_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "practicals";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.practicesprogramModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.THEORYPROGRAM_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "";/*falta en la funcion que obtiene la informacion de las asignaturas*/
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.theoryprogramModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.LINKS_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "links";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.linksModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.TEACHINGGUIDE_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "guide";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.teachingguideModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void connect() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
String progressDescription = getString(R.string.informationProgressDescription);
|
||||
int progressTitle = R.string.informationProgressTitle;
|
||||
|
||||
startConnection(true, progressDescription, progressTitle);
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.webview_information_screen_layout);
|
||||
|
||||
ImageView moduleIcon;
|
||||
TextView moduleText;
|
||||
|
||||
this.findViewById(R.id.courseSelectedText).setVisibility(View.VISIBLE);
|
||||
|
||||
int requestCode = this.getIntent().getIntExtra("requestCode", 0);
|
||||
|
||||
TextView courseNameText = (TextView) this
|
||||
.findViewById(R.id.courseSelectedText);
|
||||
courseNameText.setText(Constants.getSelectedCourseShortName());
|
||||
|
||||
switch (requestCode) {
|
||||
|
||||
case Constants.INTRODUCTION_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "introduction";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.introductionModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.FAQS_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "";/*
|
||||
* falta en la funcion que obtiene la
|
||||
* informacion de las asignaturas
|
||||
*/
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.faqsModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.BIBLIOGRAPHY_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "bibliography";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.bibliographyModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.PRACTICESPROGRAM_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "practicals";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.practicesprogramModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.THEORYPROGRAM_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "";/*
|
||||
* falta en la funcion que obtiene la
|
||||
* informacion de las asignaturas
|
||||
*/
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.theoryprogramModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.LINKS_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "links";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.linksModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
case Constants.TEACHINGGUIDE_REQUEST_CODE:
|
||||
|
||||
infoTypeToAdd = "guide";
|
||||
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.teachingguideModuleLabel);
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
setMETHOD_NAME("getCourseInfo");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
try {
|
||||
runConnection();
|
||||
} catch (Exception e) {
|
||||
String errorMsg = getString(R.string.errorServerResponseMsg);
|
||||
error(TAG, errorMsg, e, true);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void connect() {
|
||||
String progressDescription = getString(R.string.informationProgressDescription);
|
||||
int progressTitle = R.string.informationProgressTitle;
|
||||
|
||||
startConnection(true, progressDescription, progressTitle);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void requestService() throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
createRequest(SOAPClient.CLIENT_TYPE);
|
||||
addParam("wsKey", Constants.getLoggedUser().getWsKey());
|
||||
addParam("courseCode", Constants.getSelectedCourseCode());
|
||||
addParam("infoType", infoTypeToAdd);
|
||||
sendRequest(User.class, false);
|
||||
|
||||
if (result != null) {
|
||||
|
||||
//ArrayList<?> res = new ArrayList<Object>((Vector<?>) result);
|
||||
SoapObject soap = (SoapObject) result;
|
||||
//infoType = res.get(1).toString();
|
||||
//infoContent = res.get(2).toString();
|
||||
infoSrc = soap.getProperty(infoSrc).toString();
|
||||
infoTxt = soap.getPrimitiveProperty(infoTxt).toString();
|
||||
|
||||
|
||||
//Request finalized without errors
|
||||
setResult(RESULT_OK);
|
||||
|
||||
}
|
||||
|
||||
|
||||
else{
|
||||
|
||||
infoTxt = getString (R.string.connectionRequired);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (result != null) {
|
||||
SoapObject soap = (SoapObject) result;
|
||||
infoSrc = soap.getProperty(infoSrc).toString();
|
||||
infoTxt = soap.getPrimitiveProperty(infoTxt).toString();
|
||||
|
||||
// Request finalized without errors
|
||||
setResult(RESULT_OK);
|
||||
} else {
|
||||
infoTxt = getString(R.string.connectionRequired);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void postConnect() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
WebView webview = (WebView) this.findViewById(R.id.contentWebView);
|
||||
|
||||
if (infoSrc.equals("none")) {
|
||||
|
||||
webview.loadData("Información no disponible", "text/html; charset=UTF-8", null);//cargar el string traducible (no esta aun creado)
|
||||
|
||||
}
|
||||
|
||||
else {
|
||||
|
||||
if (infoSrc.equals("URL")) {
|
||||
|
||||
webview.loadUrl(infoTxt);
|
||||
|
||||
}
|
||||
|
||||
else{
|
||||
|
||||
webview.loadData(infoTxt, "text/html; charset=UTF-8", null);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
WebView webview = (WebView) this.findViewById(R.id.contentWebView);
|
||||
|
||||
if (infoSrc.equals("none")) {
|
||||
webview.loadData("Informaci<EFBFBD>n no disponible",
|
||||
"text/html; charset=UTF-8", null);// cargar el string
|
||||
// traducible (no esta
|
||||
// aun creado)
|
||||
} else if (infoSrc.equals("URL")) {
|
||||
webview.loadUrl(infoTxt);
|
||||
} else {
|
||||
webview.loadData(infoTxt, "text/html; charset=UTF-8", null);
|
||||
}
|
||||
|
||||
finish();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onError() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
finish();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user