Skip to content

Commit a6c2d6f

Browse files
javihernandezjavihernandez
committed
Merged code for auto-installation as privileged app (#27)
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
2 parents df751ad + ea287c4 commit a6c2d6f

File tree

17 files changed

+1373
-112
lines changed

17 files changed

+1373
-112
lines changed

‎platform/app/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<uses-permission android:name="android.permission.READ_SMS"></uses-permission>
1818
<uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
1919

20+
<uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
21+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" android:required="false"/>
22+
2023
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
2124
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
2225
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

‎platform/app/assets/GpiiDataResources.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<urltargpii>http://docs.google.com/uc?authuser=0&amp;id=0B9NaK6yZUAngMzdsRDdQWi1rbDg&amp;export=download</urltargpii>
3+
<urluserlistenersgpii>https://github.com/javihernandez/android-user-listeners/releases/download/v0.1/AndroidUserListeners-debug.apk</urluserlistenersgpii>
4+
<urlgpiicompatibleandroiddevices>http://wiki.gpii.net/index.php/GPII_Android_Devices_Compatibility_Table</urlgpiicompatibleandroiddevices>
5+
<urlgpiirootdevices>http://wiki.gpii.net/w/List_of_root_devices</urlgpiirootdevices>
6+
<namegpiijs>gpii-android.tar.gz</namegpiijs>
7+
<namegpiiapk>net.gpii.app-1.apk</namegpiiapk>
8+
<namegpiiuserlistenersapk>cloud4all.UserListener.NFC-1.apk</namegpiiuserlistenersapk>
9+

‎platform/app/assets/gpii-android

17.7 MB
Binary file not shown.

‎platform/app/res/layout-land/main.xml

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
android:scrollbars="vertical"
11+
android:descendantFocusability="beforeDescendants"
12+
android:focusableInTouchMode="true" >
13+
14+
<ImageView
15+
android:id="@+id/imageView1"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:layout_alignParentTop="true"
19+
android:adjustViewBounds="true"
20+
android:src="@drawable/gpii_logo"
21+
android:scaleX="0.65"
22+
android:scaleY="0.65"
23+
android:contentDescription="@string/gpii_logo_content" />
24+
25+
<Button
26+
android:id="@+id/installButton"
27+
android:layout_width="wrap_content"
28+
android:layout_height="wrap_content"
29+
android:layout_below="@+id/imageView1"
30+
android:layout_centerHorizontal="true"
31+
android:layout_marginLeft="92dp"
32+
android:visibility="gone"
33+
android:text="@string/button_intallation" />
34+
35+
<RelativeLayout
36+
android:id="@+id/gpii_Info"
37+
android:visibility="gone"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:layout_below="@+id/imageView1">
41+
42+
<TextView
43+
android:id="@+id/textView1"
44+
android:layout_width="wrap_content"
45+
android:layout_height="wrap_content"
46+
android:layout_alignParentLeft="true"
47+
android:text="@string/gpii_status_label"
48+
android:textStyle="bold"
49+
android:layout_marginTop="15dp"
50+
/>
51+
52+
<TextView
53+
android:id="@+id/gpii_status"
54+
android:layout_width="wrap_content"
55+
android:layout_height="wrap_content"
56+
android:layout_alignBaseline="@+id/textView1"
57+
android:layout_alignBottom="@+id/textView1"
58+
android:layout_marginLeft="5dp"
59+
android:layout_toRightOf="@+id/textView1"
60+
android:text="@string/gpii_status_unknown"
61+
android:textColorHighlight="@android:color/darker_gray"
62+
/>
63+
64+
<TextView
65+
android:id="@+id/TextView01"
66+
android:layout_width="wrap_content"
67+
android:layout_height="wrap_content"
68+
android:layout_below="@+id/textView1"
69+
android:text="@string/gpii_script_label"
70+
android:layout_marginTop="15dp"
71+
android:textStyle="bold"
72+
/>
73+
74+
<EditText
75+
android:id="@+id/gpii_script_uri"
76+
android:layout_width="wrap_content"
77+
android:layout_height="wrap_content"
78+
android:layout_alignLeft="@+id/TextView01"
79+
android:layout_alignParentRight="true"
80+
android:layout_below="@+id/TextView01"
81+
android:layout_marginTop="10dp"
82+
android:ems="10"
83+
android:inputType="textUri"
84+
android:maxLines="1"
85+
android:scrollHorizontally="true"
86+
android:text="@string/gpii_default_script_uri"
87+
/>
88+
89+
<TextView
90+
android:id="@+id/TextView02"
91+
android:layout_width="wrap_content"
92+
android:layout_height="wrap_content"
93+
android:layout_alignLeft="@+id/gpii_script_uri"
94+
android:layout_below="@+id/gpii_script_uri"
95+
android:layout_marginTop="23dp"
96+
android:text="@string/gpii_controls"
97+
android:textStyle="bold"
98+
/>
99+
100+
<Button
101+
android:id="@+id/gpii_start_button"
102+
android:layout_width="wrap_content"
103+
android:layout_height="wrap_content"
104+
android:layout_below="@+id/TextView02"
105+
android:layout_marginTop="10dp"
106+
android:text="@string/gpii_controls_start"
107+
/>
108+
109+
<Button
110+
android:id="@+id/gpii_stop_button"
111+
android:layout_width="wrap_content"
112+
android:layout_height="wrap_content"
113+
android:layout_alignBottom="@+id/gpii_start_button"
114+
android:layout_toRightOf="@+id/gpii_start_button"
115+
android:text="@string/gpii_controls_stop"
116+
/>
117+
118+
<Button
119+
android:id="@+id/gpii_kill_button"
120+
android:layout_width="wrap_content"
121+
android:layout_height="wrap_content"
122+
android:layout_alignBottom="@+id/gpii_stop_button"
123+
android:layout_toRightOf="@+id/gpii_stop_button"
124+
android:text="@string/gpii_controls_kill"
125+
/>
126+
127+
<Button
128+
android:id="@+id/gpii_update_status_button"
129+
android:layout_width="wrap_content"
130+
android:layout_height="wrap_content"
131+
android:layout_alignBottom="@+id/gpii_kill_button"
132+
android:layout_toRightOf="@+id/gpii_kill_button"
133+
android:text="@string/gpii_controls_update_status"
134+
android:singleLine="true"
135+
/>
136+
137+
</RelativeLayout>
138+
139+
<Button
140+
android:id="@+id/downloadButton"
141+
android:layout_width="wrap_content"
142+
android:layout_height="wrap_content"
143+
android:layout_centerHorizontal="true"
144+
android:layout_centerVertical="true"
145+
android:text="@string/button_download" />
146+
147+
</RelativeLayout>

‎platform/app/res/layout-land/progress_download_layout.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:background="#88000000">
6+
7+
<TextView
8+
android:id="@+id/textview_overlay"
9+
android:layout_width="wrap_content"
10+
android:layout_height="wrap_content"
11+
android:textSize="20sp"
12+
android:textStyle="bold"
13+
android:textColor="@android:color/white"
14+
android:textAlignment="center"
15+
android:text="@string/waitfor"
16+
android:layout_centerHorizontal="true"
17+
android:layout_centerVertical="true"
18+
android:layout_margin="5dp"/>
19+
<ProgressBar
20+
android:id="@+id/progressbar_overlay"
21+
android:layout_below="@id/textview_overlay"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_centerHorizontal="true"/>
25+
26+
</RelativeLayout>

‎platform/app/res/layout-xlarge-land/main.xml

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
android:scrollbars="vertical"
11+
android:descendantFocusability="beforeDescendants"
12+
android:focusableInTouchMode="true" >
13+
14+
<ImageView
15+
android:id="@+id/imageView1"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:layout_alignParentTop="true"
19+
android:layout_centerInParent="true"
20+
android:adjustViewBounds="true"
21+
android:src="@drawable/gpii_logo"
22+
android:scaleX="0.65"
23+
android:scaleY="0.65"
24+
android:contentDescription="@string/gpii_logo_content" />
25+
26+
<Button
27+
android:id="@+id/installButton"
28+
android:layout_width="wrap_content"
29+
android:layout_height="wrap_content"
30+
android:layout_below="@+id/imageView1"
31+
android:layout_centerHorizontal="true"
32+
android:layout_marginLeft="92dp"
33+
android:visibility="gone"
34+
android:text="@string/button_intallation" />
35+
36+
<RelativeLayout
37+
android:id="@+id/gpii_Info"
38+
android:visibility="gone"
39+
android:layout_width="wrap_content"
40+
android:layout_height="wrap_content"
41+
android:layout_below="@+id/imageView1">
42+
43+
<TextView
44+
android:id="@+id/textView1"
45+
android:layout_width="wrap_content"
46+
android:layout_height="wrap_content"
47+
android:layout_alignParentLeft="true"
48+
android:text="@string/gpii_status_label"
49+
android:textStyle="bold"
50+
android:layout_marginTop="15dp"
51+
/>
52+
53+
<TextView
54+
android:id="@+id/gpii_status"
55+
android:layout_width="wrap_content"
56+
android:layout_height="wrap_content"
57+
android:layout_alignBaseline="@+id/textView1"
58+
android:layout_alignBottom="@+id/textView1"
59+
android:layout_marginLeft="5dp"
60+
android:layout_toRightOf="@+id/textView1"
61+
android:text="@string/gpii_status_unknown"
62+
android:textColorHighlight="@android:color/darker_gray"
63+
/>
64+
65+
<TextView
66+
android:id="@+id/TextView01"
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:layout_below="@+id/textView1"
70+
android:text="@string/gpii_script_label"
71+
android:layout_marginTop="15dp"
72+
android:textStyle="bold"
73+
/>
74+
75+
<EditText
76+
android:id="@+id/gpii_script_uri"
77+
android:layout_width="wrap_content"
78+
android:layout_height="wrap_content"
79+
android:layout_alignLeft="@+id/TextView01"
80+
android:layout_alignParentRight="true"
81+
android:layout_below="@+id/TextView01"
82+
android:layout_marginTop="10dp"
83+
android:ems="10"
84+
android:inputType="textUri"
85+
android:maxLines="1"
86+
android:scrollHorizontally="true"
87+
android:text="@string/gpii_default_script_uri"
88+
/>
89+
90+
<TextView
91+
android:id="@+id/TextView02"
92+
android:layout_width="wrap_content"
93+
android:layout_height="wrap_content"
94+
android:layout_alignLeft="@+id/gpii_script_uri"
95+
android:layout_below="@+id/gpii_script_uri"
96+
android:layout_marginTop="23dp"
97+
android:text="@string/gpii_controls"
98+
android:textStyle="bold"
99+
/>
100+
101+
<Button
102+
android:id="@+id/gpii_start_button"
103+
android:layout_width="wrap_content"
104+
android:layout_height="wrap_content"
105+
android:layout_below="@+id/TextView02"
106+
android:layout_marginTop="10dp"
107+
android:text="@string/gpii_controls_start"
108+
/>
109+
110+
<Button
111+
android:id="@+id/gpii_stop_button"
112+
android:layout_width="wrap_content"
113+
android:layout_height="wrap_content"
114+
android:layout_alignBottom="@+id/gpii_start_button"
115+
android:layout_toRightOf="@+id/gpii_start_button"
116+
android:text="@string/gpii_controls_stop"
117+
/>
118+
119+
<Button
120+
android:id="@+id/gpii_kill_button"
121+
android:layout_width="wrap_content"
122+
android:layout_height="wrap_content"
123+
android:layout_alignBottom="@+id/gpii_stop_button"
124+
android:layout_toRightOf="@+id/gpii_stop_button"
125+
android:text="@string/gpii_controls_kill"
126+
/>
127+
128+
<Button
129+
android:id="@+id/gpii_update_status_button"
130+
android:layout_width="wrap_content"
131+
android:layout_height="wrap_content"
132+
android:layout_alignBottom="@+id/gpii_kill_button"
133+
android:layout_toRightOf="@+id/gpii_kill_button"
134+
android:text="@string/gpii_controls_update_status"
135+
android:singleLine="true"
136+
/>
137+
138+
</RelativeLayout>
139+
140+
<Button
141+
android:id="@+id/downloadButton"
142+
android:layout_width="wrap_content"
143+
android:layout_height="wrap_content"
144+
android:layout_centerHorizontal="true"
145+
android:layout_centerVertical="true"
146+
android:text="@string/button_download" />
147+
148+
</RelativeLayout>

‎platform/app/res/layout-xlarge-land/progress_download_layout.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:background="#88000000">
6+
7+
<TextView
8+
android:id="@+id/textview_overlay"
9+
android:layout_width="wrap_content"
10+
android:layout_height="wrap_content"
11+
android:textSize="20sp"
12+
android:textStyle="bold"
13+
android:textColor="@android:color/white"
14+
android:textAlignment="center"
15+
android:text="@string/waitfor"
16+
android:layout_centerHorizontal="true"
17+
android:layout_centerVertical="true"
18+
android:layout_margin="5dp"/>
19+
<ProgressBar
20+
android:id="@+id/progressbar_overlay"
21+
android:layout_below="@id/textview_overlay"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_centerHorizontal="true"/>
25+
26+
</RelativeLayout>

0 commit comments

Comments
 (0)