diff options
5 files changed, 52 insertions, 73 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 8af5142e2..34f3e9098 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -158,7 +158,8 @@ <activity android:name=".ui.UpdaterActivity" android:screenOrientation="portrait" - android:theme="@style/ConversationsTheme" > + android:theme="@style/ConversationsTheme" + android:label="@string/title_activity_updater" > </activity> <service android:name=".services.UpdaterWebService" /> <service android:name=".services.CheckAppVersionService" /> diff --git a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java b/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java index ddc89e1a4..52301c603 100644 --- a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java +++ b/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java @@ -38,7 +38,6 @@ public class CheckAppVersionService extends HttpServlet { out.println(myObj.toString()); out.close(); - } } diff --git a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java b/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java index faad2fd93..0b220f2bc 100644 --- a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java +++ b/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java @@ -19,15 +19,15 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import eu.siacs.conversations.Config; -import eu.siacs.conversations.ui.UpdaterActivity.MyWebReceiver; +import eu.siacs.conversations.ui.UpdaterActivity.UpdateReceiver; public class UpdaterWebService extends IntentService{ public static final String REQUEST_STRING = ""; public static final String RESPONSE_MESSAGE = ""; private String URL = null; - private static final int REGISTRATION_TIMEOUT = 3 * 1000; - private static final int WAIT_TIMEOUT = 30 * 1000; + public static final int REGISTRATION_TIMEOUT = 3 * 1000; + public static final int WAIT_TIMEOUT = 30 * 1000; public UpdaterWebService() { super("UpdaterWebService"); @@ -54,6 +54,7 @@ public class UpdaterWebService extends IntentService{ HttpResponse response = httpclient.execute(httpGet); StatusLine statusLine = response.getStatusLine(); + Log.d(Config.LOGTAG, "AppUpdater: HTTP Status Code: " + statusLine.getStatusCode()); if(statusLine.getStatusCode() == HttpStatus.SC_OK){ ByteArrayOutputStream out = new ByteArrayOutputStream(); response.getEntity().writeTo(out); @@ -80,7 +81,7 @@ public class UpdaterWebService extends IntentService{ Intent broadcastIntent = new Intent(); - broadcastIntent.setAction(MyWebReceiver.PROCESS_RESPONSE); + broadcastIntent.setAction(UpdateReceiver.PROCESS_RESPONSE); broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT); broadcastIntent.putExtra(RESPONSE_MESSAGE, responseMessage); sendBroadcast(broadcastIntent); diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java index 7f721f0e6..8da4d38d5 100644 --- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java @@ -17,6 +17,7 @@ import android.os.Bundle; import android.os.Environment; import android.util.Log; import android.view.WindowManager; +import android.widget.TextView; import android.widget.Toast; import org.json.JSONException; @@ -30,8 +31,7 @@ import eu.siacs.conversations.services.UpdaterWebService; public class UpdaterActivity extends Activity { - private static final String LOG_TAG = Config.LOGTAG + "AppUpgrade"; - private MyWebReceiver receiver; + private UpdateReceiver receiver = null; private int versionCode = 0; String appURI = ""; @@ -49,33 +49,16 @@ public class UpdaterActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - //disable touch events - getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, - WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE); - - //Overall information about the contents of a package - //This corresponds to all of the information collected from AndroidManifest.xml. - PackageInfo pInfo = null; - try { - pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); - } - catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - } - //get the app version Name for display - String version = pInfo.versionName; - //get the app version Code for checking - versionCode = pInfo.versionCode; - /* - //display the current version in a TextView - TextView currentversionText = (TextView) findViewById(R.id.current_versionName); - currentversionText.setText(getText(R.string.current_version) + version); -*/ + + //set activity + setContentView(R.layout.activity_updater); + TextView textView = (TextView) findViewById(R.id.updater); + textView.setText(R.string.update_info); + //Broadcast receiver for our Web Request - IntentFilter filter = new IntentFilter(MyWebReceiver.PROCESS_RESPONSE); + IntentFilter filter = new IntentFilter(UpdateReceiver.PROCESS_RESPONSE); filter.addCategory(Intent.CATEGORY_DEFAULT); - receiver = new MyWebReceiver(); + receiver = new UpdateReceiver(); registerReceiver(receiver, filter); //Broadcast receiver for the download manager @@ -89,18 +72,11 @@ public class UpdaterActivity extends Activity { Toast.makeText(getApplicationContext(), getText(R.string.checking_for_updates), - Toast.LENGTH_LONG).show(); + Toast.LENGTH_SHORT).show(); startService(msgIntent); } } - /*@Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.activity_main, menu); - return true; - } -*/ @Override public void onDestroy() { //unregister your receivers @@ -140,12 +116,15 @@ public class UpdaterActivity extends Activity { } //broadcast receiver to get notification when the web request finishes - public class MyWebReceiver extends BroadcastReceiver { + public class UpdateReceiver extends BroadcastReceiver { public static final String PROCESS_RESPONSE = "eu.siacs.conversations.intent.action.PROCESS_RESPONSE"; @Override public void onReceive(Context context, Intent intent) { + //disable touch events + getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, + WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE); String reponseMessage = intent.getStringExtra(UpdaterWebService.RESPONSE_MESSAGE); Log.d(Config.LOGTAG, "AppUpdater: " + reponseMessage); @@ -167,33 +146,43 @@ public class UpdaterActivity extends Activity { e.printStackTrace(); } //get the app version Name for display - String version = pInfo.versionName; + final String versionName = pInfo.versionName; + final int versionCode = pInfo.versionCode; //get the latest version from the JSON string int latestVersionCode = responseObj.getInt("latestVersionCode"); String latestVersion = responseObj.getString("latestVersion"); String changelog = responseObj.getString("changelog"); - /* - //display the new version in a TextView - TextView versionText = (TextView) findViewById(R.id.versionName); - versionText.setText(getText(R.string.new_version) + latestVersion); - */ //get the lastest application URI from the JSON string appURI = responseObj.getString("appURI"); //check if we need to upgrade? if(latestVersionCode > versionCode){ Log.d(Config.LOGTAG, "AppUpdater: update available"); + //delete old downloaded version files + File dir = new File(getExternalFilesDir(null), Environment.DIRECTORY_DOWNLOADS); + Log.d(Config.LOGTAG, "AppUpdater - Delete old update files in: " + dir); + if (dir.isDirectory()) + { + String[] children = dir.list(); + for (int i = 0; i < children.length; i++) + { + new File(dir, children[i]).delete(); + } + } //enable touch events getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE); - + //oh yeah we do need an upgrade, let the user know send an alert message AlertDialog.Builder builder = new AlertDialog.Builder(UpdaterActivity.this); builder.setCancelable(false); String UpdateMessageInfo = getResources().getString(R.string.update_available); - builder.setMessage(String.format(UpdateMessageInfo, latestVersion, changelog, version)) + builder.setMessage(String.format(UpdateMessageInfo, latestVersion, changelog, versionName)) .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() { //if the user agrees to upgrade public void onClick(DialogInterface dialog, int id) { + //disable touch events + getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, + WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE); //start downloading the file using the download manager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); Uri Download_Uri = Uri.parse(appURI); @@ -201,19 +190,7 @@ public class UpdaterActivity extends Activity { request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI); request.setAllowedOverRoaming(false); request.setTitle("Conversations Update"); - request.setDestinationInExternalFilesDir(UpdaterActivity.this, Environment.DIRECTORY_DOWNLOADS, "Conversations.apk"); - //delete old downloaded version files - File dir = new File(getExternalFilesDir(null), Environment.DIRECTORY_DOWNLOADS); - Log.d(Config.LOGTAG, "AppUpdater - Delete old update files in: " + dir); - if (dir.isDirectory()) - { - String[] children = dir.list(); - for (int i = 0; i < children.length; i++) - { - new File(dir, children[i]).delete(); - } - } - + request.setDestinationInExternalFilesDir(UpdaterActivity.this, Environment.DIRECTORY_DOWNLOADS, "Conversations" + versionName + ".apk"); downloadReference = downloadManager.enqueue(request); Toast.makeText(getApplicationContext(), getText(R.string.download_started), @@ -252,7 +229,6 @@ public class UpdaterActivity extends Activity { @Override public void onReceive(Context context, Intent intent) { - //check if the broadcast message is for our Enqueued download long referenceId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1); if(downloadReference == referenceId){ @@ -264,7 +240,13 @@ public class UpdaterActivity extends Activity { "application/vnd.android.package-archive"); installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(installIntent); + UpdaterActivity.this.finish(); } } }; + + //disable back button + @Override + public void onBackPressed() { + } }
\ No newline at end of file diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index b8da14415..50bdf0695 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -4,16 +4,12 @@ android:layout_height="match_parent" tools:context="eu.siacs.conversations.ui.UpdaterActivity"> - <TextView android:id="@+id/current_versionName" android:layout_width="wrap_content" + <TextView android:id="@+id/updater" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" android:layout_marginTop="16dp" + android:layout_alignParentTop="true" android:layout_marginTop="6dp" android:text="Current" android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="bold" /> - - <TextView android:id="@+id/versionName" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="New" android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="bold" - android:layout_below="@+id/current_versionName" /> + android:textStyle="normal" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" /> </RelativeLayout> |