From 2befa22b2c751668c230020decc2144cf5b33cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 20 May 2015 18:40:20 +0200
Subject: [PATCH] Remove uneeded case of no new permissions in
 InstallConfirmActivity

---
 F-Droid/res/layout/label.xml                  | 20 -------------------
 F-Droid/res/values/strings.xml                |  2 --
 .../installer/InstallConfirmActivity.java     |  6 +-----
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 F-Droid/res/layout/label.xml

diff --git a/F-Droid/res/layout/label.xml b/F-Droid/res/layout/label.xml
deleted file mode 100644
index b9b80e7b3..000000000
--- a/F-Droid/res/layout/label.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center" />
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 48095b879..5155416c5 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -367,8 +367,6 @@
     <string name="uninstall_update_confirm">Do you want to replace this app with the factory version?</string>
     <string name="uninstall_confirm">Do you want to uninstall this app?</string>
 
-    <string name="no_new_perms">This update requires no new permissions.</string>
-
     <string name="perms_new_perm_prefix"><font size="12" fgcolor="#ff33b5e5">NEW: </font></string>
     <string name="perms_description_app">Provided by %1$s.</string>
 </resources>
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
index 33b4473f3..e38d1d1ae 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
@@ -100,11 +100,7 @@ public class InstallConfirmActivity extends Activity implements OnCancelListener
                     mScrollView.addView(perms.getPermissionsView(
                             AppSecurityPermissions.WHICH_NEW));
                 } else {
-                    LayoutInflater inflater = (LayoutInflater) getSystemService(
-                            Context.LAYOUT_INFLATER_SERVICE);
-                    TextView label = (TextView) inflater.inflate(R.layout.label, null);
-                    label.setText(R.string.no_new_perms);
-                    mScrollView.addView(label);
+                    throw new RuntimeException("This should not happen. No new permissions were found but InstallConfirmActivity has been started!");
                 }
                 adapter.addTab(tabHost.newTabSpec(TAB_ID_NEW).setIndicator(
                         getText(R.string.newPerms)), mScrollView);