Skip to content

Commit

Permalink
Merged code for auto-installation as privileged app (#27)
Browse files Browse the repository at this point in the history 
Merge remote-tracking branch 'Diegohp/GPII-installer_FVE.git' into demoKit

* Diegohp/GPII-installer_FVE.git:
  Changes added to GpiiActivity to fix some bugs
  Added changes to install GPII Android Application with declarative Strings, GPII User Listerners for NFC and QR, and GPII Architecture on the same project
  Some errors fixed. Added modification into prebuild.sh to download right jar library from maven repository
  prebuild.sh file modified to import common compress library
  Adding dependencies for tar an gzip
  New indentation added to whole class with four spaces
  Added 4 spaces instead tabulation on GpiiActivity.java. Added header
  Changes applied to GpiiActivity.java and AndroidManifest.xml for upgrading GpiiActivity Android application in order to autodeploy it
  • Loading branch information
@javihernandez
javihernandez committed Nov 3, 2015
2 parents df751ad + ea287c4 commit a6c2d6f
Show file tree
Hide file tree
Showing 17 changed files with 1,373 additions and 112 deletions.
3 changes: 3 additions & 0 deletions platform/app/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<uses-permission android:name="android.permission.READ_SMS"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>

<uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" android:required="false"/>

<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
Expand Down
9 changes: 9 additions & 0 deletions platform/app/assets/GpiiDataResources.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<urltargpii>http://docs.google.com/uc?authuser=0&amp;id=0B9NaK6yZUAngMzdsRDdQWi1rbDg&amp;export=download</urltargpii>
<urluserlistenersgpii>https://github.com/javihernandez/android-user-listeners/releases/download/v0.1/AndroidUserListeners-debug.apk</urluserlistenersgpii>
<urlgpiicompatibleandroiddevices>http://wiki.gpii.net/index.php/GPII_Android_Devices_Compatibility_Table</urlgpiicompatibleandroiddevices>
<urlgpiirootdevices>http://wiki.gpii.net/w/List_of_root_devices</urlgpiirootdevices>
<namegpiijs>gpii-android.tar.gz</namegpiijs>
<namegpiiapk>net.gpii.app-1.apk</namegpiiapk>
<namegpiiuserlistenersapk>cloud4all.UserListener.NFC-1.apk</namegpiiuserlistenersapk>

Binary file added platform/app/assets/gpii-android
View file
Binary file not shown.
147 changes: 147 additions & 0 deletions platform/app/res/layout-land/main.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:scrollbars="vertical"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true" >

<ImageView
android:id="@+id/imageView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:adjustViewBounds="true"
android:src="@drawable/gpii_logo"
android:scaleX="0.65"
android:scaleY="0.65"
android:contentDescription="@string/gpii_logo_content" />

<Button
android:id="@+id/installButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1"
android:layout_centerHorizontal="true"
android:layout_marginLeft="92dp"
android:visibility="gone"
android:text="@string/button_intallation" />

<RelativeLayout
android:id="@+id/gpii_Info"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1">

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="@string/gpii_status_label"
android:textStyle="bold"
android:layout_marginTop="15dp"
/>

<TextView
android:id="@+id/gpii_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/textView1"
android:layout_alignBottom="@+id/textView1"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/textView1"
android:text="@string/gpii_status_unknown"
android:textColorHighlight="@android:color/darker_gray"
/>

<TextView
android:id="@+id/TextView01"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView1"
android:text="@string/gpii_script_label"
android:layout_marginTop="15dp"
android:textStyle="bold"
/>

<EditText
android:id="@+id/gpii_script_uri"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/TextView01"
android:layout_alignParentRight="true"
android:layout_below="@+id/TextView01"
android:layout_marginTop="10dp"
android:ems="10"
android:inputType="textUri"
android:maxLines="1"
android:scrollHorizontally="true"
android:text="@string/gpii_default_script_uri"
/>

<TextView
android:id="@+id/TextView02"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/gpii_script_uri"
android:layout_below="@+id/gpii_script_uri"
android:layout_marginTop="23dp"
android:text="@string/gpii_controls"
android:textStyle="bold"
/>

<Button
android:id="@+id/gpii_start_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/TextView02"
android:layout_marginTop="10dp"
android:text="@string/gpii_controls_start"
/>

<Button
android:id="@+id/gpii_stop_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/gpii_start_button"
android:layout_toRightOf="@+id/gpii_start_button"
android:text="@string/gpii_controls_stop"
/>

<Button
android:id="@+id/gpii_kill_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/gpii_stop_button"
android:layout_toRightOf="@+id/gpii_stop_button"
android:text="@string/gpii_controls_kill"
/>

<Button
android:id="@+id/gpii_update_status_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/gpii_kill_button"
android:layout_toRightOf="@+id/gpii_kill_button"
android:text="@string/gpii_controls_update_status"
android:singleLine="true"
/>

</RelativeLayout>

<Button
android:id="@+id/downloadButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/button_download" />

</RelativeLayout>
26 changes: 26 additions & 0 deletions platform/app/res/layout-land/progress_download_layout.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#88000000">

<TextView
android:id="@+id/textview_overlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/white"
android:textAlignment="center"
android:text="@string/waitfor"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_margin="5dp"/>
<ProgressBar
android:id="@+id/progressbar_overlay"
android:layout_below="@id/textview_overlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"/>

</RelativeLayout>
148 changes: 148 additions & 0 deletions platform/app/res/layout-xlarge-land/main.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:scrollbars="vertical"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true" >

<ImageView
android:id="@+id/imageView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:src="@drawable/gpii_logo"
android:scaleX="0.65"
android:scaleY="0.65"
android:contentDescription="@string/gpii_logo_content" />

<Button
android:id="@+id/installButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1"
android:layout_centerHorizontal="true"
android:layout_marginLeft="92dp"
android:visibility="gone"
android:text="@string/button_intallation" />

<RelativeLayout
android:id="@+id/gpii_Info"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1">

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="@string/gpii_status_label"
android:textStyle="bold"
android:layout_marginTop="15dp"
/>

<TextView
android:id="@+id/gpii_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/textView1"
android:layout_alignBottom="@+id/textView1"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/textView1"
android:text="@string/gpii_status_unknown"
android:textColorHighlight="@android:color/darker_gray"
/>

<TextView
android:id="@+id/TextView01"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView1"
android:text="@string/gpii_script_label"
android:layout_marginTop="15dp"
android:textStyle="bold"
/>

<EditText
android:id="@+id/gpii_script_uri"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/TextView01"
android:layout_alignParentRight="true"
android:layout_below="@+id/TextView01"
android:layout_marginTop="10dp"
android:ems="10"
android:inputType="textUri"
android:maxLines="1"
android:scrollHorizontally="true"
android:text="@string/gpii_default_script_uri"
/>

<TextView
android:id="@+id/TextView02"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/gpii_script_uri"
android:layout_below="@+id/gpii_script_uri"
android:layout_marginTop="23dp"
android:text="@string/gpii_controls"
android:textStyle="bold"
/>

<Button
android:id="@+id/gpii_start_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/TextView02"
android:layout_marginTop="10dp"
android:text="@string/gpii_controls_start"
/>

<Button
android:id="@+id/gpii_stop_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/gpii_start_button"
android:layout_toRightOf="@+id/gpii_start_button"
android:text="@string/gpii_controls_stop"
/>

<Button
android:id="@+id/gpii_kill_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/gpii_stop_button"
android:layout_toRightOf="@+id/gpii_stop_button"
android:text="@string/gpii_controls_kill"
/>

<Button
android:id="@+id/gpii_update_status_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/gpii_kill_button"
android:layout_toRightOf="@+id/gpii_kill_button"
android:text="@string/gpii_controls_update_status"
android:singleLine="true"
/>

</RelativeLayout>

<Button
android:id="@+id/downloadButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/button_download" />

</RelativeLayout>
26 changes: 26 additions & 0 deletions platform/app/res/layout-xlarge-land/progress_download_layout.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#88000000">

<TextView
android:id="@+id/textview_overlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/white"
android:textAlignment="center"
android:text="@string/waitfor"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_margin="5dp"/>
<ProgressBar
android:id="@+id/progressbar_overlay"
android:layout_below="@id/textview_overlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"/>

</RelativeLayout>
Loading

0 comments on commit a6c2d6f

Please sign in to comment.