July 2014 - tor-commits - lists.torproject.org

[orbot/master] notification layout for the expanded notification, still in testing. Also includes integration of remote view for the big layout
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit a787fdf8cdda2374af61ee6477409ab672b52415 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Thu May 29 04:25:28 2014 +0530 notification layout for the expanded notification, still in testing. Also includes integration of remote view for the big layout --- res/layout/layout_notification_expanded.xml | 46 ++++++++++++++++++++ src/org/torproject/android/Orbot.java | 7 ++- src/org/torproject/android/service/TorService.java | 33 ++++++++++---- 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/res/layout/layout_notification_expanded.xml b/res/layout/layout_notification_expanded.xml new file mode 100644 index 0000000..8bf0a9d --- /dev/null +++ b/res/layout/layout_notification_expanded.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center_horizontal"> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/img" + android:layout_height="64dp" + android:layout_width="64dp" + android:src="@drawable/torerror"/> + + <TextView + android:id="@+id/orb" + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:textSize="20sp" + android:paddingLeft="10dp" + android:paddingTop="5dp" + android:layout_toRightOf="@+id/img" + android:text="Orbot"/> + + <TextView + android:id="@+id/tv" + android:layout_toRightOf="@+id/img" + android:layout_below="@+id/orb" + android:paddingLeft="15dp" + android:textSize="10sp" + android:layout_width="fill_parent" + android:layout_height="wrap_content"/> + + <Button + android:id="@+id/but" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/tv" + android:text="test" /> + + </RelativeLayout> + +</LinearLayout> \ No newline at end of file diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 94300d1..90b8e74 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -532,7 +532,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onNewIntent(Intent intent) { super.onNewIntent(intent); - + try { + Log.d("lala", ""+mService.getStatus()); + } catch (RemoteException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } updateStatus(""); handleIntents(); } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1a90258..5d52cde 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -39,6 +39,7 @@ import org.torproject.android.settings.AppManager; import android.annotation.SuppressLint; import android.app.Application; +import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; @@ -58,6 +59,9 @@ import android.os.RemoteException; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.RemoteViews; public class TorService extends Service implements TorServiceConstants, TorConstants, EventHandler { @@ -106,6 +110,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private NotificationManager mNotificationManager = null; private Builder mNotifyBuilder; + private Notification mNotification; private boolean mHasRoot = false; private boolean mEnableTransparentProxy = false; @@ -219,9 +224,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void showToolbarNotification (String notifyMsg, int notifyId, int icon, boolean isOngoing) - { - + @SuppressLint("NewApi") + private void showToolbarNotification (String notifyMsg, int notifyId, int icon, boolean isOngoing) + { + + PendingIntent pendingIntent = PendingIntent.getActivity(TorService.this, 0, new Intent(TorService.this , Orbot.class), 0); + // Create remote view that needs to be set as bigContentView for the notification. + RemoteViews expandedView = new RemoteViews(this.getPackageName(), + R.layout.layout_notification_expanded); + expandedView.setTextViewText(R.id.tv, notifyMsg); + expandedView.setOnClickPendingIntent(R.id.but, pendingIntent); + expandedView.setImageViewResource(R.id.img, icon); + if (mNotifyBuilder == null) { @@ -246,6 +260,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotifyBuilder.setContentText(notifyMsg); mNotifyBuilder.setSmallIcon(icon); + if (notifyId == ERROR_NOTIFY_ID) { mNotifyBuilder.setTicker(notifyMsg); @@ -254,19 +269,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotifyBuilder.setSmallIcon(R.drawable.ic_stat_notifyerr); } + mNotification = mNotifyBuilder.build(); + mNotification.bigContentView = expandedView; + if (isOngoing) { - startForeground(notifyId, - mNotifyBuilder.build()); + startForeground(notifyId, mNotification); } else { - mNotificationManager.notify( - notifyId, - mNotifyBuilder.build()); + mNotificationManager.notify(notifyId, mNotification); } - + } /* (non-Javadoc)

1 0

[orbot/master] added styles to build the custom notification, minor tweaks to old code
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 99dfdd711d5be21b308dd2b2da748c91347362c3 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Thu May 29 04:56:06 2014 +0530 added styles to build the custom notification, minor tweaks to old code --- res/layout/layout_notification_expanded.xml | 8 +++++--- res/values/styles.xml | 5 +++++ src/org/torproject/android/service/TorService.java | 17 ++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/res/layout/layout_notification_expanded.xml b/res/layout/layout_notification_expanded.xml index 8bf0a9d..3eceb5e 100644 --- a/res/layout/layout_notification_expanded.xml +++ b/res/layout/layout_notification_expanded.xml @@ -12,7 +12,7 @@ android:id="@+id/img" android:layout_height="64dp" android:layout_width="64dp" - android:src="@drawable/torerror"/> + android:src="@drawable/tor"/> <TextView android:id="@+id/orb" @@ -22,7 +22,8 @@ android:paddingLeft="10dp" android:paddingTop="5dp" android:layout_toRightOf="@+id/img" - android:text="Orbot"/> + android:text="Orbot" + style="@style/NotificationTitle"/> <TextView android:id="@+id/tv" @@ -31,7 +32,8 @@ android:paddingLeft="15dp" android:textSize="10sp" android:layout_width="fill_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + style="@style/NotificationText"/> <Button android:id="@+id/but" diff --git a/res/values/styles.xml b/res/values/styles.xml new file mode 100644 index 0000000..b3fe8af --- /dev/null +++ b/res/values/styles.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" /> + <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" /> +</resources> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5d52cde..df6443a 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -227,22 +227,21 @@ public class TorService extends Service implements TorServiceConstants, TorConst @SuppressLint("NewApi") private void showToolbarNotification (String notifyMsg, int notifyId, int icon, boolean isOngoing) { - - PendingIntent pendingIntent = PendingIntent.getActivity(TorService.this, 0, new Intent(TorService.this , Orbot.class), 0); - // Create remote view that needs to be set as bigContentView for the notification. + + //Reusable code. + Intent intent = new Intent(TorService.this, Orbot.class); + PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); + + // Create remote view that needs to be set as bigContentView for the notification. RemoteViews expandedView = new RemoteViews(this.getPackageName(), R.layout.layout_notification_expanded); expandedView.setTextViewText(R.id.tv, notifyMsg); - expandedView.setOnClickPendingIntent(R.id.but, pendingIntent); + expandedView.setOnClickPendingIntent(R.id.but, pendIntent); expandedView.setImageViewResource(R.id.img, icon); if (mNotifyBuilder == null) { - //Reusable code. - Intent intent = new Intent(TorService.this, Orbot.class); - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); if (mNotifyBuilder == null) @@ -270,7 +269,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } mNotification = mNotifyBuilder.build(); - mNotification.bigContentView = expandedView; + //mNotification.bigContentView = expandedView; if (isOngoing) {

1 0

[orbot/master] Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 758633c9e6471de28dcea1d63484e477a63555b7 Merge: 99dfdd7 c111030 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Thu May 29 05:02:08 2014 +0530 Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes res/layout/layout_wizard_tips.xml | 11 ++++++++++- res/values/strings.xml | 2 ++ src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)

1 0

[orbot/master] updated the expanded notification ui, calls for getting exit ip implemented, exit ip added temporarily in the title of the notification till the final ui is ready. Regex to match ip address on getting response from the exit node written.
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 133922f7b49c31fe4ac1dc199182f90ad7cb45d6 Author: amoghbl1 <amoghbl1(a)gmail.com> Date: Wed Jun 18 06:02:23 2014 +0530 updated the expanded notification ui, calls for getting exit ip implemented, exit ip added temporarily in the title of the notification till the final ui is ready. Regex to match ip address on getting response from the exit node written. --- AndroidManifest.xml | 2 +- libs/jtorctl.jar | Bin 14742 -> 14742 bytes res/drawable/icon_orweb.png | Bin 6596 -> 6596 bytes res/drawable/icon_story_maker.png | Bin 4290 -> 4290 bytes res/drawable/torerror.png | Bin 14633 -> 14633 bytes res/layout/layout_notification_expanded.xml | 170 ++++++--- .../notification_template_part_chronometer.xml | 25 ++ res/layout/notification_template_part_time.xml | 25 ++ res/values/dimens.xml | 361 ++++++++++++++++++++ src/org/torproject/android/service/TorService.java | 55 ++- 10 files changed, 584 insertions(+), 54 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc3b9ca..4c185e3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -80,7 +80,7 @@ <activity android:name=".wizard.ChooseLocaleWizardActivity" android:exported="false"/> <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".settings.AppManager" android:label="@string/app_name"/> + <activity android:name=".settings.AppManager" android:label="@string/app_name"/> <service android:enabled="true" android:name=".service.TorService" diff --git a/external/config.guess b/external/config.guess old mode 100755 new mode 100644 diff --git a/external/config.sub b/external/config.sub old mode 100755 new mode 100644 diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar old mode 100755 new mode 100644 diff --git a/res/drawable/icon_orweb.png b/res/drawable/icon_orweb.png old mode 100755 new mode 100644 diff --git a/res/drawable/icon_story_maker.png b/res/drawable/icon_story_maker.png old mode 100755 new mode 100644 diff --git a/res/drawable/torerror.png b/res/drawable/torerror.png old mode 100755 new mode 100644 diff --git a/res/layout/layout_notification_expanded.xml b/res/layout/layout_notification_expanded.xml index 3eceb5e..e3c6dc5 100644 --- a/res/layout/layout_notification_expanded.xml +++ b/res/layout/layout_notification_expanded.xml @@ -1,48 +1,136 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/status_bar_latest_event_content" + android:layout_width="match_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + > + <ImageView android:id="@+id/icon" + android:layout_width="@dimen/notification_large_icon_width" + android:layout_height="@dimen/notification_large_icon_height" + android:scaleType="center" + /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="fill_vertical" + android:layout_marginStart="@dimen/notification_large_icon_width" + android:minHeight="@dimen/notification_large_icon_height" + android:orientation="vertical" + android:paddingEnd="8dp" + android:paddingTop="2dp" + android:paddingBottom="2dp" + android:gravity="top" + > + <LinearLayout + android:id="@+id/line1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="6dp" + android:layout_marginStart="8dp" + android:orientation="horizontal" + > + <TextView android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center_horizontal"> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - - <ImageView - android:id="@+id/img" - android:layout_height="64dp" - android:layout_width="64dp" - android:src="@drawable/tor"/> - - <TextView - android:id="@+id/orb" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:textSize="20sp" - android:paddingLeft="10dp" - android:paddingTop="5dp" - android:layout_toRightOf="@+id/img" - android:text="Orbot" - style="@style/NotificationTitle"/> - - <TextView - android:id="@+id/tv" - android:layout_toRightOf="@+id/img" - android:layout_below="@+id/orb" - android:paddingLeft="15dp" - android:textSize="10sp" - android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:layout_weight="1" + /> + <ViewStub android:id="@+id/time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:visibility="gone" + android:layout="@layout/notification_template_part_time" + /> + <ViewStub android:id="@+id/chronometer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:visibility="gone" + android:layout="@layout/notification_template_part_chronometer" + /> + </LinearLayout> + <TextView android:id="@+id/text2" + android:layout_width="match_parent" android:layout_height="wrap_content" - style="@style/NotificationText"/> - - <Button - android:id="@+id/but" + android:layout_marginTop="-2dp" + android:layout_marginBottom="-2dp" + android:layout_marginStart="8dp" + android:singleLine="true" + android:fadingEdge="horizontal" + android:ellipsize="marquee" + android:visibility="gone" + /> + <ProgressBar + android:id="@android:id/progress" + android:layout_width="match_parent" + android:layout_height="12dp" + android:layout_marginStart="8dp" + android:visibility="gone" + style="?android:attr/progressBarStyleHorizontal" + /> + <LinearLayout + android:id="@+id/line3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical" + android:layout_marginStart="8dp" + > + <TextView android:id="@+id/text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + /> + <TextView android:id="@+id/info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:singleLine="true" + android:gravity="center" + android:paddingStart="8dp" + /> + <ImageView android:id="@+id/right_icon" + android:layout_width="16dp" + android:layout_height="16dp" + android:layout_gravity="center" + android:layout_weight="0" + android:layout_marginStart="8dp" + android:scaleType="centerInside" + android:visibility="gone" + /> + <Button + android:id="@+id/_tor_notificationBT" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_below="@+id/tv" - android:text="test" /> - - </RelativeLayout> - -</LinearLayout> \ No newline at end of file + android:text="test2" /> + </LinearLayout> + </LinearLayout> +</FrameLayout> diff --git a/res/layout/notification_template_part_chronometer.xml b/res/layout/notification_template_part_chronometer.xml new file mode 100644 index 0000000..14a4758 --- /dev/null +++ b/res/layout/notification_template_part_chronometer.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<Chronometer android:id="@+id/chronometer" xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:singleLine="true" + android:gravity="center" + android:paddingStart="8dp" + /> diff --git a/res/layout/notification_template_part_time.xml b/res/layout/notification_template_part_time.xml new file mode 100644 index 0000000..e3b91fa --- /dev/null +++ b/res/layout/notification_template_part_time.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<DateTimeView android:id="@+id/time" xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:singleLine="true" + android:gravity="center" + android:paddingStart="8dp" + /> diff --git a/res/menu/main.xml b/res/menu/main.xml old mode 100755 new mode 100644 diff --git a/res/values/dimens.xml b/res/values/dimens.xml new file mode 100644 index 0000000..f96195c --- /dev/null +++ b/res/values/dimens.xml @@ -0,0 +1,361 @@ +<?xml version="1.0" encoding="utf-8"?> + +<resources> +  + <dimen name="thumbnail_width">164dp</dimen> +  + <dimen name="thumbnail_height">145dp</dimen> +  + <dimen name="app_icon_size">48dip</dimen> +  + <integer name="max_action_buttons">2</integer> + <dimen name="toast_y_offset">64dip</dimen> +  + <dimen name="status_bar_height">25dip</dimen> +  + <dimen name="navigation_bar_height">48dp</dimen> +  + <dimen name="navigation_bar_height_landscape">48dp</dimen> +  + <dimen name="navigation_bar_width">42dp</dimen> +  + <dimen name="status_bar_icon_size">24dip</dimen> +  + <dimen name="status_bar_content_number_size">48sp</dimen> +  + <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen> +  + <dimen name="system_bar_icon_size">32dip</dimen> +  + <dimen name="status_bar_edge_ignore">5dp</dimen> + +  + <dimen name="fastscroll_overlay_size">104dp</dimen> +  + <dimen name="fastscroll_overlay_text_size">52sp</dimen> +  + <dimen name="fastscroll_overlay_padding">16dp</dimen> +  + <dimen name="fastscroll_thumb_width">64dp</dimen> +  + <dimen name="fastscroll_thumb_height">52dp</dimen> +  + <dimen name="min_xlarge_screen_width">800dp</dimen> + +  + <dimen name="password_keyboard_key_height_alpha">56dip</dimen> +  + <dimen name="password_keyboard_key_height_numeric">56dip</dimen> +  + <dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen> +  + <dimen name="password_keyboard_horizontalGap">3dip</dimen> +  + <dimen name="password_keyboard_verticalGap">9dip</dimen> + +  + <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen> + +  + <dimen name="glowpadview_target_placement_radius">135dip</dimen> + +  + <dimen name="glowpadview_glow_radius">75dip</dimen> + +  + <dimen name="glowpadview_snap_margin">40dip</dimen> + +  + <dimen name="glowpadview_inner_radius">15dip</dimen> + +  + <dimen name="preference_screen_side_margin">0dp</dimen> +  + <dimen name="preference_screen_side_margin_negative">0dp</dimen> +  + <dimen name="preference_screen_top_margin">0dp</dimen> +  + <dimen name="preference_screen_bottom_margin">0dp</dimen> +  + <dimen name="preference_widget_width">48dp</dimen> +  + <dimen name="preference_fragment_padding_bottom">0dp</dimen> +  + <dimen name="preference_fragment_padding_side">16dp</dimen> +  + <integer name="preferences_left_pane_weight">4</integer> +  + <integer name="preferences_right_pane_weight">6</integer> +  + <dimen name="preference_breadcrumb_paddingLeft">0dp</dimen> +  + <dimen name="preference_breadcrumb_paddingRight">0dp</dimen> +  + <dimen name="preference_icon_minWidth">0dp</dimen> +  + <item type="dimen" name="dialog_min_width_major">65%</item> + +  + <item type="dimen" name="dialog_fixed_width_major">320dp</item> +  + <item type="dimen" name="dialog_fixed_width_minor">320dp</item> +  + <item type="dimen" name="dialog_fixed_height_major">80%</item> +  + <item type="dimen" name="dialog_fixed_height_minor">100%</item> + +  + <dimen name="preference_screen_header_vertical_padding">0dp</dimen> + + <dimen name="preference_screen_header_padding_side">16dip</dimen> + <integer name="preference_screen_header_scrollbarStyle">0x02000000</integer>  + + <integer name="preference_fragment_scrollbarStyle">0x02000000</integer>  + + <dimen name="preference_item_padding_side">8dip</dimen> + <dimen name="preference_item_padding_inner">8dip</dimen> + <dimen name="preference_child_padding_side">16dip</dimen> + +  + <item type="dimen" name="dialog_min_width_minor">95%</item> + +  + <dimen name="notification_large_icon_width">64dp</dimen> +  + <dimen name="notification_large_icon_height">64dp</dimen> + +  + <dimen name="search_view_text_min_width">160dip</dimen> + +  + <dimen name="search_view_preferred_width">320dip</dimen> + +  + <dimen name="alert_dialog_title_height">64dip</dimen> +  + <dimen name="alert_dialog_button_bar_height">48dip</dimen> + +  + <dimen name="action_bar_default_height">48dip</dimen> +  + <dimen name="action_bar_icon_vertical_padding">8dip</dimen> +  + <dimen name="action_bar_title_text_size">18dp</dimen> +  + <dimen name="action_bar_subtitle_text_size">14dp</dimen> +  + <dimen name="action_bar_subtitle_top_margin">-3dp</dimen> +  + <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen> + +  + <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen> + +  + <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen> + +  + <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen> + +  + <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen> + +  + <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen> + +  + <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen> + +  + <dimen name="face_unlock_height">330dip</dimen> + +  + <dimen name="activity_chooser_popup_min_width">200dip</dimen> + +  + <dimen name="default_gap">8dip</dimen> + +  + <dimen name="dropdownitem_text_padding_left">8dip</dimen> + +  + <dimen name="dropdownitem_text_padding_right">8dip</dimen> + +  + <dimen name="dropdownitem_icon_width">32dip</dimen> + +  + <dimen name="textview_error_popup_default_width">240dip</dimen> + +  + <dimen name="volume_panel_top">80dp</dimen> + +  + <dimen name="default_app_widget_padding_left">8dp</dimen> + <dimen name="default_app_widget_padding_top">8dp</dimen> + <dimen name="default_app_widget_padding_right">8dp</dimen> + <dimen name="default_app_widget_padding_bottom">8dp</dimen> + +  + <dimen name="action_button_min_width">56dip</dimen> + +  + <dimen name="action_bar_stacked_max_height">48dp</dimen> + +  + <dimen name="action_bar_stacked_tab_max_width">180dp</dimen> + +  + <dimen name="notification_text_size">14dp</dimen> +  + <dimen name="notification_title_text_size">18dp</dimen> +  + <dimen name="notification_subtext_size">12dp</dimen> + +  +  + <dimen name="kg_security_panel_height">600dp</dimen> + +  + <dimen name="kg_security_view_height">480dp</dimen> + +  + <dimen name="kg_widget_view_width">0dp</dimen> + +  + <dimen name="kg_widget_view_height">0dp</dimen> + +  + <dimen name="kg_status_clock_font_size">75dp</dimen> + +  + <dimen name="kg_status_date_font_size">15dp</dimen> + +  + <dimen name="kg_status_line_font_size">13dp</dimen> + +  + <dimen name="kg_status_line_font_right_margin">16dp</dimen> + +  + <dimen name="kg_clock_top_margin">-16dp</dimen> + +  + <dimen name="kg_key_horizontal_gap">0dp</dimen> + +  + <dimen name="kg_key_vertical_gap">0dp</dimen> + +  + <dimen name="kg_pin_key_height">60dp</dimen> + +  + <dimen name="kg_secure_padding_height">46dp</dimen> + +  + <dimen name="kg_runway_lights_height">7dp</dimen> + +  + <dimen name="kg_runway_lights_vertical_padding">2dp</dimen> + +  + <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen> + +  + <dimen name="kg_widget_pager_top_padding">0dp</dimen> + +  + <dimen name="kg_widget_pager_bottom_padding">64dp</dimen> + +  + <dimen name="kg_runway_lights_top_margin">0dp</dimen> + +  + <dimen name="accessibility_touch_slop">80dip</dimen> + +  + <dimen name="keyguard_security_width">320dp</dimen> + +  + <dimen name="keyguard_security_height">400dp</dimen> + +  + <dimen name="keyguard_security_view_margin">8dp</dimen> + +  + <dimen name="keyguard_muliuser_selector_margin">8dp</dimen> + +  + <dimen name="keyguard_avatar_frame_stroke_width">2dp</dimen> + +  + <dimen name="keyguard_avatar_frame_shadow_radius">1dp</dimen> + +  + <dimen name="keyguard_avatar_size">66dp</dimen> + +  + <dimen name="keyguard_avatar_name_size">10sp</dimen> + +  + <dimen name="kg_edge_swipe_region_size">24dp</dimen> + +  + <dimen name="kg_squashed_layout_threshold">600dp</dimen> + +  + <dimen name="kg_small_widget_height">160dp</dimen> + +  + <dimen name="subtitle_corner_radius">2dp</dimen> + +  + <dimen name="subtitle_shadow_radius">2dp</dimen> + +  + <dimen name="subtitle_shadow_offset">2dp</dimen> + +  + <dimen name="subtitle_outline_width">2dp</dimen> + +  + <dimen name="immersive_mode_cling_width">-1px</dimen> +</resources> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index df6443a..205be24 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.StringTokenizer; import java.util.Timer; import java.util.TimerTask; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import net.freehaven.tor.control.ConfigEntry; import net.freehaven.tor.control.EventHandler; @@ -58,10 +60,10 @@ import android.os.RemoteCallbackList; import android.os.RemoteException; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Builder; +import android.support.v4.content.LocalBroadcastManager; import android.util.Log; -import android.view.View; -import android.widget.Button; import android.widget.RemoteViews; +import android.widget.Toast; public class TorService extends Service implements TorServiceConstants, TorConstants, EventHandler { @@ -82,6 +84,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int HS_NOTIFY_ID = 3; private boolean prefPersistNotifications = true; + String IPADDRESS_PATTERN = + "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; private static final int MAX_START_TRIES = 3; @@ -111,6 +115,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private NotificationManager mNotificationManager = null; private Builder mNotifyBuilder; private Notification mNotification; + private String exitIP = ""; private boolean mHasRoot = false; private boolean mEnableTransparentProxy = false; @@ -223,21 +228,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotificationManager.cancelAll(); } - + @SuppressLint("NewApi") private void showToolbarNotification (String notifyMsg, int notifyId, int icon, boolean isOngoing) { //Reusable code. - Intent intent = new Intent(TorService.this, Orbot.class); - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); + Intent intent = new Intent(TorService.this, Orbot.class); + PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); // Create remote view that needs to be set as bigContentView for the notification. RemoteViews expandedView = new RemoteViews(this.getPackageName(), R.layout.layout_notification_expanded); - expandedView.setTextViewText(R.id.tv, notifyMsg); - expandedView.setOnClickPendingIntent(R.id.but, pendIntent); - expandedView.setImageViewResource(R.id.img, icon); + + expandedView.setTextViewText(R.id.text, notifyMsg); + expandedView.setTextViewText(R.id.title, "ORBOT "+exitIP); + //expandedView.setTextViewText(R.id.exitIP, exitIP); + //expandedView.setOnClickPendingIntent(R.id._tor_notificationBT, pendIntent); + expandedView.setImageViewResource(R.id.icon, icon); if (mNotifyBuilder == null) { @@ -269,7 +277,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } mNotification = mNotifyBuilder.build(); - //mNotification.bigContentView = expandedView; + mNotification.bigContentView = expandedView; if (isOngoing) { @@ -1204,10 +1212,33 @@ public class TorService extends Service implements TorServiceConstants, TorConst while (st.hasMoreTokens()) { node = st.nextToken(); + final String nodeName = parseNodeName(node); + sb.append(nodeName); - sb.append(parseNodeName(node)); - - + if(status.equals("BUILT") && currentStatus==STATUS_ON){ + Thread thread = new Thread() + { + @Override + public void run() { + try { + String nodeDetails = conn.getInfo("ns/name/"+nodeName); + Pattern pattern = Pattern.compile(IPADDRESS_PATTERN); + Matcher matcher = pattern.matcher(nodeDetails); + if (matcher.find()) { + Log.d(TAG, "ip: "+matcher.group()); + exitIP = matcher.group(); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }; + thread.start(); + + Log.d(TAG ,"Node name: "+nodeName+"IP: "+exitIP); + } + if (st.hasMoreTokens()) sb.append (" > "); } diff --git a/update-ant-build.sh b/update-ant-build.sh old mode 100755 new mode 100644

1 0

[orbot/master] fixed merge conflicts
by n8fr8＠torproject.org 14 Jul '14

14 Jul '14

commit 43eac8564448933bec0d9e0c4f5b07e99cdf9374 Merge: 133922f 8b6cff0 Author: amoghbl1 <amoghbl1(a)gmail.com> Date: Fri Jun 20 02:01:17 2014 +0530 fixed merge conflicts .classpath | 2 +- AndroidManifest.xml | 12 +- CHANGELOG | 91 +++ external/Makefile | 17 +- libs/README.md | 3 + libs/jtorctl.jar | Bin 14742 -> 0 bytes res/raw/obfsclient.mp3 | Bin 807052 -> 0 bytes res/raw/polipo.mp3 | Bin 123224 -> 0 bytes res/raw/tor.mp3 | Bin 1708250 -> 0 bytes res/raw/torpolipo.conf | 6 +- res/raw/torrc | 14 +- res/raw/torrcdiag | 21 +- res/raw/xtables.mp3 | Bin 152674 -> 0 bytes res/values/strings.xml | 21 + res/xml/preferences.xml | 30 + src/org/torproject/android/Orbot.java | 294 ++++----- .../android/OrbotDiagnosticsActivity.java | 3 +- src/org/torproject/android/TorConstants.java | 2 + .../android/service/TorResourceInstaller.java | 49 ++ src/org/torproject/android/service/TorService.java | 695 +++++++++++++------- .../android/service/TorServiceConstants.java | 13 +- .../android/service/TorServiceUtils.java | 12 +- .../torproject/android/service/TorTransProxy.java | 34 +- .../android/wizard/ChooseLocaleWizardActivity.java | 90 ++- .../android/wizard/ConfigureTransProxy.java | 39 +- src/org/torproject/android/wizard/LotsaText.java | 36 +- src/org/torproject/android/wizard/Permissions.java | 44 +- .../torproject/android/wizard/TipsAndTricks.java | 50 +- 28 files changed, 972 insertions(+), 606 deletions(-) diff --cc .classpath index 807316f,807316f..5e3f5cc --- a/.classpath +++ b/.classpath @@@ -1,10 -1,10 +1,10 @@@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> -- <classpathentry kind="lib" path="libs/jtorctl.jar"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> ++ <classpathentry kind="lib" path="/home/amoghbl1/git/n8fr8/jtorctl.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --cc src/org/torproject/android/Orbot.java index 90b8e74,f7e0f95..765fae5 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@@ -515,34 -530,8 +530,9 @@@ public class Orbot extends ActionBarAct setResult(RESULT_OK, nResult); } - - /* (non-Javadoc) - * @see android.app.Activity#onResume() - */ - protected void onResume() { - super.onResume(); - - bindService(); - updateStatus(""); - } - - - - @Override - protected void onNewIntent(Intent intent) { - - super.onNewIntent(intent); - try { - Log.d("lala", ""+mService.getStatus()); - } catch (RemoteException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - updateStatus(""); - handleIntents(); - } - private void handleIntents () ++ + private synchronized void handleIntents () { if (getIntent() == null) return; diff --cc src/org/torproject/android/service/TorService.java index 205be24,7830a68..c2c86c0 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@@ -19,13 -21,9 +21,13 @@@ import java.net.Socket import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; - import java.util.LinkedHashMap; import java.util.List; import java.util.StringTokenizer; +import java.util.Timer; +import java.util.TimerTask; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import java.util.concurrent.TimeoutException; import net.freehaven.tor.control.ConfigEntry; import net.freehaven.tor.control.EventHandler; @@@ -81,11 -76,9 +84,11 @@@ public class TorService extends Servic private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; private static final int ERROR_NOTIFY_ID = 3; - private static final int HS_NOTIFY_ID = 3; + private static final int HS_NOTIFY_ID = 4; private boolean prefPersistNotifications = true; + String IPADDRESS_PATTERN = + "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; private static final int MAX_START_TRIES = 3; @@@ -274,41 -238,26 +262,26 @@@ mNotifyBuilder.setLights(Color.RED, 1000, 1000); mNotifyBuilder.setSmallIcon(R.drawable.ic_stat_notifyerr); } + else + { + mNotifyBuilder.setTicker(null); //make sure to clear ticker + } + mNotification = mNotifyBuilder.build(); + mNotification.bigContentView = expandedView; + if (isOngoing) { - startForeground(notifyId, - mNotifyBuilder.build()); + startForeground(notifyId, mNotification); } else { - mNotificationManager.notify( - notifyId, - mNotifyBuilder.build()); + mNotificationManager.notify(notifyId, mNotification); } - + } - /* (non-Javadoc) - * @see android.app.Service#onRebind(android.content.Intent) - */ - @Override - public void onRebind(Intent intent) { - super.onRebind(intent); - - try - { - sendCallbackLogMessage("Welcome back, Carter!"); - } - catch (Exception e) - { - Log.e(TAG,"unable to init Tor",e); - throw new RuntimeException("Unable to init Tor"); - } - } - /* (non-Javadoc) * @see android.app.Service#onStart(android.content.Intent, int)

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 14 Jul '14

14 Jul '14

commit 5b1ade7fcedd1bff9228f21c3101f852f831ebd2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 14 17:16:05 2014 +0000 Update translations for tor-and-https --- bn.po | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/bn.po b/bn.po index 36de857..99117fe 100644 --- a/bn.po +++ b/bn.po @@ -1,11 +1,12 @@ # # Translators: +# Aftabuzzaman ullah <Leemon432(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-24 18:11+0000\n" +"PO-Revision-Date: 2014-07-14 16:51+0000\n" +"Last-Translator: Aftabuzzaman ullah <Leemon432(a)gmail.com>\n" "Language-Team: Bengali (http://www.transifex.com/projects/p/torproject/language/bn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,117 +20,117 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "ltr" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 #, no-wrap msgid "Tor and HTTPS" -msgstr "" +msgstr "Tor এবং HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Site.com" -msgstr "" +msgstr "Site.com" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "user / pw" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "data" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "location" -msgstr "" +msgstr "অবস্থান" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "WiFi" -msgstr "" +msgstr "WiFi" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "ISP" -msgstr "" +msgstr "ISP" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Hacker" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Lawyer" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Police" -msgstr "" +msgstr "পুলিশ" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "NSA" -msgstr "" +msgstr "NSA" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Tor relay" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Key" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Internet connection" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" msgstr ""

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 14 Jul '14

14 Jul '14

commit ebf697c3b032cba9fdeae3f4699d6005c3635cd0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 14 17:15:37 2014 +0000 Update translations for tor-launcher-properties --- bn/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn/torlauncher.properties b/bn/torlauncher.properties index d04cac5..52ff9d9 100644 --- a/bn/torlauncher.properties +++ b/bn/torlauncher.properties @@ -43,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network!

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 14 Jul '14

14 Jul '14

commit 1d677157a7c6d7b13509bf54754f3bfbd02fccd7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 14 17:15:31 2014 +0000 Update translations for torbirdy --- bn/torbirdy.properties | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/bn/torbirdy.properties b/bn/torbirdy.properties index b999de2..329b446 100644 --- a/bn/torbirdy.properties +++ b/bn/torbirdy.properties @@ -1,19 +1,19 @@ -# torbirdy.name=TorBirdy +torbirdy.name=TorBirdy -# torbirdy.enabled.tor=TorBirdy Enabled: Tor -# torbirdy.enabled.jondo=TorBirdy Enabled: JonDo -# torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy -# torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification -# torbirdy.enabled.whonix=TorBirdy Enabled: Whonix -# torbirdy.disabled=TorBirdy: Disabled! +torbirdy.enabled.tor=TorBirdy Enabled: Tor +torbirdy.enabled.jondo=TorBirdy Enabled: JonDo +torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy +torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification +torbirdy.enabled.whonix=TorBirdy Enabled: Whonix +torbirdy.disabled=TorBirdy: Disabled! -# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -# torbirdy.email.advanced.nextwarning=Show this warning next time -# torbirdy.email.advanced.title=TorBirdy Advanced Settings +torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +torbirdy.email.advanced.nextwarning=এই সতর্কীকরণ পরবর্তী সময়ে দেখান +torbirdy.email.advanced.title=TorBirdy Advanced Settings -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. -# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. -# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy +torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[onionoo/master] Remove negative fractions and probabilities.
by karsten＠torproject.org 14 Jul '14

14 Jul '14

commit 9141883f63230d5b56a346d5ed9ca8ddabcfdea0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 14 14:36:39 2014 +0200 Remove negative fractions and probabilities. When we switched to Gson for formatting details documents in 368e810, we forgot to add a check that fractions and probabilities are not negative. Put it back in. --- src/org/torproject/onionoo/DetailsDocument.java | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/onionoo/DetailsDocument.java b/src/org/torproject/onionoo/DetailsDocument.java index 6c7e0ae..2f07cea 100644 --- a/src/org/torproject/onionoo/DetailsDocument.java +++ b/src/org/torproject/onionoo/DetailsDocument.java @@ -288,7 +288,9 @@ class DetailsDocument extends Document { private Float advertised_bandwidth_fraction; public void setAdvertisedBandwidthFraction( Float advertisedBandwidthFraction) { - this.advertised_bandwidth_fraction = advertisedBandwidthFraction; + if (advertisedBandwidthFraction >= 0.0) { + this.advertised_bandwidth_fraction = advertisedBandwidthFraction; + } } public Float getAdvertisedBandwidthFraction() { return this.advertised_bandwidth_fraction; @@ -296,7 +298,9 @@ class DetailsDocument extends Document { private Float consensus_weight_fraction; public void setConsensusWeightFraction(Float consensusWeightFraction) { - this.consensus_weight_fraction = consensusWeightFraction; + if (consensusWeightFraction >= 0.0) { + this.consensus_weight_fraction = consensusWeightFraction; + } } public Float getConsensusWeightFraction() { return this.consensus_weight_fraction; @@ -304,7 +308,9 @@ class DetailsDocument extends Document { private Float guard_probability; public void setGuardProbability(Float guardProbability) { - this.guard_probability = guardProbability; + if (guardProbability >= 0.0) { + this.guard_probability = guardProbability; + } } public Float getGuardProbability() { return this.guard_probability; @@ -312,7 +318,9 @@ class DetailsDocument extends Document { private Float middle_probability; public void setMiddleProbability(Float middleProbability) { - this.middle_probability = middleProbability; + if (middleProbability >= 0.0) { + this.middle_probability = middleProbability; + } } public Float getMiddleProbability() { return this.middle_probability; @@ -320,7 +328,9 @@ class DetailsDocument extends Document { private Float exit_probability; public void setExitProbability(Float exitProbability) { - this.exit_probability = exitProbability; + if (exitProbability >= 0.0) { + this.exit_probability = exitProbability; + } } public Float getExitProbability() { return this.exit_probability;

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 14 Jul '14

14 Jul '14

commit 548099923e83c7f8205297dd5b5f78381df7f259 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 14 16:46:03 2014 +0000 Update translations for tails-perl5lib_completed --- bn.po | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/bn.po b/bn.po new file mode 100644 index 0000000..22cede0 --- /dev/null +++ b/bn.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Aftabuzzaman ullah <Leemon432(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-06-24 11:37+0200\n" +"PO-Revision-Date: 2014-07-14 16:41+0000\n" +"Last-Translator: Aftabuzzaman ullah <Leemon432(a)gmail.com>\n" +"Language-Team: Bengali (http://www.transifex.com/projects/p/torproject/language/bn/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/RunningSystem.pm:153 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "ডিভাইস যা টেইলস থেকে চলমান পাওয়া যায়নি। হয়তো আপনি `toram' অপশন ব্যবহার করেছেন?"

1 0