ziver/ue-control
1
0
Fork 0
Code Pull requests Releases Activity

Fixed Surfing to download all linked content like images and iframes, also added FTP download

Browse source
This commit is contained in:
Ziver Koc 2014-07-31 14:41:40 +02:00
parent d9fac2807a
commit 21e55f12c4
9 changed files with 107 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/ericsson/uecontrol/gui/EditActivity.java
View file

@ -78,7 +78,7 @@ public class EditActivity extends ListActivity implements AdapterView.OnItemClic
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
final UeBehaviour behaviour = executor.getBehaviourList().get(i);
UeBehaviour behaviour = executor.getBehaviourList().get(i);
Configurator confer = new Configurator(behaviour);
ConfigureDialog dialog = new ConfigureDialog();

14
app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
View file

@ -12,6 +12,7 @@ import android.view.MenuItem;
import com.ericsson.uecontrol.R;
import com.ericsson.uecontrol.core.UeControlExecutor;
import com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp;
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep;
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing;
import com.ericsson.uecontrol.gui.fragments.BehaviourListFragment;
@ -20,8 +21,7 @@ import com.ericsson.uecontrol.gui.fragments.StatusFragment;
import com.ericsson.uecontrol.gui.util.CSVWriter;
public class MainActivity extends FragmentActivity
implements NavigationDrawerFragment.NavigationDrawerCallbacks {
public class MainActivity extends FragmentActivity {
/**
* Fragment managing the behaviors, interactions and presentation of the navigation drawer.
@ -42,6 +42,8 @@ public class MainActivity extends FragmentActivity
// getFragmentManager().findFragmentById(R.id.navigation_drawer);
statusFragment = (StatusFragment)
getFragmentManager().findFragmentById(R.id.status_fragment);
getFragmentManager().beginTransaction()
.replace(R.id.container, BehaviourListFragment.newInstance()).commit();
// Set up the drawer.
//navigationDrawerFragment.setUp(
@ -53,16 +55,8 @@ public class MainActivity extends FragmentActivity
currentExecutor.addBehaviour(new UeBehaviourSurfing());
currentExecutor.addBehaviour(new UeBehaviourSleep(4000));
currentExecutor.setThroughputListener(statusFragment.getThroughputListener());
onNavigationDrawerItemSelected(0);
}
@Override
public void onNavigationDrawerItemSelected(int position) {
// update the main content by replacing fragments
FragmentManager fragmentManager = getFragmentManager();
fragmentManager.beginTransaction()
.replace(R.id.container, BehaviourListFragment.newInstance()).commit();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {

2
app/src/main/java/com/ericsson/uecontrol/gui/fragments/ConfigureDialog.java
View file

@ -58,7 +58,7 @@ public class ConfigureDialog extends DialogFragment {
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
input.setText(confParam.getString(), TextView.BufferType.EDITABLE);
input.setInputType(InputType.TYPE_NULL);
input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
inputs.put(confParam.getName(), input);
layout.addView(input);

25
app/src/main/java/com/ericsson/uecontrol/gui/fragments/SelectBehaviourDialog.java
View file

@ -13,7 +13,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class SelectBehaviourDialog extends DialogFragment {
public static String[] behavioursClasses;
public static String[] behaviourClasses;
public static String[] behaviourNames;
private BehaviourSelectionCallback callback;
@ -22,17 +22,18 @@ public class SelectBehaviourDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
// Generate nice behaviour names
if(behavioursClasses == null) {
behavioursClasses = getResources().getStringArray(R.array.behaviours);
behaviourNames = new String[behavioursClasses.length];
if(behaviourClasses == null) {
behaviourClasses = getResources().getStringArray(R.array.behaviours);
behaviourNames = new String[behaviourClasses.length];
Pattern p = Pattern.compile("[\\w\\.]*\\.(?:UeBehaviour|)(\\w*)");
for (int i = 0; i < behavioursClasses.length; i++) {
Matcher m = p.matcher(behavioursClasses[i]);
if(m.find())
behaviourNames[i] = m.group(1);
else
behaviourNames[i] = behavioursClasses[i];
for (int i = 0; i < behaviourClasses.length; i++) {
try {
UeBehaviour obj = (UeBehaviour) Class.forName(behaviourClasses[i]).newInstance();
behaviourNames[i] = obj.getName();
}catch(Exception e){
e.printStackTrace();
behaviourNames[i] = behaviourClasses[i];
}
}
}
@ -43,7 +44,7 @@ public class SelectBehaviourDialog extends DialogFragment {
public void onClick(DialogInterface dialog, int which) {
try {
if (callback != null){
Class objClass = Class.forName(behavioursClasses[which]);
Class objClass = Class.forName(behaviourClasses[which]);
callback.behaviourSelected(behaviourNames[which], objClass);
}
} catch (Exception e) {

4
app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java
View file

@ -35,8 +35,10 @@ public class CSVWriter {
public CSVWriter(Context context){
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String path = prefs.getString("logging_path", "/sdcard/uecontrol/");
if(!path.endsWith("/")) path += "/";
file = new File(
prefs.getString("logging_path", "/sdcard/uecontrol/"),
path,
"log_"+fileDateFormater.format(System.currentTimeMillis())+".log");
ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);

5
app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
View file

@ -91,7 +91,10 @@ public class Configurator {
public String getNiceName(){return niceName;}
public ConfigType getType(){return type;}
public String getString(){return value.toString();}
public String getString(){
if(value == null)
return null;
return value.toString();}
public void setString(String v){
switch(type){